Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203094
Change subject: Remove SiteLinkLookup member from TermValidatorFactory
......................................................................
Remove SiteLinkLookup member from TermValidatorFactory
Not used and never was... has been added (probably by accident)
in ca42db59f42ba6f5df04d68a8df14789ed9fdd83.
Change-Id: I09c6f0e99fe29f0dbdf2806438c4d1c2d4cc272a
---
M repo/includes/Validators/TermValidatorFactory.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
4 files changed, 4 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/203094/1
diff --git a/repo/includes/Validators/TermValidatorFactory.php
b/repo/includes/Validators/TermValidatorFactory.php
index 7048375..b3dcdc1 100644
--- a/repo/includes/Validators/TermValidatorFactory.php
+++ b/repo/includes/Validators/TermValidatorFactory.php
@@ -8,7 +8,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
use Wikibase\LabelDescriptionDuplicateDetector;
-use Wikibase\Lib\Store\SiteLinkLookup;
/**
* Provides validators for terms (like the maximum length of labels, etc).
@@ -41,16 +40,10 @@
private $duplicateDetector;
/**
- * @var SiteLinkLookup
- */
- private $siteLinkLookup;
-
- /**
* @param int $maxLength The maximum length of terms.
* @param string[] $languageCodes A list of valid language codes
* @param EntityIdParser $idParser
* @param LabelDescriptionDuplicateDetector $duplicateDetector
- * @param SiteLinkLookup $siteLinkLookup
*
* @throws InvalidArgumentException
*/
@@ -58,8 +51,7 @@
$maxLength,
array $languageCodes,
EntityIdParser $idParser,
- LabelDescriptionDuplicateDetector $duplicateDetector,
- SiteLinkLookup $siteLinkLookup
+ LabelDescriptionDuplicateDetector $duplicateDetector
) {
if ( !is_int( $maxLength ) || $maxLength <= 0 ) {
throw new InvalidArgumentException( '$maxLength must be
a positive integer.' );
@@ -69,7 +61,6 @@
$this->languageCodes = $languageCodes;
$this->idParser = $idParser;
$this->duplicateDetector = $duplicateDetector;
- $this->siteLinkLookup = $siteLinkLookup;
}
/**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 1311b8e..54574b7 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -706,8 +706,7 @@
$maxLength,
$languages,
$this->getEntityIdParser(),
- $this->getLabelDescriptionDuplicateDetector(),
- $this->getStore()->newSiteLinkCache()
+ $this->getLabelDescriptionDuplicateDetector()
);
}
diff --git
a/repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
b/repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
index 5e6271b..ee578f1 100644
--- a/repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
+++ b/repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
@@ -35,9 +35,8 @@
$mockProvider = new ChangeOpTestMockProvider( $this );
$dupeDetector =
$mockProvider->getMockLabelDescriptionDuplicateDetector();
- $siteLinkLookup = $this->getMock(
'Wikibase\Lib\Store\SiteLinkLookup' );
- $builders = new TermValidatorFactory( $maxLength, $languages,
$idParser, $dupeDetector, $siteLinkLookup );
+ $builders = new TermValidatorFactory( $maxLength, $languages,
$idParser, $dupeDetector );
return $builders;
}
diff --git
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index 2d40fb4..6f1f575 100644
---
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -70,8 +70,7 @@
$maxLength,
self::$languageCodes,
$this->getIdParser(),
- $this->getLabelDescriptionDuplicateDetector(),
- $this->mockRepository
+ $this->getLabelDescriptionDuplicateDetector()
)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/203094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09c6f0e99fe29f0dbdf2806438c4d1c2d4cc272a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
