Jeroen De Dauw has submitted this change and it was merged.

Change subject: Moved class registration of WikibaseLib into dedicated file
......................................................................


Moved class registration of WikibaseLib into dedicated file

Change-Id: Id9e9d3f585e1b86160cbb133a410c035b46a13fe
---
A lib/WikibaseLib.classes.php
M lib/WikibaseLib.php
2 files changed, 165 insertions(+), 131 deletions(-)

Approvals:
  Jeroen De Dauw: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
new file mode 100644
index 0000000..0d303f7
--- /dev/null
+++ b/lib/WikibaseLib.classes.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Class registration file for the WikibaseLib component.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.4
+ *
+ * @file
+ * @ingroup WikibaseLib
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < [email protected] >
+ */
+return call_user_func( function() {
+
+       $classes = array(
+               // Autoloading
+               'Wikibase\LibHooks' => 'WikibaseLib.hooks.php',
+
+               // includes
+               'Wikibase\Arrayalizer' => 'includes/Arrayalizer.php',
+               'Wikibase\ByPropertyIdArray' => 
'includes/ByPropertyIdArray.php',
+               'Wikibase\ChangeNotifier' => 'includes/ChangeNotifier.php',
+               'Wikibase\ChangeNotificationJob' => 
'includes/ChangeNotificationJob.php',
+               'Wikibase\ChangesTable' => 'includes/ChangesTable.php',
+               'Wikibase\DiffOpValueFormatter' => 
'includes/DiffOpValueFormatter.php',
+               'Wikibase\DiffView' => 'includes/DiffView.php',
+               'Wikibase\Lib\GuidGenerator' => 'includes/GuidGenerator.php',
+               'Wikibase\Lib\V4GuidGenerator' => 'includes/GuidGenerator.php',
+               'Wikibase\Lib\EntityRetrievingDataTypeLookup' => 
'includes/EntityRetrievingDataTypeLookup.php',
+               'Wikibase\Lib\ClaimGuidGenerator' => 
'includes/GuidGenerator.php',
+               'Wikibase\HashableObjectStorage' => 
'includes/HashableObjectStorage.php',
+               'Wikibase\HashArray' => 'includes/HashArray.php',
+               'Wikibase\Lib\InMemoryDataTypeLookup' => 
'includes/InMemoryDataTypeLookup.php',
+               'Wikibase\LibRegistry' => 'includes/LibRegistry.php',
+               'Wikibase\Template' => 'includes/TemplateRegistry.php',
+               'Wikibase\TemplateRegistry' => 'includes/TemplateRegistry.php',
+               'Wikibase\MapHasher' => 'includes/MapHasher.php',
+               'Wikibase\MapValueHasher' => 'includes/MapValueHasher.php',
+               'Wikibase\ReferencedEntitiesFinder' => 
'includes/ReferencedEntitiesFinder.php',
+               'Wikibase\ObjectComparer' => 'includes/ObjectComparer.php',
+               'Wikibase\Lib\PropertyDataTypeLookup' => 
'includes/PropertyDataTypeLookup.php',
+               'Wikibase\Settings' => 'includes/Settings.php',
+               'Wikibase\SettingsArray' => 'includes/SettingsArray.php',
+               'Wikibase\Lib\SnakFormatter' => 'includes/SnakFormatter.php',
+               'Wikibase\Term' => 'includes/Term.php',
+               'Wikibase\Lib\TermsToClaimsTranslator' => 
'includes/TermsToClaimsTranslator.php',
+               'Wikibase\Lib\TypedValueFormatter' => 
'includes/TypedValueFormatter.php',
+               'Wikibase\Utils' => 'includes/Utils.php',
+               'Wikibase\WikibaseDiffOpFactory' => 
'includes/WikibaseDiffOpFactory.php',
+
+               // includes/changes
+               'Wikibase\Change' => 'includes/changes/Change.php',
+               'Wikibase\ChangeRow' => 'includes/changes/ChangeRow.php',
+               'Wikibase\DiffChange' => 'includes/changes/DiffChange.php',
+               'Wikibase\EntityChange' => 'includes/changes/EntityChange.php',
+               'Wikibase\ItemChange' => 'includes/changes/ItemChange.php',
+
+               'Wikibase\ClaimDiffer' => 'includes/ClaimDiffer.php',
+               'Wikibase\ClaimDifference' => 'includes/ClaimDifference.php',
+               'Wikibase\ClaimDifferenceVisualizer' => 
'includes/ClaimDifferenceVisualizer.php',
+
+
+               'Wikibase\EntityDiff' => 'includes/EntityDiff.php',
+               'Wikibase\EntityDiffVisualizer' => 
'includes/EntityDiffVisualizer.php',
+               'Wikibase\EntityFactory' => 'includes/EntityFactory.php',
+               'Wikibase\ItemDiff' => 'includes/ItemDiff.php',
+
+               // includes/formatters
+               'Wikibase\Lib\EntityIdFormatter' => 
'includes/formatters/EntityIdFormatter.php',
+               'Wikibase\Lib\EntityIdLabelFormatter' => 
'includes/formatters/EntityIdLabelFormatter.php',
+
+               // includes/modules
+               'Wikibase\RepoAccessModule' => 
'includes/modules/RepoAccessModule.php',
+               'Wikibase\SitesModule' => 'includes/modules/SitesModule.php',
+               'Wikibase\TemplateModule' => 
'includes/modules/TemplateModule.php',
+
+               // includes/parsers
+               'Wikibase\Lib\EntityIdParser' => 
'includes/parsers/EntityIdParser.php',
+
+
+               // includes/specials
+               'SpecialWikibasePage' => 
'includes/specials/SpecialWikibasePage.php',
+               'SpecialWikibaseQueryPage' => 
'includes/specials/SpecialWikibaseQueryPage.php',
+
+               // includes/api/serializers
+               'Wikibase\Lib\Serializers\ByPropertyListSerializer' => 
'includes/serializers/ByPropertyListSerializer.php',
+               'Wikibase\Lib\Serializers\ByPropertyListUnserializer' => 
'includes/serializers/ByPropertyListUnserializer.php',
+               'Wikibase\Lib\Serializers\ClaimSerializer' => 
'includes/serializers/ClaimSerializer.php',
+               'Wikibase\Lib\Serializers\ClaimsSerializer' => 
'includes/serializers/ClaimsSerializer.php',
+               'Wikibase\Lib\Serializers\EntitySerializer' => 
'includes/serializers/EntitySerializer.php',
+               'Wikibase\Lib\Serializers\ItemSerializer' => 
'includes/serializers/ItemSerializer.php',
+               'Wikibase\Lib\Serializers\PropertySerializer' => 
'includes/serializers/PropertySerializer.php',
+               'Wikibase\Lib\Serializers\ReferenceSerializer' => 
'includes/serializers/ReferenceSerializer.php',
+               'Wikibase\Lib\Serializers\SerializationOptions' => 
'includes/serializers/SerializationOptions.php',
+               'Wikibase\Lib\Serializers\EntitySerializationOptions' => 
'includes/serializers/SerializationOptions.php',
+               'Wikibase\Lib\Serializers\Serializer' => 
'includes/serializers/Serializer.php',
+               'Wikibase\Lib\Serializers\SerializerFactory' => 
'includes/serializers/SerializerFactory.php',
+               'Wikibase\Lib\Serializers\SerializerObject' => 
'includes/serializers/SerializerObject.php',
+               'Wikibase\Lib\Serializers\SnakSerializer' => 
'includes/serializers/SnakSerializer.php',
+               'Wikibase\Lib\Serializers\Unserializer' => 
'includes/serializers/Unserializer.php',
+
+               // includes/store
+               'Wikibase\EntityLookup' => 'includes/store/EntityLookup.php',
+               'Wikibase\PropertyLookup' => 
'includes/store/PropertyLookup.php',
+               'Wikibase\SiteLinkCache' => 'includes/store/SiteLinkCache.php',
+               'Wikibase\SiteLinkLookup' => 
'includes/store/SiteLinkLookup.php',
+               'Wikibase\TermIndex' => 'includes/store/TermIndex.php',
+               'Wikibase\TermCombinationMatchFinder' => 
'includes/store/TermCombinationMatchFinder.php',
+               'Wikibase\TermMatchScoreCalculator' => 
'includes/store/TermMatchScoreCalculator.php',
+               'Wikibase\TermSqlIndex' => 
'includes/store/sql/TermSqlIndex.php',
+
+               // includes/store/sql
+               'Wikibase\CachingEntityLoader' => 
'includes/store/sql/CachingEntityLoader.php',
+               'Wikibase\PropertySQLLookup' => 
'includes/store/sql/PropertySQLLookup.php',
+               'Wikibase\SiteLinkTable' => 
'includes/store/sql/SiteLinkTable.php',
+               'Wikibase\WikiPageEntityLookup' => 
'includes/store/sql/WikiPageEntityLookup.php',
+
+               // tests
+               'Wikibase\Test\SpecialPageTestBase' => 
'tests/phpunit/specials/SpecialPageTestBase.php',
+
+               'Wikibase\Test\HashArrayTest' => 
'tests/phpunit/hasharray/HashArrayTest.php',
+               'Wikibase\Test\HashArrayElement' => 
'tests/phpunit/hasharray/HashArrayElement.php',
+               'Wikibase\Test\TemplateTest' => 
'tests/phpunit/TemplateTest.php',
+               'Wikibase\Test\TemplateRegistryTest' => 
'tests/phpunit/TemplateRegistryTest.php',
+               'Wikibase\Test\ChangeRowTest' => 
'tests/phpunit/changes/ChangeRowTest.php',
+               'Wikibase\Test\DiffChangeTest' => 
'tests/phpunit/changes/DiffChangeTest.php',
+               'Wikibase\Test\EntityChangeTest' => 
'tests/phpunit/changes/EntityChangeTest.php',
+               'Wikibase\Test\TestChanges' => 
'tests/phpunit/changes/TestChanges.php',
+
+               'Wikibase\Test\EntityDiffOldTest' => 
'tests/phpunit/entity/EntityDiffOldTest.php',
+               'Wikibase\Test\EntityRefreshTest' => 
'tests/phpunit/changes/EntityRefreshTest.php',
+               'Wikibase\Test\SerializerBaseTest' => 
'tests/phpunit/serializers/SerializerBaseTest.php',
+               'Wikibase\Test\EntitySerializerBaseTest' => 
'tests/phpunit/serializers/EntitySerializerBaseTest.php',
+               'Wikibase\Test\EntityTestCase' => 
'tests/phpunit/entity/EntityTestCase.php',
+               'Wikibase\Lib\Test\Serializers\UnserializerBaseTest' => 
'tests/phpunit/serializers/UnserializerBaseTest.php',
+               'Wikibase\Test\MockRepository' => 
'tests/phpunit/MockRepository.php',
+               'Wikibase\Test\EntityLookupTest' => 
'tests/phpunit/EntityLookupTest.php',
+       );
+
+       return $classes;
+
+} );
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 2395625..a1f75b4 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -90,137 +90,14 @@
        'descriptionmsg' => 'wikibase-lib-desc'
 );
 
