WMDE-leszek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374997 )
Change subject: Rename getEntitySerializer methods getFullEntitySerializer in
data-access
......................................................................
Rename getEntitySerializer methods getFullEntitySerializer in data-access
For more distinct constract with getCompactEntitySerializer
Change-Id: I4adcd62964d0abeae7fba837727fada3cd5c22e1
---
M data-access/src/GenericServices.php
M data-access/src/MultipleRepositoryAwareWikibaseServices.php
M data-access/src/PerRepositoryServiceWiring.php
M data-access/src/WikibaseServices.php
M data-access/tests/phpunit/GenericServicesTest.php
M data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
M repo/includes/WikibaseRepo.php
7 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/97/374997/1
diff --git a/data-access/src/GenericServices.php
b/data-access/src/GenericServices.php
index 719878e..7f6d1f2 100644
--- a/data-access/src/GenericServices.php
+++ b/data-access/src/GenericServices.php
@@ -66,7 +66,7 @@
/**
* @return Serializer Entity serializer that generates the full
(expanded) serialization.
*/
- public function getEntitySerializer() {
+ public function getFullEntitySerializer() {
if ( !isset( $this->entitySerializer ) ) {
$serializerFactoryCallbacks =
$this->entityTypeDefinitions->getSerializerFactoryCallbacks();
$baseSerializerFactory =
$this->getBaseDataModelSerializerFactory();
diff --git a/data-access/src/MultipleRepositoryAwareWikibaseServices.php
b/data-access/src/MultipleRepositoryAwareWikibaseServices.php
index 4221891..b556f26 100644
--- a/data-access/src/MultipleRepositoryAwareWikibaseServices.php
+++ b/data-access/src/MultipleRepositoryAwareWikibaseServices.php
@@ -140,8 +140,8 @@
'EntityRevisionLookup' => function() use (
$multiRepositoryServices ) {
return
$multiRepositoryServices->getEntityRevisionLookup();
},
- 'EntitySerializer' => function() use ( $genericServices
) {
- return $genericServices->getEntitySerializer();
+ 'FullEntitySerializer' => function() use (
$genericServices ) {
+ return
$genericServices->getFullEntitySerializer();
},
'CompactEntitySerializer' => function() use (
$genericServices ) {
return
$genericServices->getCompactEntitySerializer();
@@ -199,8 +199,8 @@
*
* @return Serializer
*/
- public function getEntitySerializer() {
- return $this->getService( 'EntitySerializer' );
+ public function getFullEntitySerializer() {
+ return $this->getService( 'FullEntitySerializer' );
}
/**
diff --git a/data-access/src/PerRepositoryServiceWiring.php
b/data-access/src/PerRepositoryServiceWiring.php
index 91401fb..3a48db2 100644
--- a/data-access/src/PerRepositoryServiceWiring.php
+++ b/data-access/src/PerRepositoryServiceWiring.php
@@ -68,7 +68,7 @@
} elseif ( $services->getRepositoryName() !== '' ) {
$serializer = new ForbiddenSerializer( 'Serialization
of foreign entities is not supported!' );
} else {
- $serializer = $genericServices->getEntitySerializer();
+ $serializer =
$genericServices->getFullEntitySerializer();
}
$codec = new EntityContentDataCodec(
diff --git a/data-access/src/WikibaseServices.php
b/data-access/src/WikibaseServices.php
index eb93d69..455de66 100644
--- a/data-access/src/WikibaseServices.php
+++ b/data-access/src/WikibaseServices.php
@@ -44,7 +44,7 @@
*
* @return Serializer
*/
- public function getEntitySerializer();
+ public function getFullEntitySerializer();
/**
* Returns the entity serializer instance that generates the most
compact serialization.
diff --git a/data-access/tests/phpunit/GenericServicesTest.php
b/data-access/tests/phpunit/GenericServicesTest.php
index 4199671..acfa6ad 100644
--- a/data-access/tests/phpunit/GenericServicesTest.php
+++ b/data-access/tests/phpunit/GenericServicesTest.php
@@ -21,14 +21,14 @@
public function testGetEntitySerializer() {
$services = $this->newGenericServices();
- $this->assertInstanceOf( Serializer::class,
$services->getEntitySerializer() );
+ $this->assertInstanceOf( Serializer::class,
$services->getFullEntitySerializer() );
}
public function
testGetEntitySerializerReusesTheInstanceForMultipleCalls() {
$services = $this->newGenericServices();
- $serializerOne = $services->getEntitySerializer();
- $serializerTwo = $services->getEntitySerializer();
+ $serializerOne = $services->getFullEntitySerializer();
+ $serializerTwo = $services->getFullEntitySerializer();
$this->assertSame( $serializerOne, $serializerTwo );
}
diff --git
a/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
b/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
index 0c785b0..106f241 100644
--- a/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
+++ b/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
@@ -101,10 +101,10 @@
$this->assertInstanceOf( EntityRevisionLookup::class,
$wikibaseServices->getEntityRevisionLookup() );
}
- public function testGetEntitySerializer() {
+ public function testGetFullEntitySerializer() {
$wikibaseServices =
$this->newMultipleRepositoryAwareWikibaseServices();
- $this->assertInstanceOf( Serializer::class,
$wikibaseServices->getEntitySerializer() );
+ $this->assertInstanceOf( Serializer::class,
$wikibaseServices->getFullEntitySerializer() );
}
public function testGetCompactEntitySerializer() {
@@ -174,7 +174,7 @@
'EntityInfoBuilderFactory',
'EntityPrefetcher',
'EntityRevisionLookup',
- 'EntitySerializer',
+ 'FullEntitySerializer',
'CompactEntitySerializer',
'EntityStoreWatcher',
'LanguageFallbackChainFactory',
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3d0ecdb..d834670 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1452,7 +1452,7 @@
*/
public function getAllTypesEntitySerializer() {
if ( $this->wikibaseServices !== null ) {
- return $this->wikibaseServices->getEntitySerializer();
+ return
$this->wikibaseServices->getFullEntitySerializer();
}
if ( !isset( $this->entitySerializer ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/374997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4adcd62964d0abeae7fba837727fada3cd5c22e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
