Daniel Kinzler has submitted this change and it was merged.
Change subject: Move classes from lib to DataModel, as they are directly needed
in DataModel and not in lib
......................................................................
Move classes from lib to DataModel, as they are directly needed in DataModel
and not in lib
Change-Id: I120076057786f4fd0d73b95f312b557bbaa34c83
---
M DataModel/DataModel.classes.php
M DataModel/DataModel.mw.php
R DataModel/DataModel/HashArray.php
R DataModel/DataModel/HashableObjectStorage.php
R DataModel/DataModel/MapHasher.php
R DataModel/DataModel/MapValueHasher.php
R DataModel/tests/phpunit/HashableObjectStorageTest.php
R DataModel/tests/phpunit/MapValueHasherTest.php
R DataModel/tests/phpunit/hasharray/HashArrayElement.php
R DataModel/tests/phpunit/hasharray/HashArrayTest.php
R DataModel/tests/phpunit/hasharray/HashArrayWithDuplicatesTest.php
R DataModel/tests/phpunit/hasharray/HashArrayWithoutDuplicatesTest.php
M lib/WikibaseLib.classes.php
M lib/WikibaseLib.hooks.php
14 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/DataModel/DataModel.classes.php b/DataModel/DataModel.classes.php
index 9cea709..da44d8c 100644
--- a/DataModel/DataModel.classes.php
+++ b/DataModel/DataModel.classes.php
@@ -53,6 +53,10 @@
'Wikibase\SnakRole' => 'DataModel/Snak/SnakRole.php',
'Wikibase\Snaks' => 'DataModel/Snak/Snaks.php',
+ 'Wikibase\HashableObjectStorage' =>
'DataModel/HashableObjectStorage.php',
+ 'Wikibase\HashArray' => 'DataModel/HashArray.php',
+ 'Wikibase\MapHasher' => 'DataModel/MapHasher.php',
+ 'Wikibase\MapValueHasher' => 'DataModel/MapValueHasher.php',
'Wikibase\Reference' => 'DataModel/Reference.php',
'Wikibase\ReferenceObject' => 'DataModel/Reference.php', //
Deprecated
'Wikibase\ReferenceList' => 'DataModel/ReferenceList.php',
diff --git a/DataModel/DataModel.mw.php b/DataModel/DataModel.mw.php
index 4ef636e..c213f54 100644
--- a/DataModel/DataModel.mw.php
+++ b/DataModel/DataModel.mw.php
@@ -48,6 +48,9 @@
$wgAutoloadClasses['Wikibase\Test\EntityTest'] = __DIR__ .
'/tests/phpunit/Entity/EntityTest.php';
$wgAutoloadClasses['Wikibase\Test\TestItems'] = __DIR__ .
'/tests/phpunit/Entity/TestItems.php';
$wgAutoloadClasses['Wikibase\Test\SnakObjectTest'] = __DIR__ .
'/tests/phpunit/Snak/SnakObjectTest.php';
+
+ $wgAutoloadClasses['Wikibase\Test\HashArrayTest'] = __DIR__ .
'/tests/phpunit/hasharray/HashArrayTest.php';
+ $wgAutoloadClasses['Wikibase\Test\HashArrayElement'] = __DIR__ .
'/tests/phpunit/hasharray/HashArrayElement.php';
}
/**
@@ -80,10 +83,16 @@
'Snak/SnakList',
'Snak/Snak',
+ 'HashableObjectStorage',
+ 'MapValueHasher',
+
'ReferenceList',
'Reference',
'SiteLink',
+
+ 'hasharray/HashArrayWithoutDuplicates',
+ 'hasharray/HashArrayWithDuplicates',
);
foreach ( $testFiles as $file ) {
diff --git a/lib/includes/HashArray.php b/DataModel/DataModel/HashArray.php
similarity index 100%
rename from lib/includes/HashArray.php
rename to DataModel/DataModel/HashArray.php
diff --git a/lib/includes/HashableObjectStorage.php
b/DataModel/DataModel/HashableObjectStorage.php
similarity index 100%
rename from lib/includes/HashableObjectStorage.php
rename to DataModel/DataModel/HashableObjectStorage.php
diff --git a/lib/includes/MapHasher.php b/DataModel/DataModel/MapHasher.php
similarity index 100%
rename from lib/includes/MapHasher.php
rename to DataModel/DataModel/MapHasher.php
diff --git a/lib/includes/MapValueHasher.php
b/DataModel/DataModel/MapValueHasher.php
similarity index 100%
rename from lib/includes/MapValueHasher.php
rename to DataModel/DataModel/MapValueHasher.php
diff --git a/lib/tests/phpunit/HashableObjectStorageTest.php
b/DataModel/tests/phpunit/HashableObjectStorageTest.php
similarity index 100%
rename from lib/tests/phpunit/HashableObjectStorageTest.php
rename to DataModel/tests/phpunit/HashableObjectStorageTest.php
diff --git a/lib/tests/phpunit/MapValueHasherTest.php
b/DataModel/tests/phpunit/MapValueHasherTest.php
similarity index 100%
rename from lib/tests/phpunit/MapValueHasherTest.php
rename to DataModel/tests/phpunit/MapValueHasherTest.php
diff --git a/lib/tests/phpunit/hasharray/HashArrayElement.php
b/DataModel/tests/phpunit/hasharray/HashArrayElement.php
similarity index 100%
rename from lib/tests/phpunit/hasharray/HashArrayElement.php
rename to DataModel/tests/phpunit/hasharray/HashArrayElement.php
diff --git a/lib/tests/phpunit/hasharray/HashArrayTest.php
b/DataModel/tests/phpunit/hasharray/HashArrayTest.php
similarity index 100%
rename from lib/tests/phpunit/hasharray/HashArrayTest.php
rename to DataModel/tests/phpunit/hasharray/HashArrayTest.php
diff --git a/lib/tests/phpunit/hasharray/HashArrayWithDuplicatesTest.php
b/DataModel/tests/phpunit/hasharray/HashArrayWithDuplicatesTest.php
similarity index 100%
rename from lib/tests/phpunit/hasharray/HashArrayWithDuplicatesTest.php
rename to DataModel/tests/phpunit/hasharray/HashArrayWithDuplicatesTest.php
diff --git a/lib/tests/phpunit/hasharray/HashArrayWithoutDuplicatesTest.php
b/DataModel/tests/phpunit/hasharray/HashArrayWithoutDuplicatesTest.php
similarity index 100%
rename from lib/tests/phpunit/hasharray/HashArrayWithoutDuplicatesTest.php
rename to DataModel/tests/phpunit/hasharray/HashArrayWithoutDuplicatesTest.php
diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index 3c888c8..db84f1c 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -44,14 +44,10 @@
'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',
@@ -135,9 +131,6 @@
// 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',
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 874188c..36432d9 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -42,9 +42,6 @@
'formatters/EntityIdFormatter',
'formatters/EntityIdLabelFormatter',
- 'hasharray/HashArrayWithoutDuplicates',
- 'hasharray/HashArrayWithDuplicates',
-
'item/ItemDiff',
'parsers/EntityIdParser',
@@ -75,12 +72,10 @@
'DataTypes',
'ReferencedEntitiesFinder',
'EntityRetrievingDataTypeLookup',
- 'HashableObjectStorage',
'InMemoryDataTypeLookup',
'Template',
'TemplateRegistry',
'LibHooks',
- 'MapValueHasher',
'MockRepository',
'SettingsArray',
'SnakFormatter',
--
To view, visit https://gerrit.wikimedia.org/r/60221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I120076057786f4fd0d73b95f312b557bbaa34c83
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Daniel Werner <[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
