[MediaWiki-commits] [Gerrit] Use automatically generated classmap rather than a manual on... - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
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(-)
Approvals:
Addshore: Verified; Looks good to me, approved
diff --git a/client/WikibaseClient.classes.php
b/client/WikibaseClient.classes.php
deleted file mode 100644
index e554ee4..000
--- 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() {
-
[MediaWiki-commits] [Gerrit] Use automatically generated classmap rather than a manual on... - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Use automatically generated classmap rather than a manual one
for Wikibase Lib
..
Use automatically generated classmap rather than a manual one for Wikibase Lib
Change-Id: Id07dbe1f46b0e3fd165426a198be856fa83ab6b1
---
M composer.json
D lib/WikibaseLib.classes.php
M lib/WikibaseLib.php
3 files changed, 8 insertions(+), 241 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 577bc3c..4a613eb 100644
--- a/composer.json
+++ b/composer.json
@@ -42,9 +42,13 @@
Wikibase.composer.php
],
classmap: [
- client/includes,
+ client/includes/,
client/WikibaseClient.hooks.php,
- client/tests/phpunit/MockPageUpdater.php
+ client/tests/phpunit/MockPageUpdater.php,
+
+ lib/includes/,
+ lib/WikibaseLib.hooks.php,
+ lib/tests/phpunit/
]
}
}
diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
deleted file mode 100644
index a5f78e3..000
--- a/lib/WikibaseLib.classes.php
+++ /dev/null
@@ -1,233 +0,0 @@
-?php
-
-/**
- * Class registration file for the WikibaseLib component.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-return call_user_func( function() {
-
- $classes = array(
- // Autoloading
- 'Wikibase\LibHooks' = 'WikibaseLib.hooks.php',
-
- // generic things that could be factored out
- 'Disposable' = 'includes/Disposable.php',
-
- // includes
- 'Wikibase\ChangeNotifier' = 'includes/ChangeNotifier.php',
- 'Wikibase\ChangeNotificationJob' =
'includes/ChangeNotificationJob.php',
- 'Wikibase\UpdateRepoOnMoveJob' =
'includes/UpdateRepoOnMoveJob.php',
- 'Wikibase\ChangesTable' = 'includes/ChangesTable.php',
- 'Wikibase\DiffOpValueFormatter' =
'includes/DiffOpValueFormatter.php',
- 'Wikibase\DiffView' = 'includes/DiffView.php',
- 'Wikibase\LanguageFallbackChain' =
'includes/LanguageFallbackChain.php',
- 'Wikibase\LanguageFallbackChainFactory' =
'includes/LanguageFallbackChainFactory.php',
- 'Wikibase\LanguageWithConversion' =
'includes/LanguageWithConversion.php',
- 'Wikibase\Lib\GuidGenerator' = 'includes/GuidGenerator.php',
- 'Wikibase\Lib\V4GuidGenerator' =
'includes/V4GuidGenerator.php',
- 'Wikibase\Lib\EntityRetrievingDataTypeLookup' =
'includes/EntityRetrievingDataTypeLookup.php',
- 'Wikibase\Lib\PropertyInfoDataTypeLookup' =
'includes/PropertyInfoDataTypeLookup.php',
- 'Wikibase\Lib\ClaimGuidGenerator' =
'includes/ClaimGuidGenerator.php',
- 'Wikibase\Lib\ClaimGuidValidator' =
'includes/ClaimGuidValidator.php',
- 'Wikibase\Lib\InMemoryDataTypeLookup' =
'includes/InMemoryDataTypeLookup.php',
- 'Wikibase\LibRegistry' = 'includes/LibRegistry.php',
- 'Wikibase\Template' = 'includes/TemplateRegistry.php',
- 'Wikibase\TemplateRegistry' = 'includes/TemplateRegistry.php',
- 'Wikibase\ReferencedEntitiesFinder' =
'includes/ReferencedEntitiesFinder.php',
- 'Wikibase\ReferencedUrlFinder' =
'includes/ReferencedUrlFinder.php',
- 'Wikibase\Lib\PropertyDataTypeLookup' =
'includes/PropertyDataTypeLookup.php',
- 'Wikibase\Lib\PropertyLabelNotResolvedException' =
'includes/PropertyLabelNotResolvedException.php',
- 'Wikibase\Lib\PropertyNotFoundException' =
'includes/PropertyNotFoundException.php',
- 'Wikibase\Settings' = 'includes/Settings.php',
- 'Wikibase\SettingsArray' = 'includes/SettingsArray.php',
- 'Wikibase\SiteLink' = 'includes/SiteLink.php',
- 'Wikibase\Lib\SnakConstructionService' =
'includes/SnakConstructionService.php',
- 'Wikibase\SnakFactory' = 'includes/SnakFactory.php',
- 'Wikibase\Summary' = 'includes/Summary.php',
- 'Wikibase\Term' = 'includes/Term.php',
- 'Wikibase\Lib\TermsToClaimsTranslator' =
'includes/TermsToClaimsTranslator.php',
- 'Wikibase\Lib\TypedValueFormatter' =
'includes/TypedValueFormatter.php',
- 'Wikibase\StringNormalizer' = 'includes/StringNormalizer.php',
- 'Wikibase\Utils' = 'includes/Utils.php',
- 'Wikibase\WikibaseDiffOpFactory' =
'includes/WikibaseDiffOpFactory.php',
- 'Wikibase\Lib\WikibaseDataTypeBuilders' =
[MediaWiki-commits] [Gerrit] Use automatically generated classmap rather than a manual on... - change (mediawiki...Wikibase)
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..000
--- 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.
[MediaWiki-commits] [Gerrit] Use automatically generated classmap rather than a manual on... - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108644
Change subject: Use automatically generated classmap rather than a manual one
for Wikibase Lib
..
Use automatically generated classmap rather than a manual one for Wikibase Lib
Change-Id: Id07dbe1f46b0e3fd165426a198be856fa83ab6b1
---
M composer.json
D lib/WikibaseLib.classes.php
M lib/WikibaseLib.php
3 files changed, 8 insertions(+), 241 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/108644/1
diff --git a/composer.json b/composer.json
index 577bc3c..4a613eb 100644
--- a/composer.json
+++ b/composer.json
@@ -42,9 +42,13 @@
Wikibase.composer.php
],
classmap: [
- client/includes,
+ client/includes/,
client/WikibaseClient.hooks.php,
- client/tests/phpunit/MockPageUpdater.php
+ client/tests/phpunit/MockPageUpdater.php,
+
+ lib/includes/,
+ lib/WikibaseLib.hooks.php,
+ lib/tests/phpunit/
]
}
}
diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
deleted file mode 100644
index a5f78e3..000
--- a/lib/WikibaseLib.classes.php
+++ /dev/null
@@ -1,233 +0,0 @@
-?php
-
-/**
- * Class registration file for the WikibaseLib component.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-return call_user_func( function() {
-
- $classes = array(
- // Autoloading
- 'Wikibase\LibHooks' = 'WikibaseLib.hooks.php',
-
- // generic things that could be factored out
- 'Disposable' = 'includes/Disposable.php',
-
- // includes
- 'Wikibase\ChangeNotifier' = 'includes/ChangeNotifier.php',
- 'Wikibase\ChangeNotificationJob' =
'includes/ChangeNotificationJob.php',
- 'Wikibase\UpdateRepoOnMoveJob' =
'includes/UpdateRepoOnMoveJob.php',
- 'Wikibase\ChangesTable' = 'includes/ChangesTable.php',
- 'Wikibase\DiffOpValueFormatter' =
'includes/DiffOpValueFormatter.php',
- 'Wikibase\DiffView' = 'includes/DiffView.php',
- 'Wikibase\LanguageFallbackChain' =
'includes/LanguageFallbackChain.php',
- 'Wikibase\LanguageFallbackChainFactory' =
'includes/LanguageFallbackChainFactory.php',
- 'Wikibase\LanguageWithConversion' =
'includes/LanguageWithConversion.php',
- 'Wikibase\Lib\GuidGenerator' = 'includes/GuidGenerator.php',
- 'Wikibase\Lib\V4GuidGenerator' =
'includes/V4GuidGenerator.php',
- 'Wikibase\Lib\EntityRetrievingDataTypeLookup' =
'includes/EntityRetrievingDataTypeLookup.php',
- 'Wikibase\Lib\PropertyInfoDataTypeLookup' =
'includes/PropertyInfoDataTypeLookup.php',
- 'Wikibase\Lib\ClaimGuidGenerator' =
'includes/ClaimGuidGenerator.php',
- 'Wikibase\Lib\ClaimGuidValidator' =
'includes/ClaimGuidValidator.php',
- 'Wikibase\Lib\InMemoryDataTypeLookup' =
'includes/InMemoryDataTypeLookup.php',
- 'Wikibase\LibRegistry' = 'includes/LibRegistry.php',
- 'Wikibase\Template' = 'includes/TemplateRegistry.php',
- 'Wikibase\TemplateRegistry' = 'includes/TemplateRegistry.php',
- 'Wikibase\ReferencedEntitiesFinder' =
'includes/ReferencedEntitiesFinder.php',
- 'Wikibase\ReferencedUrlFinder' =
'includes/ReferencedUrlFinder.php',
- 'Wikibase\Lib\PropertyDataTypeLookup' =
'includes/PropertyDataTypeLookup.php',
- 'Wikibase\Lib\PropertyLabelNotResolvedException' =
'includes/PropertyLabelNotResolvedException.php',
- 'Wikibase\Lib\PropertyNotFoundException' =
'includes/PropertyNotFoundException.php',
- 'Wikibase\Settings' = 'includes/Settings.php',
- 'Wikibase\SettingsArray' = 'includes/SettingsArray.php',
- 'Wikibase\SiteLink' = 'includes/SiteLink.php',
- 'Wikibase\Lib\SnakConstructionService' =
'includes/SnakConstructionService.php',
- 'Wikibase\SnakFactory' = 'includes/SnakFactory.php',
- 'Wikibase\Summary' = 'includes/Summary.php',
- 'Wikibase\Term' = 'includes/Term.php',
- 'Wikibase\Lib\TermsToClaimsTranslator' =
'includes/TermsToClaimsTranslator.php',
- 'Wikibase\Lib\TypedValueFormatter' =
'includes/TypedValueFormatter.php',
- 'Wikibase\StringNormalizer' = 'includes/StringNormalizer.php',
- 'Wikibase\Utils' = 'includes/Utils.php',
- 'Wikibase\WikibaseDiffOpFactory' =
'includes/WikibaseDiffOpFactory.php',
-
