jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336814 )
Change subject: Replace "internal" SerializerFactory alias with base class
......................................................................
Replace "internal" SerializerFactory alias with base class
We merged the two serializer implementations a long time ago. There is
only one. The "internal" one is just an alias now.
Change-Id: Icb3f59870c5654a6f63bb926faedb5bc0a304048
---
M lib/tests/phpunit/Store/EntityContentDataCodecTest.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
4 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/Store/EntityContentDataCodecTest.php
b/lib/tests/phpunit/Store/EntityContentDataCodecTest.php
index ff595d6..cffa431 100644
--- a/lib/tests/phpunit/Store/EntityContentDataCodecTest.php
+++ b/lib/tests/phpunit/Store/EntityContentDataCodecTest.php
@@ -14,8 +14,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\SerializerFactory;
use Wikibase\InternalSerialization\DeserializerFactory;
-use Wikibase\InternalSerialization\SerializerFactory;
use Wikibase\Lib\Store\EntityContentDataCodec;
/**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 9293f3f..8234b1f 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -56,7 +56,6 @@
use Wikibase\EditEntityFactory;
use Wikibase\EntityFactory;
use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
-use Wikibase\InternalSerialization\SerializerFactory as
InternalSerializerFactory;
use Wikibase\ItemChange;
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\LanguageFallbackChainFactory;
@@ -1310,10 +1309,10 @@
}
/**
- * @return InternalSerializerFactory
+ * @return SerializerFactory
*/
public function getSerializerFactory() {
- return new InternalSerializerFactory( new DataValueSerializer()
);
+ return new SerializerFactory( new DataValueSerializer() );
}
/**
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index 8c7fe87..d2d8162 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -16,9 +16,9 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityRedirect;
+use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Term\LabelsProvider;
use Wikibase\EntityContent;
-use Wikibase\InternalSerialization\SerializerFactory;
use Wikibase\Lib\DataTypeDefinitions;
use Wikibase\Lib\EntityTypeDefinitions;
use Wikibase\Repo\Content\EntityHandler;
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index d291609..d1e3f8c 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -25,6 +25,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\TermLookup;
@@ -34,7 +35,6 @@
use Wikibase\EditEntityFactory;
use Wikibase\EntityFactory;
use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
-use Wikibase\InternalSerialization\SerializerFactory;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\ContentLanguages;
--
To view, visit https://gerrit.wikimedia.org/r/336814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb3f59870c5654a6f63bb926faedb5bc0a304048
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