-$dir = __DIR__ . '/';
+foreach ( include( __DIR__ . '/WikibaseLib.classes.php' ) as $class => $file ) 
{
+       $wgAutoloadClasses[$class] = __DIR__ . '/' . $file;
+}
 
 define( 'SUMMARY_MAX_LENGTH', 250 );
 
 // i18n
-$wgExtensionMessagesFiles['WikibaseLib']                       = $dir . 
'WikibaseLib.i18n.php';
-
-
-
-// Autoloading
-$wgAutoloadClasses['Wikibase\LibHooks']                        = $dir . 
'WikibaseLib.hooks.php';
-
-// includes
-$wgAutoloadClasses['Wikibase\Arrayalizer']                             = $dir 
. 'includes/Arrayalizer.php';
-$wgAutoloadClasses['Wikibase\ByPropertyIdArray']               = $dir . 
'includes/ByPropertyIdArray.php';
-$wgAutoloadClasses['Wikibase\ChangeNotifier']                  = $dir . 
'includes/ChangeNotifier.php';
-$wgAutoloadClasses['Wikibase\ChangeNotificationJob']   = $dir . 
'includes/ChangeNotificationJob.php';
-$wgAutoloadClasses['Wikibase\ChangesTable']                    = $dir . 
'includes/ChangesTable.php';
-$wgAutoloadClasses['Wikibase\DiffOpValueFormatter']            = $dir . 
'includes/DiffOpValueFormatter.php';
-$wgAutoloadClasses['Wikibase\DiffView']                                = $dir 
. 'includes/DiffView.php';
-$wgAutoloadClasses['Wikibase\Lib\GuidGenerator']               = $dir . 
'includes/GuidGenerator.php';
-$wgAutoloadClasses['Wikibase\Lib\V4GuidGenerator']             = $dir . 
'includes/GuidGenerator.php';
-$wgAutoloadClasses['Wikibase\Lib\EntityRetrievingDataTypeLookup']      = $dir 
. 'includes/EntityRetrievingDataTypeLookup.php';
-$wgAutoloadClasses['Wikibase\Lib\ClaimGuidGenerator']  = $dir . 
'includes/GuidGenerator.php';
-$wgAutoloadClasses['Wikibase\HashableObjectStorage']   = $dir . 
'includes/HashableObjectStorage.php';
-$wgAutoloadClasses['Wikibase\HashArray']                               = $dir 
. 'includes/HashArray.php';
-$wgAutoloadClasses['Wikibase\Lib\InMemoryDataTypeLookup']      = $dir . 
'includes/InMemoryDataTypeLookup.php';
-$wgAutoloadClasses['Wikibase\LibRegistry']                             = $dir 
. 'includes/LibRegistry.php';
-$wgAutoloadClasses['Wikibase\Template']                                = $dir 
. 'includes/TemplateRegistry.php';
-$wgAutoloadClasses['Wikibase\TemplateRegistry']                = $dir . 
'includes/TemplateRegistry.php';
-$wgAutoloadClasses['Wikibase\MapHasher']                               = $dir 
. 'includes/MapHasher.php';
-$wgAutoloadClasses['Wikibase\MapValueHasher']                  = $dir . 
'includes/MapValueHasher.php';
-$wgAutoloadClasses['Wikibase\ReferencedEntitiesFinder'] = $dir . 
'includes/ReferencedEntitiesFinder.php';
-$wgAutoloadClasses['Wikibase\ObjectComparer']                  = $dir . 
'includes/ObjectComparer.php';
-$wgAutoloadClasses['Wikibase\Lib\PropertyDataTypeLookup'] = $dir . 
'includes/PropertyDataTypeLookup.php';
-$wgAutoloadClasses['Wikibase\Settings']                                = $dir 
. 'includes/Settings.php';
-$wgAutoloadClasses['Wikibase\SettingsArray']                   = $dir . 
'includes/SettingsArray.php';
-$wgAutoloadClasses['Wikibase\Lib\SnakFormatter']               = $dir . 
'includes/SnakFormatter.php';
-$wgAutoloadClasses['Wikibase\Term']                                    = $dir 
. 'includes/Term.php';
-$wgAutoloadClasses['Wikibase\Lib\TermsToClaimsTranslator'] = $dir . 
'includes/TermsToClaimsTranslator.php';
-$wgAutoloadClasses['Wikibase\Lib\TypedValueFormatter'] = $dir . 
'includes/TypedValueFormatter.php';
-$wgAutoloadClasses['Wikibase\Utils']                                   = $dir 
. 'includes/Utils.php';
-$wgAutoloadClasses['Wikibase\WikibaseDiffOpFactory']   = $dir . 
'includes/WikibaseDiffOpFactory.php';
-
-// includes/changes
-$wgAutoloadClasses['Wikibase\Change']                          = $dir . 
'includes/changes/Change.php';
-$wgAutoloadClasses['Wikibase\ChangeRow']                       = $dir . 
'includes/changes/ChangeRow.php';
-$wgAutoloadClasses['Wikibase\DiffChange']                      = $dir . 
'includes/changes/DiffChange.php';
-$wgAutoloadClasses['Wikibase\EntityChange']                    = $dir . 
'includes/changes/EntityChange.php';
-$wgAutoloadClasses['Wikibase\ItemChange']                      = $dir . 
'includes/changes/ItemChange.php';
-
-$wgAutoloadClasses['Wikibase\ClaimDiffer']                     = $dir . 
'includes/ClaimDiffer.php';
-$wgAutoloadClasses['Wikibase\ClaimDifference']                 = $dir . 
'includes/ClaimDifference.php';
-$wgAutoloadClasses['Wikibase\ClaimDifferenceVisualizer'] = $dir . 
'includes/ClaimDifferenceVisualizer.php';
-
-
-$wgAutoloadClasses['Wikibase\EntityDiff']                      = $dir . 
'includes/EntityDiff.php';
-$wgAutoloadClasses['Wikibase\EntityDiffVisualizer'] = $dir . 
'includes/EntityDiffVisualizer.php';
-$wgAutoloadClasses['Wikibase\EntityFactory']           = $dir . 
'includes/EntityFactory.php';
-$wgAutoloadClasses['Wikibase\ItemDiff']                        = $dir . 
'includes/ItemDiff.php';
-
-// includes/formatters
-$wgAutoloadClasses['Wikibase\Lib\EntityIdFormatter']   = $dir . 
'includes/formatters/EntityIdFormatter.php';
-$wgAutoloadClasses['Wikibase\Lib\EntityIdLabelFormatter']      = $dir . 
'includes/formatters/EntityIdLabelFormatter.php';
-
-// includes/modules
-$wgAutoloadClasses['Wikibase\RepoAccessModule']                = $dir . 
'includes/modules/RepoAccessModule.php';
-$wgAutoloadClasses['Wikibase\SitesModule']                             = $dir 
. 'includes/modules/SitesModule.php';
-$wgAutoloadClasses['Wikibase\TemplateModule']                  = $dir . 
'includes/modules/TemplateModule.php';
-
-// includes/parsers
-$wgAutoloadClasses['Wikibase\Lib\EntityIdParser']              = $dir . 
'includes/parsers/EntityIdParser.php';
-
-
-// includes/specials
-$wgAutoloadClasses['SpecialWikibasePage']                              = $dir 
. 'includes/specials/SpecialWikibasePage.php';
-$wgAutoloadClasses['SpecialWikibaseQueryPage']                 = $dir . 
'includes/specials/SpecialWikibaseQueryPage.php';
-
-// includes/api/serializers
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ByPropertyListSerializer'] = $dir 
. 'includes/serializers/ByPropertyListSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ByPropertyListUnserializer'] = 
$dir . 'includes/serializers/ByPropertyListUnserializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ClaimSerializer']                 
        = $dir . 'includes/serializers/ClaimSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ClaimsSerializer']                
