Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338749 )
Change subject: Better names for WikibaseRepo/Client (de)serializer factory
methods
......................................................................
Better names for WikibaseRepo/Client (de)serializer factory methods
This patch does not do anything but renaming a few methods in the
WikibaseRepo as well as WikibaseClient top level factories. I'm using
class aliases in the use section as a proof of concept. If these new
class names are fine and this patch got merged, I will rename the
original classes in future releases of the relevant components.
The problem: We do have a "Internal Serialization" and a "DataModel
Serialization" component. The names are confusing.
The so called "DataModel Serialization" component is a "base"
(de)serialization component that only supports Items and Properties.
This is on purpose. We should not teach this component how to deal
with other entity types.
The so called "internal" component really is internal. The only reason
we have it is because there are still old serialization formats in the
Wikidata.org database.
Entity (de)serializers are constructed in the top level factory, which
is fine. The *de*serializer can be passed around as part of the
InternalFormatDeserializerFactory. The *serializer* must be passed around
as a separate $entitySerializer parameter. This is by design and nothing
that needs fixing.
Bug: T157596
Change-Id: Ic126c46d84d15b255a3cac69b3260c08b22fff9f
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/WikibaseClient.php
M
client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M repo/includes/Api/SetReference.php
M repo/includes/Content/EntityContent.php
M repo/includes/Specials/SpecialEntityData.php
M repo/includes/WikibaseRepo.php
M repo/maintenance/dumpJson.php
M repo/tests/phpunit/includes/Api/EditPageTest.php
M repo/tests/phpunit/includes/Api/SetReferenceTest.php
M repo/tests/phpunit/includes/Content/DeferredDecodingEntityHolderTest.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/EntityModificationTestHelper.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
16 files changed, 65 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/49/338749/1
diff --git
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index 66e4248..c8ead98 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -228,8 +228,8 @@
$type
);
- $snakDeserializer =
$wikibaseClient->getExternalFormatDeserializerFactory()->newSnakDeserializer();
- $snaksDeserializer =
$wikibaseClient->getExternalFormatDeserializerFactory()->newSnakListDeserializer();
+ $snakDeserializer =
$wikibaseClient->getBaseDataModelDeserializerFactory()->newSnakDeserializer();
+ $snaksDeserializer =
$wikibaseClient->getBaseDataModelDeserializerFactory()->newSnakListDeserializer();
return new SnakSerializationRenderer(
$snakFormatter,
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index a4957be..5a32f36 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -51,7 +51,7 @@
use Wikibase\Client\Hooks\ParserFunctionRegistrant;
use Wikibase\Client\Store\TitleFactory;
use Wikibase\ClientStore;
-use Wikibase\DataModel\DeserializerFactory;
+use Wikibase\DataModel\DeserializerFactory as BaseDataModelDeserializerFactory;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Services\Diff\EntityDiffer;
@@ -64,7 +64,7 @@
use Wikibase\DataModel\Services\Lookup\TermLookup;
use Wikibase\DataModel\Services\Term\TermBuffer;
use Wikibase\DirectSqlStore;
-use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
+use Wikibase\InternalSerialization\DeserializerFactory as
InternalFormatDeserializerFactory;
use Wikibase\ItemChange;
use Wikibase\LangLinkHandler;
use Wikibase\LanguageFallbackChain;
@@ -974,37 +974,37 @@
}
/**
- * @return DeserializerFactory
+ * @return BaseDataModelDeserializerFactory
*/
- public function getExternalFormatDeserializerFactory() {
- return new DeserializerFactory(
+ public function getBaseDataModelDeserializerFactory() {
+ return new BaseDataModelDeserializerFactory(
$this->getDataValueDeserializer(),
$this->getEntityIdParser()
);
}
/**
- * @return InternalDeserializerFactory
+ * @return InternalFormatDeserializerFactory
*/
public function getInternalFormatDeserializerFactory() {
- return new InternalDeserializerFactory(
+ return new InternalFormatDeserializerFactory(
$this->getDataValueDeserializer(),
$this->getEntityIdParser(),
- $this->getExternalFormatEntityDeserializer()
+ $this->getAllTypesEntityDeserializer()
);
}
/**
* @return DispatchingDeserializer
*/
- private function getExternalFormatEntityDeserializer() {
+ private function getAllTypesEntityDeserializer() {
if ( $this->entityDeserializer === null ) {
$deserializerFactoryCallbacks =
$this->getEntityDeserializerFactoryCallbacks();
- $deserializerFactory =
$this->getExternalFormatDeserializerFactory();
+ $baseDeserializerFactory =
$this->getBaseDataModelDeserializerFactory();
$deserializers = array();
foreach ( $deserializerFactoryCallbacks as $callback ) {
- $deserializers[] = call_user_func( $callback,
$deserializerFactory );
+ $deserializers[] = call_user_func( $callback,
$baseDeserializerFactory );
}
$this->entityDeserializer = new
DispatchingDeserializer( $deserializers );
diff --git
a/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
b/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
index 9e86555..c87ecf7 100644
---
a/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
@@ -65,8 +65,8 @@
->method( 'getFormat' )
->will( $this->returnValue( SnakFormatter::FORMAT_PLAIN
) );
- $snakDeserializer =
$wikibaseClient->getExternalFormatDeserializerFactory()->newSnakDeserializer();
- $snaksDeserializer =
$wikibaseClient->getExternalFormatDeserializerFactory()->newSnakListDeserializer();
+ $snakDeserializer =
$wikibaseClient->getBaseDataModelDeserializerFactory()->newSnakDeserializer();
+ $snaksDeserializer =
$wikibaseClient->getBaseDataModelDeserializerFactory()->newSnakListDeserializer();
return new SnakSerializationRenderer(
$snakFormatter,
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 1ec8cb5..d2da724 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -289,7 +289,7 @@
}
public function testGetExternalFormatDeserializerFactory() {
- $deserializerFactory =
$this->getWikibaseClient()->getExternalFormatDeserializerFactory();
+ $deserializerFactory =
$this->getWikibaseClient()->getBaseDataModelDeserializerFactory();
$this->assertInstanceOf( DeserializerFactory::class,
$deserializerFactory );
}
diff --git a/repo/includes/Api/SetReference.php
b/repo/includes/Api/SetReference.php
index 7721b10..d6f392a 100644
--- a/repo/includes/Api/SetReference.php
+++ b/repo/includes/Api/SetReference.php
@@ -72,7 +72,7 @@
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
- $this->deserializerFactory =
$wikibaseRepo->getExternalFormatDeserializerFactory();
+ $this->deserializerFactory =
$wikibaseRepo->getBaseDataModelDeserializerFactory();
$this->modificationHelper = new StatementModificationHelper(
$wikibaseRepo->getSnakFactory(),
diff --git a/repo/includes/Content/EntityContent.php
b/repo/includes/Content/EntityContent.php
index f8dc449..0c72cae 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -454,7 +454,7 @@
}
// NOTE: this may or may not be consistent with what
EntityContentCodec does!
- $serializer =
WikibaseRepo::getDefaultInstance()->getEntitySerializer();
+ $serializer =
WikibaseRepo::getDefaultInstance()->getAllTypesEntitySerializer();
return $serializer->serialize( $this->getEntity() );
}
diff --git a/repo/includes/Specials/SpecialEntityData.php
b/repo/includes/Specials/SpecialEntityData.php
index f326c79..8fcb871 100644
--- a/repo/includes/Specials/SpecialEntityData.php
+++ b/repo/includes/Specials/SpecialEntityData.php
@@ -76,7 +76,7 @@
$entityIdParser = $wikibaseRepo->getEntityIdParser();
$entityDataFormatProvider = new EntityDataFormatProvider();
- $serializerFactory = $wikibaseRepo->getSerializerFactory(
+ $serializerFactory =
$wikibaseRepo->getBaseDataModelSerializerFactory(
SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH +
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
);
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index a7f36fa..288efc5 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -33,14 +33,14 @@
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\Client\EntityDataRetrievalServiceFactory;
use Wikibase\Client\WikibaseClient;
-use Wikibase\DataModel\DeserializerFactory;
+use Wikibase\DataModel\DeserializerFactory as BaseDataModelDeserializerFactory;
use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\SerializerFactory as BaseDataModelSerializerFactory;
use Wikibase\DataModel\Services\Diff\EntityDiffer;
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\DataModel\Services\EntityId\SuffixEntityIdParser;
@@ -55,7 +55,7 @@
use Wikibase\DataModel\Services\Term\TermBuffer;
use Wikibase\EditEntityFactory;
use Wikibase\EntityFactory;
-use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
+use Wikibase\InternalSerialization\DeserializerFactory as
InternalFormatDeserializerFactory;
use Wikibase\ItemChange;
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\LanguageFallbackChainFactory;
@@ -1303,40 +1303,42 @@
public function getEntityContentDataCodec() {
return new EntityContentDataCodec(
$this->getEntityIdParser(),
- $this->getEntitySerializer(),
+ $this->getAllTypesEntitySerializer(),
$this->getInternalFormatEntityDeserializer(),
$this->settings->getSetting( 'maxSerializedEntitySize'
) * 1024
);
}
/**
- * @return DeserializerFactory
+ * @return BaseDataModelDeserializerFactory
*/
- public function getExternalFormatDeserializerFactory() {
- return new DeserializerFactory(
+ public function getBaseDataModelDeserializerFactory() {
+ return new BaseDataModelDeserializerFactory(
$this->getDataValueDeserializer(),
$this->getEntityIdParser()
);
}
/**
- * @return InternalDeserializerFactory
+ * @return InternalFormatDeserializerFactory
*/
public function getInternalFormatDeserializerFactory() {
- return new InternalDeserializerFactory(
+ return new InternalFormatDeserializerFactory(
$this->getDataValueDeserializer(),
$this->getEntityIdParser(),
- $this->getExternalFormatEntityDeserializer()
+ $this->getAllTypesEntityDeserializer()
);
}
/**
- * @param int $options bitwise combination of the
SerializerFactory::OPTION_ flags
+ * @param int $options bitwise combination of the
BaseDataModelSerializerFactory::OPTION_ flags
*
- * @return SerializerFactory
+ * @return BaseDataModelSerializerFactory
*/
- public function getSerializerFactory( $options =
SerializerFactory::OPTION_DEFAULT ) {
- return new SerializerFactory( new DataValueSerializer(),
$options );
+ public function getBaseDataModelSerializerFactory(
+ $options = BaseDataModelSerializerFactory::OPTION_DEFAULT
+ ) {
+ return new BaseDataModelSerializerFactory( new
DataValueSerializer(), $options );
}
/**
@@ -1344,14 +1346,14 @@
*
* @return Deserializer
*/
- public function getExternalFormatEntityDeserializer() {
+ public function getAllTypesEntityDeserializer() {
if ( $this->entityDeserializer === null ) {
$deserializerFactoryCallbacks =
$this->entityTypeDefinitions->getDeserializerFactoryCallbacks();
- $deserializerFactory =
$this->getExternalFormatDeserializerFactory();
+ $baseDeserializerFactory =
$this->getBaseDataModelDeserializerFactory();
$deserializers = array();
foreach ( $deserializerFactoryCallbacks as $callback ) {
- $deserializers[] = call_user_func( $callback,
$deserializerFactory );
+ $deserializers[] = call_user_func( $callback,
$baseDeserializerFactory );
}
$this->entityDeserializer = new
DispatchingDeserializer( $deserializers );
@@ -1370,18 +1372,20 @@
}
/**
- * @param int $options bitwise combination of the
SerializerFactory::OPTION_ flags
+ * @param int $options bitwise combination of the
BaseDataModelSerializerFactory::OPTION_ flags
*
* @return Serializer
*/
- public function getEntitySerializer( $options =
SerializerFactory::OPTION_DEFAULT ) {
+ public function getAllTypesEntitySerializer(
+ $options = BaseDataModelSerializerFactory::OPTION_DEFAULT
+ ) {
if ( !isset( $this->entitySerializers[$options] ) ) {
$serializerFactoryCallbacks =
$this->entityTypeDefinitions->getSerializerFactoryCallbacks();
- $serializerFactory = $this->getSerializerFactory(
$options );
+ $baseSerializerFactory =
$this->getBaseDataModelSerializerFactory( $options );
$serializers = array();
foreach ( $serializerFactoryCallbacks as $callback ) {
- $serializers[] = call_user_func( $callback,
$serializerFactory );
+ $serializers[] = call_user_func( $callback,
$baseSerializerFactory );
}
$this->entitySerializers[$options] = new
DispatchingSerializer( $serializers );
@@ -1405,14 +1409,14 @@
* @return Deserializer
*/
public function getExternalFormatStatementDeserializer() {
- return
$this->getExternalFormatDeserializerFactory()->newStatementDeserializer();
+ return
$this->getBaseDataModelDeserializerFactory()->newStatementDeserializer();
}
/**
* @return Serializer
*/
public function getStatementSerializer() {
- return $this->getSerializerFactory()->newStatementSerializer();
+ return
$this->getBaseDataModelSerializerFactory()->newStatementSerializer();
}
/**
@@ -1543,8 +1547,8 @@
* @return ApiHelperFactory
*/
public function getApiHelperFactory( IContextSource $context ) {
- $serializerOptions =
SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH
- +
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH;
+ $serializerOptions =
BaseDataModelSerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH
+ +
BaseDataModelSerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH;
return new ApiHelperFactory(
$this->getEntityTitleLookup(),
@@ -1554,8 +1558,8 @@
$this->getSummaryFormatter(),
$this->getEntityRevisionLookup( 'uncached' ),
$this->newEditEntityFactory( $context ),
- $this->getSerializerFactory( $serializerOptions ),
- $this->getEntitySerializer( $serializerOptions ),
+ $this->getBaseDataModelSerializerFactory(
$serializerOptions ),
+ $this->getAllTypesEntitySerializer( $serializerOptions
),
$this->getEntityIdParser(),
$this->getStore()->newSiteLinkStore(),
$this->getEntityFactory(),
@@ -1666,9 +1670,9 @@
// CachingPropertyInfoLookup enough?
new InProcessCachingDataTypeLookup(
$this->getPropertyDataTypeLookup() ),
$this->getLocalItemUriParser(),
- $this->getEntitySerializer(
-
SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH +
-
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
+ $this->getAllTypesEntitySerializer(
+
BaseDataModelSerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH +
+
BaseDataModelSerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
),
$this->settings->getSetting(
'preferredGeoDataProperties' ),
$this->settings->getSetting(
'preferredPageImagesProperties' ),
diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php
index 9575497..ce97d63 100644
--- a/repo/maintenance/dumpJson.php
+++ b/repo/maintenance/dumpJson.php
@@ -88,7 +88,7 @@
$wikibaseRepo->getStore()->getEntityPrefetcher(),
$wikibaseRepo->getPropertyDataTypeLookup(),
new RevisionBasedEntityLookup( $revisionLookup
),
- $wikibaseRepo->getEntitySerializer(
+ $wikibaseRepo->getAllTypesEntitySerializer(
SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH +
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
)
diff --git a/repo/tests/phpunit/includes/Api/EditPageTest.php
b/repo/tests/phpunit/includes/Api/EditPageTest.php
index 45b141b..cc614b1 100644
--- a/repo/tests/phpunit/includes/Api/EditPageTest.php
+++ b/repo/tests/phpunit/includes/Api/EditPageTest.php
@@ -38,7 +38,7 @@
$item->setLabel( "de", "EditPageTest" );
- $data = $wikibaseRepo->getEntitySerializer()->serialize( $item
);
+ $data =
$wikibaseRepo->getAllTypesEntitySerializer()->serialize( $item );
$text = json_encode( $data );
$title = $wikibaseRepo->getEntityTitleLookup()->getTitleForId(
$item->getId() );
diff --git a/repo/tests/phpunit/includes/Api/SetReferenceTest.php
b/repo/tests/phpunit/includes/Api/SetReferenceTest.php
index 44b172d..bbe0fb8 100644
--- a/repo/tests/phpunit/includes/Api/SetReferenceTest.php
+++ b/repo/tests/phpunit/includes/Api/SetReferenceTest.php
@@ -71,7 +71,7 @@
new DataValueSerializer(),
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
);
- $this->deserializerFactory =
$wikibaseRepo->getExternalFormatDeserializerFactory();
+ $this->deserializerFactory =
$wikibaseRepo->getBaseDataModelDeserializerFactory();
}
/**
diff --git
a/repo/tests/phpunit/includes/Content/DeferredDecodingEntityHolderTest.php
b/repo/tests/phpunit/includes/Content/DeferredDecodingEntityHolderTest.php
index b4feace..42c65f2 100644
--- a/repo/tests/phpunit/includes/Content/DeferredDecodingEntityHolderTest.php
+++ b/repo/tests/phpunit/includes/Content/DeferredDecodingEntityHolderTest.php
@@ -47,7 +47,7 @@
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$codec = new EntityContentDataCodec(
new ItemIdParser(),
- $wikibaseRepo->getEntitySerializer(),
+ $wikibaseRepo->getAllTypesEntitySerializer(),
$wikibaseRepo->getInternalFormatEntityDeserializer()
);
$blob = $codec->encodeEntity( $entity, CONTENT_FORMAT_JSON );
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index 26a4cc6..933ba4e 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -351,7 +351,7 @@
public function exportTransformProvider() {
$entity = $this->newEntity();
- $internalSerializer =
WikibaseRepo::getDefaultInstance()->getEntitySerializer();
+ $internalSerializer =
WikibaseRepo::getDefaultInstance()->getAllTypesEntitySerializer();
$oldBlob = json_encode( $internalSerializer->serialize( $entity
) );
// fake several old formats
@@ -406,7 +406,7 @@
$settings->setSetting( 'transformLegacyFormatOnExport', true );
$entity = $this->newEntity();
- $entitySerializer = $this->getWikibaseRepo( $settings
)->getEntitySerializer();
+ $entitySerializer = $this->getWikibaseRepo( $settings
)->getAllTypesEntitySerializer();
$expected = json_encode( $entitySerializer->serialize( $entity
) );
$handler = $this->getHandler( $settings );
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index b8eee7b..e95401a 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -55,7 +55,7 @@
$serializerOptions =
SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH +
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH;
$this->serializerFactory = new SerializerFactory( new
DataValueSerializer(), $serializerOptions );
- $this->deserializerFactory =
$wikibaseRepo->getExternalFormatDeserializerFactory();
+ $this->deserializerFactory =
$wikibaseRepo->getBaseDataModelDeserializerFactory();
}
/**
diff --git a/repo/tests/phpunit/includes/EntityModificationTestHelper.php
b/repo/tests/phpunit/includes/EntityModificationTestHelper.php
index 1122a3a..045c1df 100644
--- a/repo/tests/phpunit/includes/EntityModificationTestHelper.php
+++ b/repo/tests/phpunit/includes/EntityModificationTestHelper.php
@@ -47,7 +47,7 @@
public function __construct() {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$this->idParser = $wikibaseRepo->getEntityIdParser();
- $this->serializer = $wikibaseRepo->getEntitySerializer();
+ $this->serializer =
$wikibaseRepo->getAllTypesEntitySerializer();
$this->deserializer =
$wikibaseRepo->getInternalFormatEntityDeserializer();
$this->mockRepository = new MockRepository();
$this->redirectResolvingEntityLookup = new
RedirectResolvingEntityLookup( $this->mockRepository );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 91d5560..93b99b8 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -398,17 +398,17 @@
}
public function testGetExternalFormatDeserializerFactory() {
- $deserializerFactory =
$this->getWikibaseRepo()->getExternalFormatDeserializerFactory();
+ $deserializerFactory =
$this->getWikibaseRepo()->getBaseDataModelDeserializerFactory();
$this->assertInstanceOf( DeserializerFactory::class,
$deserializerFactory );
}
public function testGetSerializerFactory() {
- $serializerFactory =
$this->getWikibaseRepo()->getSerializerFactory();
+ $serializerFactory =
$this->getWikibaseRepo()->getBaseDataModelSerializerFactory();
$this->assertInstanceOf( SerializerFactory::class,
$serializerFactory );
}
public function testGetExternalFormatEntityDeserializer() {
- $deserializer =
$this->getWikibaseRepo()->getExternalFormatEntityDeserializer();
+ $deserializer =
$this->getWikibaseRepo()->getAllTypesEntityDeserializer();
$this->assertInstanceOf( Deserializer::class, $deserializer );
}
@@ -418,7 +418,7 @@
}
public function testGetEntitySerializer() {
- $serializer = $this->getWikibaseRepo()->getEntitySerializer();
+ $serializer =
$this->getWikibaseRepo()->getAllTypesEntitySerializer();
$this->assertInstanceOf( Serializer::class, $serializer );
}
--
To view, visit https://gerrit.wikimedia.org/r/338749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic126c46d84d15b255a3cac69b3260c08b22fff9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
