jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/377235 )
Change subject: Remove unused EntityContentDataCodec from Repo's SqlStore
......................................................................
Remove unused EntityContentDataCodec from Repo's SqlStore
Change-Id: If94638474daa7777207eb01b9e03346ebe0f11f3
---
M repo/includes/Store/Sql/SqlStore.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
M repo/tests/phpunit/includes/Store/StoreTest.php
4 files changed, 0 insertions(+), 17 deletions(-)
Approvals:
Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Store/Sql/SqlStore.php
b/repo/includes/Store/Sql/SqlStore.php
index 6bb448a..5cf676b 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -19,7 +19,6 @@
use Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
use Wikibase\Lib\Store\CachingPropertyInfoLookup;
use Wikibase\Lib\Store\Sql\EntityChangeLookup;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityNamespaceLookup;
@@ -60,11 +59,6 @@
* @author Daniel Kinzler
*/
class SqlStore implements Store {
-
- /**
- * @var EntityContentDataCodec
- */
- private $contentCodec;
/**
* @var EntityChangeFactory
@@ -183,7 +177,6 @@
/**
* @param EntityChangeFactory $entityChangeFactory
- * @param EntityContentDataCodec $contentCodec
* @param EntityIdParser $entityIdParser
* @param EntityIdComposer $entityIdComposer
* @param EntityIdLookup $entityIdLookup
@@ -193,7 +186,6 @@
*/
public function __construct(
EntityChangeFactory $entityChangeFactory,
- EntityContentDataCodec $contentCodec,
EntityIdParser $entityIdParser,
EntityIdComposer $entityIdComposer,
EntityIdLookup $entityIdLookup,
@@ -202,7 +194,6 @@
WikibaseServices $wikibaseServices
) {
$this->entityChangeFactory = $entityChangeFactory;
- $this->contentCodec = $contentCodec;
$this->entityIdParser = $entityIdParser;
$this->entityIdComposer = $entityIdComposer;
$this->entityIdLookup = $entityIdLookup;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 397d167..bf1c52b 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -898,7 +898,6 @@
if ( $this->store === null ) {
$this->store = new SqlStore(
$this->getEntityChangeFactory(),
- $this->getEntityContentDataCodec(),
$this->getEntityIdParser(),
$this->getEntityIdComposer(),
$this->getEntityIdLookup(),
diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
index fab24d6..ac80298 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
@@ -11,7 +11,6 @@
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\EntityIdComposer;
use Wikibase\Lib\Store\Sql\EntityChangeLookup;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -47,10 +46,6 @@
->disableOriginalConstructor()
->getMock();
- $contentCodec = $this->getMockBuilder(
EntityContentDataCodec::class )
- ->disableOriginalConstructor()
- ->getMock();
-
$entityIdComposer = $this->getMockBuilder(
EntityIdComposer::class )
->disableOriginalConstructor()
->getMock();
@@ -74,7 +69,6 @@
return new SqlStore(
$changeFactory,
- $contentCodec,
$this->getMock( EntityIdParser::class ),
$entityIdComposer,
$this->getMock( EntityIdLookup::class ),
diff --git a/repo/tests/phpunit/includes/Store/StoreTest.php
b/repo/tests/phpunit/includes/Store/StoreTest.php
index bee6045..a433129 100644
--- a/repo/tests/phpunit/includes/Store/StoreTest.php
+++ b/repo/tests/phpunit/includes/Store/StoreTest.php
@@ -40,7 +40,6 @@
$instances = [
new SqlStore(
$wikibaseRepo->getEntityChangeFactory(),
- $wikibaseRepo->getEntityContentDataCodec(),
$wikibaseRepo->getEntityIdParser(),
$wikibaseRepo->getEntityIdComposer(),
$this->getMock( EntityIdLookup::class ),
--
To view, visit https://gerrit.wikimedia.org/r/377235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If94638474daa7777207eb01b9e03346ebe0f11f3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