= $dir . 'includes/serializers/ClaimsSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\EntitySerializer']                
= $dir . 'includes/serializers/EntitySerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ItemSerializer']                  
= $dir . 'includes/serializers/ItemSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\PropertySerializer']              
= $dir . 'includes/serializers/PropertySerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\ReferenceSerializer']             
= $dir . 'includes/serializers/ReferenceSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\SerializationOptions']    = $dir 
. 'includes/serializers/SerializationOptions.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\EntitySerializationOptions']      
= $dir . 'includes/serializers/SerializationOptions.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\Serializer']                      
        = $dir . 'includes/serializers/Serializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\SerializerFactory']               
= $dir . 'includes/serializers/SerializerFactory.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\SerializerObject']                
= $dir . 'includes/serializers/SerializerObject.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\SnakSerializer']                  
= $dir . 'includes/serializers/SnakSerializer.php';
-$wgAutoloadClasses['Wikibase\Lib\Serializers\Unserializer']                    
= $dir . 'includes/serializers/Unserializer.php';
-
-// includes/store
-$wgAutoloadClasses['Wikibase\EntityLookup']                    = $dir . 
'includes/store/EntityLookup.php';
-$wgAutoloadClasses['Wikibase\PropertyLookup']           = $dir . 
'includes/store/PropertyLookup.php';
-$wgAutoloadClasses['Wikibase\SiteLinkCache']                   = $dir . 
'includes/store/SiteLinkCache.php';
-$wgAutoloadClasses['Wikibase\SiteLinkLookup']                  = $dir . 
'includes/store/SiteLinkLookup.php';
-$wgAutoloadClasses['Wikibase\TermIndex']                               = $dir 
. 'includes/store/TermIndex.php';
-$wgAutoloadClasses['Wikibase\TermCombinationMatchFinder'] = $dir . 
'includes/store/TermCombinationMatchFinder.php';
-$wgAutoloadClasses['Wikibase\TermMatchScoreCalculator'] = $dir . 
'includes/store/TermMatchScoreCalculator.php';
-$wgAutoloadClasses['Wikibase\TermSqlIndex']                    = $dir . 
'includes/store/sql/TermSqlIndex.php';
-
-// includes/store/sql
-$wgAutoloadClasses['Wikibase\CachingEntityLoader']      = $dir . 
'includes/store/sql/CachingEntityLoader.php';
-$wgAutoloadClasses['Wikibase\PropertySQLLookup']        = $dir . 
'includes/store/sql/PropertySQLLookup.php';
-$wgAutoloadClasses['Wikibase\SiteLinkTable']                   = $dir . 
'includes/store/sql/SiteLinkTable.php';
-$wgAutoloadClasses['Wikibase\WikiPageEntityLookup']    = $dir . 
'includes/store/sql/WikiPageEntityLookup.php';
-
-// tests
-$wgAutoloadClasses['Wikibase\Test\SpecialPageTestBase']        = $dir . 
'tests/phpunit/specials/SpecialPageTestBase.php';
-
-$wgAutoloadClasses['Wikibase\Test\HashArrayTest']                      = $dir 
. 'tests/phpunit/hasharray/HashArrayTest.php';
-$wgAutoloadClasses['Wikibase\Test\HashArrayElement']           = $dir . 
'tests/phpunit/hasharray/HashArrayElement.php';
-$wgAutoloadClasses['Wikibase\Test\TemplateTest']                       = $dir 
. 'tests/phpunit/TemplateTest.php';
-$wgAutoloadClasses['Wikibase\Test\TemplateRegistryTest']       = $dir . 
'tests/phpunit/TemplateRegistryTest.php';
-$wgAutoloadClasses['Wikibase\Test\ChangeRowTest']                      = $dir 
. 'tests/phpunit/changes/ChangeRowTest.php';
-$wgAutoloadClasses['Wikibase\Test\DiffChangeTest']                     = $dir 
. 'tests/phpunit/changes/DiffChangeTest.php';
-$wgAutoloadClasses['Wikibase\Test\EntityChangeTest']           = $dir . 
'tests/phpunit/changes/EntityChangeTest.php';
-$wgAutoloadClasses['Wikibase\Test\TestChanges']                                
= $dir . 'tests/phpunit/changes/TestChanges.php';
-
-$wgAutoloadClasses['Wikibase\Test\EntityDiffOldTest']          = $dir . 
'tests/phpunit/entity/EntityDiffOldTest.php';
-$wgAutoloadClasses['Wikibase\Test\EntityRefreshTest']          = $dir . 
'tests/phpunit/changes/EntityRefreshTest.php';
-$wgAutoloadClasses['Wikibase\Test\SerializerBaseTest']                 = $dir 
. 'tests/phpunit/serializers/SerializerBaseTest.php';
-$wgAutoloadClasses['Wikibase\Test\EntitySerializerBaseTest']= $dir . 
'tests/phpunit/serializers/EntitySerializerBaseTest.php';
-$wgAutoloadClasses['Wikibase\Test\EntityTestCase']                     = $dir 
. 'tests/phpunit/entity/EntityTestCase.php';
-$wgAutoloadClasses['Wikibase\Lib\Test\Serializers\UnserializerBaseTest'] = 
$dir . 'tests/phpunit/serializers/UnserializerBaseTest.php';
-$wgAutoloadClasses['Wikibase\Test\MockRepository']                     = $dir 
. 'tests/phpunit/MockRepository.php';
-$wgAutoloadClasses['Wikibase\Test\EntityLookupTest']           = $dir . 
'tests/phpunit/EntityLookupTest.php';
+$wgExtensionMessagesFiles['WikibaseLib'] = __DIR__ . '/WikibaseLib.i18n.php';
 
 // TODO: this is not nice, figure out a better design
 $wgExtensionFunctions[] = function() {
@@ -288,13 +165,12 @@
 }
 
 // Resource Loader Modules:
-$wgResourceModules = array_merge( $wgResourceModules, include( 
"$dir/resources/Resources.php" ) );
+$wgResourceModules = array_merge( $wgResourceModules, include( __DIR__ . 
"/resources/Resources.php" ) );
 
 
-include_once( $dir . 'config/WikibaseLib.default.php' );
+include_once( __DIR__ . '/config/WikibaseLib.default.php' );
 
 if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES ) {
-       include_once( $dir . 'config/WikibaseLib.experimental.php' );
+       include_once( __DIR__ . '/config/WikibaseLib.experimental.php' );
 }
 
-unset( $dir );

-- 
To view, visit https://gerrit.wikimedia.org/r/60218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9e9d3f585e1b86160cbb133a410c035b46a13fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Daniel Werner <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: John Erling Blad <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to