Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108638
Change subject: Use automatically generated classmap rather than a manual one
for Wikibase Client
......................................................................
Use automatically generated classmap rather than a manual one for Wikibase
Client
Change-Id: I4b48b73af521904bedb35a6be2e97b0767e00d98
---
D client/WikibaseClient.classes.php
M client/WikibaseClient.php
M composer.json
3 files changed, 7 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/108638/1
diff --git a/client/WikibaseClient.classes.php
b/client/WikibaseClient.classes.php
deleted file mode 100644
index e554ee4..0000000
--- a/client/WikibaseClient.classes.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Class registration file for the WikibaseClient component.
- *
- * @licence GNU GPL v2+
- * @author Katie Filbert < aude.w...@gmail.com >
- */
-return call_user_func( function() {
-
- $classes = array(
- // Autoloading
- 'Wikibase\ClientHooks' => 'WikibaseClient.hooks.php',
-
- 'Wikibase\EntityIdPropertyUpdater' =>
'includes/EntityIdPropertyUpdater.php',
- 'Wikibase\InterwikiSorter' => 'includes/InterwikiSorter.php',
- 'Wikibase\LangLinkHandler' => 'includes/LangLinkHandler.php',
- 'Wikibase\ChangeHandler' => 'includes/ChangeHandler.php',
- 'Wikibase\NamespaceChecker' => 'includes/NamespaceChecker.php',
- 'Wikibase\ReferencedPagesFinder' =>
'includes/ReferencedPagesFinder.php',
- 'Wikibase\RepoItemLinkGenerator' =>
'includes/RepoItemLinkGenerator.php',
- 'Wikibase\RepoLinker' => 'includes/RepoLinker.php',
- 'Wikibase\Client\WikibaseClient' =>
'includes/WikibaseClient.php',
- 'Wikibase\PageUpdater' => 'includes/PageUpdater.php',
- 'Wikibase\SiteLinkCommentCreator' =>
'includes/SiteLinkCommentCreator.php',
- 'Wikibase\WikiPageUpdater' => 'includes/WikiPageUpdater.php',
- 'Wikibase\UpdateRepo' => 'includes/UpdateRepo.php',
- 'Wikibase\UpdateRepoOnMove' => 'includes/UpdateRepoOnMove.php',
-
- // includes/api
- 'Wikibase\ApiClientInfo' => 'includes/api/ApiClientInfo.php',
-
- // includes/hooks
- 'Wikibase\Client\Hooks\InfoActionHookHandler' =>
'includes/hooks/InfoActionHookHandler.php',
- 'Wikibase\Client\MovePageNotice' =>
'includes/hooks/MovePageNotice.php',
-
- // includes/modules
- 'Wikibase\SiteModule' => 'includes/modules/SiteModule.php',
-
- // include/parserhooks
- 'Wikibase\NoLangLinkHandler' =>
'includes/parserhooks/NoLangLinkHandler.php',
- 'Wikibase\ParserErrorMessageFormatter' =>
'includes/parserhooks/ParserErrorMessageFormatter.php',
- 'Wikibase\PropertyParserFunction' =>
'includes/parserhooks/PropertyParserFunction.php',
- 'Wikibase\PropertyParserFunctionRenderer' =>
'includes/parserhooks/PropertyParserFunctionRenderer.php',
-
- // includes/recentchanges
- 'Wikibase\ChangeLineFormatter' =>
'includes/recentchanges/ChangeLineFormatter.php',
- 'Wikibase\ExternalChange' =>
'includes/recentchanges/ExternalChange.php',
- 'Wikibase\ExternalChangeFactory' =>
'includes/recentchanges/ExternalChangeFactory.php',
- 'Wikibase\ExternalRecentChange' =>
'includes/recentchanges/ExternalRecentChange.php',
- 'Wikibase\RecentChangesFilterOptions' =>
'includes/recentchanges/RecentChangesFilterOptions.php',
- 'Wikibase\RevisionData' =>
'includes/recentchanges/RevisionData.php',
-
- // includes/specials
- 'Wikibase\Client\Specials\SpecialUnconnectedPages' =>
'includes/specials/SpecialUnconnectedPages.php',
-
- // includes/store
- 'Wikibase\ClientStore' => 'includes/store/ClientStore.php',
-
- // includes/store/sql
- 'Wikibase\DirectSqlStore' =>
'includes/store/sql/DirectSqlStore.php',
-
- // includes/scribunto
- 'Scribunto_LuaWikibaseLibrary' =>
'includes/scribunto/Scribunto_LuaWikibaseLibrary.php',
- 'Scribunto_LuaWikibaseLibraryImplementation' =>
'includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php',
-
- // test
- 'Wikibase\Test\MockPageUpdater' =>
'tests/phpunit/MockPageUpdater.php'
-
- );
-
- return $classes;
-
-} );
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index d089b60..b009543 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -20,7 +20,7 @@
}
if ( defined( 'WBC_VERSION' ) ) {
- // Do not initialize more then once.
+ // Do not initialize more than once.
return;
}
@@ -43,7 +43,7 @@
}
call_user_func( function() {
- global $wgExtensionCredits, $wgExtensionMessagesFiles,
$wgAutoloadClasses, $wgHooks;
+ global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgSpecialPages, $wgSpecialPageGroups,
$wgResourceModules;
global $wgWBClientStores, $wgWBClientSettings, $wgRecentChangesFlags;
@@ -65,10 +65,6 @@
$wgExtensionMessagesFiles['wikibaseclient'] = $dir .
'WikibaseClient.i18n.php';
$wgExtensionMessagesFiles['Wikibaseclientalias'] = $dir .
'WikibaseClient.i18n.alias.php';
$wgExtensionMessagesFiles['wikibaseclientmagic'] = $dir .
'WikibaseClient.i18n.magic.php';
-
- foreach ( include( __DIR__ . '/WikibaseClient.classes.php' ) as $class
=> $file ) {
- $wgAutoloadClasses[$class] = __DIR__ . '/' . $file;
- }
// Hooks
$wgHooks['UnitTestsList'][] =
'\Wikibase\ClientHooks::registerUnitTests';
diff --git a/composer.json b/composer.json
index 2b7e97c..577bc3c 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,11 @@
"autoload": {
"files" : [
"Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockPageUpdater.php"
]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b48b73af521904bedb35a6be2e97b0767e00d98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
