Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/321870
Change subject: Rename EntityTitleLookup to EntityTitleStoreLookup
......................................................................
Rename EntityTitleLookup to EntityTitleStoreLookup
We do need a generic "EntityTitleLookup" interface, but the name is
occupied. I'm doing the first step here: Rename the existing class and
make it's contract much, much more clear. That's all this patch does.
This is an alternative for I96889cd and I866457e. I96889cd and I866457e
can be rebased on top of this. I just did not wanted to do this before we
agree on something.
Personally I believe this is *worse* than I96889cd and I866457e alone.
Look at the massive amount of lines this patch touches for no reason.
Most of this will be reverted when the other two patches are rebased on
top of this. Plus this patch will break PropertySuggester (two times!),
while the other two will not. But if this helps getting the other two
unstuck, I don't mind.
Bug: T148626
Change-Id: Ief1e17291f302aa1c2d80642a4fed6b802160ad3
---
M lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
M lib/includes/Formatters/EntityIdTitleFormatter.php
M lib/includes/Formatters/WikibaseValueFormatterBuilders.php
R lib/includes/Store/EntityTitleStoreLookup.php
M lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
M lib/tests/phpunit/Formatters/EntityIdLinkFormatterTest.php
M lib/tests/phpunit/Formatters/EntityIdPlainLinkFormatterTest.php
M lib/tests/phpunit/Formatters/EntityIdTitleFormatterTest.php
M lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
M repo/includes/Api/ApiHelperFactory.php
M repo/includes/Api/EntitySearchHelper.php
M repo/includes/Api/ModifyEntity.php
M repo/includes/Api/QuerySearchEntities.php
M repo/includes/Api/ResultBuilder.php
M repo/includes/Api/SearchEntities.php
M repo/includes/Content/EntityContentFactory.php
M repo/includes/Content/EntityHandler.php
M repo/includes/Dumpers/RdfDumpGenerator.php
M repo/includes/EditEntity.php
M repo/includes/EditEntityFactory.php
M repo/includes/EntityIdHtmlLinkFormatterFactory.php
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/Interactors/ItemMergeInteractor.php
M repo/includes/Interactors/RedirectCreationInteractor.php
M repo/includes/ItemDisambiguation.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/LinkedData/EntityDataUriManager.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/includes/ParserOutput/ReferencedEntitiesDataUpdater.php
M repo/includes/Rdf/RdfBuilder.php
M repo/includes/Specials/SpecialItemByTitle.php
M repo/includes/Specials/SpecialListProperties.php
M repo/includes/Specials/SpecialModifyEntity.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
M repo/includes/Specials/SpecialWikibaseQueryPage.php
M repo/includes/Specials/SpecialWikibaseRepoPage.php
M repo/includes/Store/Sql/SqlStore.php
M repo/includes/Store/Sql/WikiPageEntityRedirectLookup.php
M repo/includes/Store/Sql/WikiPageEntityStore.php
M repo/includes/WikibaseRepo.php
M repo/maintenance/dumpRdf.php
M repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/Api/CreateRedirectTest.php
M repo/tests/phpunit/includes/Api/EntitySearchHelperTest.php
M repo/tests/phpunit/includes/Api/MergeItemsTest.php
M repo/tests/phpunit/includes/Api/QuerySearchEntitiesTest.php
M repo/tests/phpunit/includes/Api/ResultBuilderTest.php
M repo/tests/phpunit/includes/Api/SearchEntitiesTest.php
M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M repo/tests/phpunit/includes/EditEntityTest.php
M repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
M repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
M repo/tests/phpunit/includes/ItemDisambiguationTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
M
repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/ParserOutput/ReferencedEntitiesDataUpdaterTest.php
M repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php
M repo/tests/phpunit/includes/Specials/SpecialEntityDataTest.php
M repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
M repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
M repo/tests/phpunit/includes/Specials/SpecialWikibaseRepoPageTestBase.php
M repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
M repo/tests/phpunit/includes/Store/StoreTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
77 files changed, 250 insertions(+), 246 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/321870/1
diff --git a/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
b/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
index f81ef38..d41ee58 100644
--- a/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
+++ b/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermFallback;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* Formats entity IDs by generating an HTML link to the corresponding page
title.
@@ -27,18 +27,18 @@
private $languageFallbackIndicator;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
protected $entityTitleLookup;
/**
* @param LabelDescriptionLookup $labelDescriptionLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param LanguageNameLookup $languageNameLookup
*/
public function __construct(
LabelDescriptionLookup $labelDescriptionLookup,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
LanguageNameLookup $languageNameLookup
) {
parent::__construct( $labelDescriptionLookup );
diff --git a/lib/includes/Formatters/EntityIdTitleFormatter.php
b/lib/includes/Formatters/EntityIdTitleFormatter.php
index 80482e8..610b223 100644
--- a/lib/includes/Formatters/EntityIdTitleFormatter.php
+++ b/lib/includes/Formatters/EntityIdTitleFormatter.php
@@ -4,7 +4,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* Formats entity IDs by generating the corresponding page title.
@@ -17,14 +17,14 @@
class EntityIdTitleFormatter implements EntityIdFormatter {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
protected $titleLookup;
/**
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
*/
- public function __construct( EntityTitleLookup $titleLookup ) {
+ public function __construct( EntityTitleStoreLookup $titleLookup ) {
$this->titleLookup = $titleLookup;
}
diff --git a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
index 255f7a8..a27075e 100644
--- a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
@@ -18,7 +18,7 @@
use Wikibase\Formatters\MonolingualTextFormatter;
use Wikibase\Lib\Formatters\EntityIdSiteLinkFormatter;
use Wikibase\Lib\Formatters\CommonsThumbnailFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
/**
@@ -56,7 +56,7 @@
private $repoItemUriParser;
/**
- * @var EntityTitleLookup|null
+ * @var EntityTitleStoreLookup|null
*/
private $entityTitleLookup;
@@ -87,7 +87,7 @@
* @param FormatterLabelDescriptionLookupFactory
$labelDescriptionLookupFactory
* @param LanguageNameLookup $languageNameLookup
* @param EntityIdParser $repoItemUriParser
- * @param EntityTitleLookup|null $entityTitleLookup Only when used on a
repo.
+ * @param EntityTitleStoreLookup|null $entityTitleLookup Only when used
on a repo.
* @param SiteLinkLookup|null $siteLinkLookup Only when used on a
client.
* @param string|null $localSiteId Only when used on a client.
*/
@@ -96,7 +96,7 @@
FormatterLabelDescriptionLookupFactory
$labelDescriptionLookupFactory,
LanguageNameLookup $languageNameLookup,
EntityIdParser $repoItemUriParser,
- EntityTitleLookup $entityTitleLookup = null,
+ EntityTitleStoreLookup $entityTitleLookup = null,
SiteLinkLookup $siteLinkLookup = null,
$localSiteId = null
) {
diff --git a/lib/includes/Store/EntityTitleLookup.php
b/lib/includes/Store/EntityTitleStoreLookup.php
similarity index 76%
rename from lib/includes/Store/EntityTitleLookup.php
rename to lib/includes/Store/EntityTitleStoreLookup.php
index 3708096..3677a3c 100644
--- a/lib/includes/Store/EntityTitleLookup.php
+++ b/lib/includes/Store/EntityTitleStoreLookup.php
@@ -9,15 +9,18 @@
use Wikibase\DataModel\Entity\EntityId;
/**
- * Represents a mapping from entity IDs to wiki page titles.
+ * Represents a mapping from entity IDs to wiki page titles, assuming that the
resulting title
+ * represents a page that actually stores the entity contents. For example,
the property P1 will be
+ * resolved to the "Property" namespace and the page "Property:P1".
+ *
* The mapping could be programmatic, or it could be based on database lookups.
*
- * @since 0.4
+ * @since 0.5
*
* @license GPL-2.0+
* @author Daniel Kinzler
*/
-interface EntityTitleLookup {
+interface EntityTitleStoreLookup {
/**
* Returns the Title for the given entity.
@@ -27,7 +30,7 @@
*
* @todo change this to return a TitleValue
*
- * @since 0.4
+ * @since 0.5
*
* @param EntityId $id
*
diff --git a/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
b/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
index eb82876..da4e31e 100644
--- a/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Term\TermFallback;
use Wikibase\Lib\EntityIdHtmlLinkFormatter;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* @covers Wikibase\Lib\EntityIdHtmlLinkFormatter
@@ -59,10 +59,10 @@
/**
* @param bool $exists
*
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function newEntityTitleLookup( $exists = true ) {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function ( EntityId $id
) use ( $exists ) {
diff --git a/lib/tests/phpunit/Formatters/EntityIdLinkFormatterTest.php
b/lib/tests/phpunit/Formatters/EntityIdLinkFormatterTest.php
index 7da0e95..76306bc 100644
--- a/lib/tests/phpunit/Formatters/EntityIdLinkFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/EntityIdLinkFormatterTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\EntityIdLinkFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* @covers Wikibase\Lib\EntityIdLinkFormatter
@@ -59,7 +59,7 @@
}
private function newEntityIdLinkFormatter() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/lib/tests/phpunit/Formatters/EntityIdPlainLinkFormatterTest.php
b/lib/tests/phpunit/Formatters/EntityIdPlainLinkFormatterTest.php
index bcc31cb..8413b68 100644
--- a/lib/tests/phpunit/Formatters/EntityIdPlainLinkFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/EntityIdPlainLinkFormatterTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\EntityIdPlainLinkFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* @covers Wikibase\Lib\EntityIdPlainLinkFormatter
@@ -60,7 +60,7 @@
}
private function newEntityIdLinkFormatter() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/lib/tests/phpunit/Formatters/EntityIdTitleFormatterTest.php
b/lib/tests/phpunit/Formatters/EntityIdTitleFormatterTest.php
index b9d790e..72b7565 100644
--- a/lib/tests/phpunit/Formatters/EntityIdTitleFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/EntityIdTitleFormatterTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\EntityIdTitleFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* @covers Wikibase\Lib\EntityIdTitleFormatter
@@ -61,7 +61,7 @@
}
protected function newEntityIdTitleFormatter() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git
a/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
b/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
index 4f7b812..ce8c073 100644
--- a/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
+++ b/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
@@ -27,7 +27,7 @@
use Wikibase\Lib\FormatterLabelDescriptionLookupFactory;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\WikibaseValueFormatterBuilders;
/**
@@ -51,11 +51,11 @@
}
/**
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
*
* @return WikibaseValueFormatterBuilders
*/
- private function newWikibaseValueFormatterBuilders( EntityTitleLookup
$entityTitleLookup ) {
+ private function newWikibaseValueFormatterBuilders(
EntityTitleStoreLookup $entityTitleLookup ) {
$termLookup = $this->getMock( TermLookup::class );
$termLookup->expects( $this->any() )
@@ -104,10 +104,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
diff --git a/repo/includes/Api/ApiHelperFactory.php
b/repo/includes/Api/ApiHelperFactory.php
index f4ef893..ef39de5 100644
--- a/repo/includes/Api/ApiHelperFactory.php
+++ b/repo/includes/Api/ApiHelperFactory.php
@@ -13,7 +13,7 @@
use Wikibase\EntityFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Repo\Localizer\ExceptionLocalizer;
use Wikibase\SummaryFormatter;
@@ -30,7 +30,7 @@
class ApiHelperFactory {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -92,7 +92,7 @@
/**
* ApiHelperFactory constructor.
*
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param ExceptionLocalizer $exceptionLocalizer
* @param PropertyDataTypeLookup $dataTypeLookup
* @param SiteStore $siteStore
@@ -106,7 +106,7 @@
* @param EntityStore|null $entityStore
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
ExceptionLocalizer $exceptionLocalizer,
PropertyDataTypeLookup $dataTypeLookup,
SiteStore $siteStore,
diff --git a/repo/includes/Api/EntitySearchHelper.php
b/repo/includes/Api/EntitySearchHelper.php
index 4e91663..0a841b9 100644
--- a/repo/includes/Api/EntitySearchHelper.php
+++ b/repo/includes/Api/EntitySearchHelper.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataModel\Term\Term;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\TermIndexEntry;
@@ -21,7 +21,7 @@
class EntitySearchHelper {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -41,7 +41,7 @@
private $labelDescriptionLookup;
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
EntityIdParser $idParser,
TermIndexSearchInteractor $termIndexSearchInteractor,
LabelDescriptionLookup $labelDescriptionLookup
diff --git a/repo/includes/Api/ModifyEntity.php
b/repo/includes/Api/ModifyEntity.php
index 4cb362a..247d7c6 100644
--- a/repo/includes/Api/ModifyEntity.php
+++ b/repo/includes/Api/ModifyEntity.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\SiteLinkTargetProvider;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Repo\WikibaseRepo;
@@ -44,7 +44,7 @@
protected $siteLinkTargetProvider;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -131,7 +131,7 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
protected function getTitleLookup() {
return $this->titleLookup;
diff --git a/repo/includes/Api/QuerySearchEntities.php
b/repo/includes/Api/QuerySearchEntities.php
index dcc494f..175c843 100644
--- a/repo/includes/Api/QuerySearchEntities.php
+++ b/repo/includes/Api/QuerySearchEntities.php
@@ -7,7 +7,7 @@
use ApiQueryGeneratorBase;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Interactors\TermSearchResult;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\Repo\WikibaseRepo;
@@ -25,7 +25,7 @@
private $entitySearchHelper;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -73,13 +73,13 @@
* Override services, for use for testing.
*
* @param EntitySearchHelper $entitySearchHelper
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param ContentLanguages $termsLanguages
* @param array $entityTypes
*/
public function setServices(
EntitySearchHelper $entitySearchHelper,
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
ContentLanguages $termsLanguages,
array $entityTypes
) {
diff --git a/repo/includes/Api/ResultBuilder.php
b/repo/includes/Api/ResultBuilder.php
index f25712b..93fe97c 100644
--- a/repo/includes/Api/ResultBuilder.php
+++ b/repo/includes/Api/ResultBuilder.php
@@ -21,7 +21,7 @@
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\Serialization\CallbackFactory;
use Wikibase\Lib\Serialization\SerializationModifier;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikimedia\Assert\Assert;
/**
@@ -41,7 +41,7 @@
private $result;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -87,7 +87,7 @@
/**
* @param ApiResult $result
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param SerializerFactory $serializerFactory
* @param Serializer $entitySerializer
* @param SiteStore $siteStore
@@ -96,7 +96,7 @@
*/
public function __construct(
ApiResult $result,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
SerializerFactory $serializerFactory,
Serializer $entitySerializer,
SiteStore $siteStore,
diff --git a/repo/includes/Api/SearchEntities.php
b/repo/includes/Api/SearchEntities.php
index a9cb3f1..39c8157 100644
--- a/repo/includes/Api/SearchEntities.php
+++ b/repo/includes/Api/SearchEntities.php
@@ -6,7 +6,7 @@
use ApiMain;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Interactors\TermSearchResult;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\Repo\WikibaseRepo;
@@ -30,7 +30,7 @@
private $entitySearchHelper;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -84,14 +84,14 @@
* Override services, for use for testing.
*
* @param EntitySearchHelper $entitySearchHelper
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param ContentLanguages $termLanguages
* @param array $entityTypes
* @param string $conceptBaseUri
*/
public function setServices(
EntitySearchHelper $entitySearchHelper,
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
ContentLanguages $termLanguages,
array $entityTypes,
$conceptBaseUri
diff --git a/repo/includes/Content/EntityContentFactory.php
b/repo/includes/Content/EntityContentFactory.php
index 80cdd7a..20b5eff 100644
--- a/repo/includes/Content/EntityContentFactory.php
+++ b/repo/includes/Content/EntityContentFactory.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\EntityContent;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Store\EntityIdLookup;
@@ -30,7 +30,7 @@
* @author Daniel Kinzler
* @author Bene* < [email protected] >
*/
-class EntityContentFactory implements EntityTitleLookup, EntityIdLookup,
EntityPermissionChecker {
+class EntityContentFactory implements EntityTitleStoreLookup, EntityIdLookup,
EntityPermissionChecker {
/**
* @var string[] Entity type ID to content model ID mapping.
diff --git a/repo/includes/Content/EntityHandler.php
b/repo/includes/Content/EntityHandler.php
index ac57e82..291867a 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -473,7 +473,7 @@
*
* @since 0.5
*
- * @see EntityTitleLookup::getTitleForId
+ * @see EntityTitleStoreLookup::getTitleForId
*
* @param EntityId $id
*
diff --git a/repo/includes/Dumpers/RdfDumpGenerator.php
b/repo/includes/Dumpers/RdfDumpGenerator.php
index 7fe8578..d541cf4 100644
--- a/repo/includes/Dumpers/RdfDumpGenerator.php
+++ b/repo/includes/Dumpers/RdfDumpGenerator.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\DataModel\Services\Lookup\RedirectResolvingEntityLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
@@ -56,7 +56,7 @@
private $pageProps;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -65,11 +65,11 @@
* @param EntityRevisionLookup $lookup Must not resolve redirects
* @param RdfBuilder $rdfBuilder
* @param EntityPrefetcher $entityPrefetcher
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
*/
public function __construct( $out, EntityRevisionLookup $lookup,
RdfBuilder $rdfBuilder,
EntityPrefetcher $entityPrefetcher,
- EntityTitleLookup $titleLookup ) {
+ EntityTitleStoreLookup $titleLookup ) {
parent::__construct( $out, $entityPrefetcher );
if ( $lookup instanceof RedirectResolvingEntityLookup ) {
throw new InvalidArgumentException( '$lookup must not
resolve redirects!' );
@@ -196,8 +196,9 @@
* @param ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory
* @param EntityPrefetcher $entityPrefetcher
* @param RdfVocabulary $vocabulary
- * @param EntityTitleLookup $titleLookup
- * @return static
+ * @param EntityTitleStoreLookup $titleLookup
+ *
+*@return static
* @throws MWException
*/
public static function createDumpGenerator(
@@ -209,7 +210,7 @@
ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory,
EntityPrefetcher $entityPrefetcher,
RdfVocabulary $vocabulary,
- EntityTitleLookup $titleLookup
+ EntityTitleStoreLookup $titleLookup
) {
$rdfWriter = self::getRdfWriter( $format );
if ( !$rdfWriter ) {
diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index 6eb21a1..b67d868 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Store\EntityPermissionChecker;
@@ -41,7 +41,7 @@
private $entityRevisionLookup;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -172,7 +172,7 @@
/**
* @since 0.5
*
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param EntityRevisionLookup $entityLookup
* @param EntityStore $entityStore
* @param EntityPermissionChecker $permissionChecker
@@ -193,7 +193,7 @@
* @throws InvalidArgumentException
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
EntityRevisionLookup $entityLookup,
EntityStore $entityStore,
EntityPermissionChecker $permissionChecker,
diff --git a/repo/includes/EditEntityFactory.php
b/repo/includes/EditEntityFactory.php
index e289547..56c4e0e 100644
--- a/repo/includes/EditEntityFactory.php
+++ b/repo/includes/EditEntityFactory.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Store\EntityPermissionChecker;
@@ -22,7 +22,7 @@
class EditEntityFactory {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -62,7 +62,7 @@
private $context;
/**
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param EntityRevisionLookup $entityLookup
* @param EntityStore $entityStore
* @param EntityPermissionChecker $permissionChecker
@@ -72,7 +72,7 @@
* @param IContextSource|null $context
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
EntityRevisionLookup $entityLookup,
EntityStore $entityStore,
EntityPermissionChecker $permissionChecker,
diff --git a/repo/includes/EntityIdHtmlLinkFormatterFactory.php
b/repo/includes/EntityIdHtmlLinkFormatterFactory.php
index cb8dde1..077e0d2 100644
--- a/repo/includes/EntityIdHtmlLinkFormatterFactory.php
+++ b/repo/includes/EntityIdHtmlLinkFormatterFactory.php
@@ -6,7 +6,7 @@
use Wikibase\Lib\EntityIdHtmlLinkFormatter;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\View\EntityIdFormatterFactory;
/**
@@ -18,7 +18,7 @@
class EntityIdHtmlLinkFormatterFactory implements EntityIdFormatterFactory {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -28,11 +28,11 @@
private $languageNameLookup;
/**
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param LanguageNameLookup $languageNameLookup
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
LanguageNameLookup $languageNameLookup
) {
$this->titleLookup = $titleLookup;
diff --git a/repo/includes/Hooks/EditFilterHookRunner.php
b/repo/includes/Hooks/EditFilterHookRunner.php
index c01ddcf..de5d589 100644
--- a/repo/includes/Hooks/EditFilterHookRunner.php
+++ b/repo/includes/Hooks/EditFilterHookRunner.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityRedirect;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Content\EntityContentFactory;
use WikiPage;
@@ -28,7 +28,7 @@
class EditFilterHookRunner {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -43,12 +43,12 @@
private $context;
/**
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param EntityContentFactory $entityContentFactory
* @param IContextSource $context
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
EntityContentFactory $entityContentFactory,
IContextSource $context
) {
diff --git a/repo/includes/Interactors/ItemMergeInteractor.php
b/repo/includes/Interactors/ItemMergeInteractor.php
index e1e7af5..0e799fe 100644
--- a/repo/includes/Interactors/ItemMergeInteractor.php
+++ b/repo/includes/Interactors/ItemMergeInteractor.php
@@ -14,7 +14,7 @@
use Wikibase\EntityContent;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Store\EntityPermissionChecker;
@@ -67,7 +67,7 @@
private $interactorRedirect;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -79,7 +79,7 @@
* @param SummaryFormatter $summaryFormatter
* @param User $user
* @param RedirectCreationInteractor $interactorRedirect
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
*/
public function __construct(
MergeChangeOpsFactory $changeOpFactory,
@@ -89,7 +89,7 @@
SummaryFormatter $summaryFormatter,
User $user,
RedirectCreationInteractor $interactorRedirect,
- EntityTitleLookup $entityTitleLookup
+ EntityTitleStoreLookup $entityTitleLookup
) {
$this->changeOpFactory = $changeOpFactory;
diff --git a/repo/includes/Interactors/RedirectCreationInteractor.php
b/repo/includes/Interactors/RedirectCreationInteractor.php
index 15309e1..2eab2c3 100644
--- a/repo/includes/Interactors/RedirectCreationInteractor.php
+++ b/repo/includes/Interactors/RedirectCreationInteractor.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
@@ -29,7 +29,7 @@
class RedirectCreationInteractor {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -76,7 +76,7 @@
* @param User $user
* @param EditFilterHookRunner $editFilterHookRunner
* @param EntityRedirectLookup $entityRedirectLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
*/
public function __construct(
EntityRevisionLookup $entityRevisionLookup,
@@ -86,7 +86,7 @@
User $user,
EditFilterHookRunner $editFilterHookRunner,
EntityRedirectLookup $entityRedirectLookup,
- EntityTitleLookup $entityTitleLookup
+ EntityTitleStoreLookup $entityTitleLookup
) {
$this->entityRevisionLookup = $entityRevisionLookup;
$this->entityStore = $entityStore;
diff --git a/repo/includes/ItemDisambiguation.php
b/repo/includes/ItemDisambiguation.php
index 5a9f06c..8fec133 100644
--- a/repo/includes/ItemDisambiguation.php
+++ b/repo/includes/ItemDisambiguation.php
@@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Interactors\TermSearchResult;
/**
@@ -24,7 +24,7 @@
class ItemDisambiguation {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -41,12 +41,12 @@
/**
* @since 0.5
*
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param LanguageNameLookup $languageNameLookup
* @param string $displayLanguageCode
*/
public function __construct(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
LanguageNameLookup $languageNameLookup,
$displayLanguageCode
) {
diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php
b/repo/includes/LinkedData/EntityDataRequestHandler.php
index 42ceb87..2c59845 100644
--- a/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -16,7 +16,7 @@
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\BadRevisionException;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\RedirectRevision;
@@ -68,7 +68,7 @@
private $entityRedirectLookup;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -101,7 +101,7 @@
* @since 0.4
*
* @param EntityDataUriManager $uriManager
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param EntityIdParser $entityIdParser
* @param EntityRevisionLookup $entityRevisionLookup
* @param EntityRedirectLookup $entityRedirectLookup
@@ -114,7 +114,7 @@
*/
public function __construct(
EntityDataUriManager $uriManager,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
EntityIdParser $entityIdParser,
EntityRevisionLookup $entityRevisionLookup,
EntityRedirectLookup $entityRedirectLookup,
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index f15c04e..7a41980 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -18,7 +18,7 @@
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\EntityRevision;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
use Wikibase\Rdf\HashDedupeBag;
use Wikibase\Rdf\RdfBuilder;
@@ -52,7 +52,7 @@
private $entityLookup = null;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -98,7 +98,7 @@
/**
* @param EntityLookup $entityLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param PropertyDataTypeLookup $propertyLookup
* @param ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory
* @param SiteList $sites
@@ -111,7 +111,7 @@
*/
public function __construct(
EntityLookup $entityLookup,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
PropertyDataTypeLookup $propertyLookup,
ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory,
SiteList $sites,
diff --git a/repo/includes/LinkedData/EntityDataUriManager.php
b/repo/includes/LinkedData/EntityDataUriManager.php
index 587acaa..73865d7 100644
--- a/repo/includes/LinkedData/EntityDataUriManager.php
+++ b/repo/includes/LinkedData/EntityDataUriManager.php
@@ -4,7 +4,7 @@
use Title;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* Manages URIs for the linked data interface
@@ -27,7 +27,7 @@
private $supportedExtensions;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -36,12 +36,12 @@
*
* @param Title $interfaceTitle
* @param string[] $supportedExtensions an associative
Array mapping canonical format names to file extensions.
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
*/
public function __construct(
Title $interfaceTitle,
array $supportedExtensions,
- EntityTitleLookup $entityTitleLookup
+ EntityTitleStoreLookup $entityTitleLookup
) {
$this->interfaceTitle = $interfaceTitle;
$this->supportedExtensions = $supportedExtensions;
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 086d13d..8da59d1 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -17,7 +17,7 @@
use Wikibase\Lib\Store\EntityInfo;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityInfoTermLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
@@ -52,7 +52,7 @@
private $configBuilder;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -99,7 +99,7 @@
/**
* @param DispatchingEntityViewFactory $entityViewFactory
* @param ParserOutputJsConfigBuilder $configBuilder
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param EntityInfoBuilderFactory $entityInfoBuilderFactory
* @param LanguageFallbackChain $languageFallbackChain
* @param TemplateFactory $templateFactory
@@ -112,7 +112,7 @@
public function __construct(
DispatchingEntityViewFactory $entityViewFactory,
ParserOutputJsConfigBuilder $configBuilder,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
EntityInfoBuilderFactory $entityInfoBuilderFactory,
LanguageFallbackChain $languageFallbackChain,
TemplateFactory $templateFactory,
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index 18d17c3..7dbb767 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -11,7 +11,7 @@
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\MediaWikiLocalizedTextProvider;
use Wikibase\View\Template\TemplateFactory;
@@ -40,7 +40,7 @@
private $entityInfoBuilderFactory;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -88,7 +88,7 @@
/**
* @param DispatchingEntityViewFactory $entityViewFactory
* @param EntityInfoBuilderFactory $entityInfoBuilderFactory
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param LanguageFallbackChainFactory $languageFallbackChainFactory
* @param TemplateFactory $templateFactory
* @param EntityDataFormatProvider $entityDataFormatProvider
@@ -103,7 +103,7 @@
public function __construct(
DispatchingEntityViewFactory $entityViewFactory,
EntityInfoBuilderFactory $entityInfoBuilderFactory,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
LanguageFallbackChainFactory $languageFallbackChainFactory,
TemplateFactory $templateFactory,
EntityDataFormatProvider $entityDataFormatProvider,
diff --git a/repo/includes/ParserOutput/ReferencedEntitiesDataUpdater.php
b/repo/includes/ParserOutput/ReferencedEntitiesDataUpdater.php
index 198b442..b998b03 100644
--- a/repo/includes/ParserOutput/ReferencedEntitiesDataUpdater.php
+++ b/repo/includes/ParserOutput/ReferencedEntitiesDataUpdater.php
@@ -15,7 +15,7 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* Finds linked entities on an Entity and add the links to ParserOutput.
@@ -30,7 +30,7 @@
class ReferencedEntitiesDataUpdater implements StatementDataUpdater,
SiteLinkDataUpdater {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -45,13 +45,13 @@
private $entityIds = array();
/**
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param EntityIdParser $externalEntityIdParser Parser for external
entity IDs (usually URIs)
* into EntityIds. Such external entity IDs may be used
for units in QuantityValues, for
* calendar models in TimeValue, and for the reference
globe in GlobeCoordinateValues.
*/
public function __construct(
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
EntityIdParser $externalEntityIdParser
) {
$this->entityTitleLookup = $entityTitleLookup;
diff --git a/repo/includes/Rdf/RdfBuilder.php b/repo/includes/Rdf/RdfBuilder.php
index dfb4e1d..961b1b1 100644
--- a/repo/includes/Rdf/RdfBuilder.php
+++ b/repo/includes/Rdf/RdfBuilder.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Term\FingerprintProvider;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikimedia\Purtle\RdfWriter;
@@ -84,7 +84,7 @@
private $valueSnakRdfBuilderFactory;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -102,7 +102,7 @@
* @param int $flavor
* @param RdfWriter $writer
* @param DedupeBag $dedupeBag
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
*/
public function __construct(
SiteList $sites,
@@ -112,7 +112,7 @@
$flavor,
RdfWriter $writer,
DedupeBag $dedupeBag,
- EntityTitleLookup $titleLookup
+ EntityTitleStoreLookup $titleLookup
) {
$this->vocabulary = $vocabulary;
$this->propertyLookup = $propertyLookup;
diff --git a/repo/includes/Specials/SpecialItemByTitle.php
b/repo/includes/Specials/SpecialItemByTitle.php
index 5e57b3f..12e3cbc 100644
--- a/repo/includes/Specials/SpecialItemByTitle.php
+++ b/repo/includes/Specials/SpecialItemByTitle.php
@@ -7,7 +7,7 @@
use Site;
use SiteStore;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Repo\SiteLinkTargetProvider;
use Wikibase\Repo\WikibaseRepo;
@@ -25,7 +25,7 @@
class SpecialItemByTitle extends SpecialWikibasePage {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -101,14 +101,14 @@
* Initialize the services used be this special page.
* May be used to inject mock services for testing.
*
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param LanguageNameLookup $languageNameLookup
* @param SiteStore $siteStore
* @param SiteLinkLookup $siteLinkLookup
* @param SiteLinkTargetProvider $siteLinkTargetProvider
*/
public function initServices(
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
LanguageNameLookup $languageNameLookup,
SiteStore $siteStore,
SiteLinkLookup $siteLinkLookup,
diff --git a/repo/includes/Specials/SpecialListProperties.php
b/repo/includes/Specials/SpecialListProperties.php
index f8e2fc7..d4c4fa7 100644
--- a/repo/includes/Specials/SpecialListProperties.php
+++ b/repo/includes/Specials/SpecialListProperties.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
use Wikibase\DataTypeSelector;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\PropertyInfoStore;
use Wikibase\Repo\WikibaseRepo;
@@ -60,7 +60,7 @@
private $entityIdFormatter;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -93,7 +93,7 @@
PropertyInfoStore $propertyInfoStore,
EntityIdFormatterFactory $entityIdFormatterFactory,
LanguageFallbackChainFactory $languageFallbackChainFactory,
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
BufferingTermLookup $bufferingTermLookup
) {
$fallbackMode = LanguageFallbackChainFactory::FALLBACK_ALL;
diff --git a/repo/includes/Specials/SpecialModifyEntity.php
b/repo/includes/Specials/SpecialModifyEntity.php
index 1c4bde5..58ec0e6 100644
--- a/repo/includes/Specials/SpecialModifyEntity.php
+++ b/repo/includes/Specials/SpecialModifyEntity.php
@@ -14,7 +14,7 @@
use Wikibase\EntityRevision;
use Wikibase\Lib\MessageException;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\UserInputException;
@@ -84,14 +84,14 @@
*
* @param SummaryFormatter $summaryFormatter
* @param EntityRevisionLookup $entityRevisionLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param SiteStore $siteStore
* @param EditEntityFactory $editEntityFactory
*/
public function setSpecialModifyEntityServices(
SummaryFormatter $summaryFormatter,
EntityRevisionLookup $entityRevisionLookup,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
SiteStore $siteStore,
EditEntityFactory $editEntityFactory
) {
diff --git a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
index 0892aef..6c9968a 100644
--- a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
@@ -16,7 +16,7 @@
use Wikibase\EditEntityFactory;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
use Wikibase\SummaryFormatter;
@@ -81,7 +81,7 @@
*
* @param SummaryFormatter $summaryFormatter
* @param EntityRevisionLookup $entityRevisionLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param SiteStore $siteStore
* @param FingerprintChangeOpFactory $changeOpFactory
* @param ContentLanguages $termsLanguages
@@ -90,7 +90,7 @@
public function setServices(
SummaryFormatter $summaryFormatter,
EntityRevisionLookup $entityRevisionLookup,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
SiteStore $siteStore,
FingerprintChangeOpFactory $changeOpFactory,
ContentLanguages $termsLanguages,
diff --git a/repo/includes/Specials/SpecialWikibaseQueryPage.php
b/repo/includes/Specials/SpecialWikibaseQueryPage.php
index 80e458e..f499288 100644
--- a/repo/includes/Specials/SpecialWikibaseQueryPage.php
+++ b/repo/includes/Specials/SpecialWikibaseQueryPage.php
@@ -6,7 +6,7 @@
use Linker;
use Title;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -59,7 +59,7 @@
protected $numRows;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
diff --git a/repo/includes/Specials/SpecialWikibaseRepoPage.php
b/repo/includes/Specials/SpecialWikibaseRepoPage.php
index 348c3fb..eb9fcb2 100644
--- a/repo/includes/Specials/SpecialWikibaseRepoPage.php
+++ b/repo/includes/Specials/SpecialWikibaseRepoPage.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\EditEntityFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\UserInputException;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
@@ -33,7 +33,7 @@
protected $summaryFormatter;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -69,13 +69,13 @@
* Override services (for testing).
*
* @param SummaryFormatter $summaryFormatter
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param SiteStore $siteStore
* @param EditEntityFactory $editEntityFactory
*/
public function setSpecialWikibaseRepoPageServices(
SummaryFormatter $summaryFormatter,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
SiteStore $siteStore,
EditEntityFactory $editEntityFactory
) {
diff --git a/repo/includes/Store/Sql/SqlStore.php
b/repo/includes/Store/Sql/SqlStore.php
index 7c77a22..a71c6ee 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -20,7 +20,7 @@
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LabelConflictFinder;
use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\SiteLinkStore;
@@ -127,7 +127,7 @@
private $entityIdLookup;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -162,7 +162,7 @@
* @param EntityIdParser $entityIdParser
* @param EntityIdComposer $entityIdComposer
* @param EntityIdLookup $entityIdLookup
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param EntityNamespaceLookup $entityNamespaceLookup
*/
public function __construct(
@@ -171,7 +171,7 @@
EntityIdParser $entityIdParser,
EntityIdComposer $entityIdComposer,
EntityIdLookup $entityIdLookup,
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
EntityNamespaceLookup $entityNamespaceLookup
) {
$this->entityChangeFactory = $entityChangeFactory;
diff --git a/repo/includes/Store/Sql/WikiPageEntityRedirectLookup.php
b/repo/includes/Store/Sql/WikiPageEntityRedirectLookup.php
index 71d64c1..1f5745b 100644
--- a/repo/includes/Store/Sql/WikiPageEntityRedirectLookup.php
+++ b/repo/includes/Store/Sql/WikiPageEntityRedirectLookup.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookup;
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Store\EntityIdLookup;
/**
@@ -20,7 +20,7 @@
class WikiPageEntityRedirectLookup implements EntityRedirectLookup {
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $entityTitleLookup;
@@ -35,12 +35,12 @@
private $loadBalancer;
/**
- * @param EntityTitleLookup $entityTitleLookup
+ * @param EntityTitleStoreLookup $entityTitleLookup
* @param EntityIdLookup $entityIdLookup
* @param LoadBalancer $loadBalancer
*/
public function __construct(
- EntityTitleLookup $entityTitleLookup,
+ EntityTitleStoreLookup $entityTitleLookup,
EntityIdLookup $entityIdLookup,
LoadBalancer $loadBalancer
) {
diff --git a/repo/includes/Store/Sql/WikiPageEntityStore.php
b/repo/includes/Store/Sql/WikiPageEntityStore.php
index c1d5c77..90b6aae 100644
--- a/repo/includes/Store/Sql/WikiPageEntityStore.php
+++ b/repo/includes/Store/Sql/WikiPageEntityStore.php
@@ -307,7 +307,7 @@
}
/**
- * @see EntityTitleLookup::getTitleForId
+ * @see EntityTitleStoreLookup::getTitleForId
*
* @param EntityId $entityId
*
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 9a9d24b..d53c255 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -82,7 +82,7 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Lib\UnionContentLanguages;
use Wikibase\Lib\UnitConverter;
@@ -587,7 +587,7 @@
/**
* @since 0.5
*
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
public function getEntityTitleLookup() {
return $this->getEntityContentFactory();
diff --git a/repo/maintenance/dumpRdf.php b/repo/maintenance/dumpRdf.php
index 75c197b..aa2d932 100644
--- a/repo/maintenance/dumpRdf.php
+++ b/repo/maintenance/dumpRdf.php
@@ -8,7 +8,7 @@
use Wikibase\Dumpers\DumpGenerator;
use Wikibase\Dumpers\RdfDumpGenerator;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
use Wikibase\Repo\Store\EntityIdPager;
@@ -62,7 +62,7 @@
private $hasHadServicesSet = false;
/**
- * @var EntityTitleLookup
+ * @var EntityTitleStoreLookup
*/
private $titleLookup;
@@ -79,7 +79,7 @@
* @param ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory
* @param EntityRevisionLookup $entityRevisionLookup
* @param RdfVocabulary $rdfVocabulary
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
*/
public function setServices(
SqlEntityIdPagerFactory $sqlEntityIdPagerFactory,
@@ -89,7 +89,7 @@
ValueSnakRdfBuilderFactory $valueSnakRdfBuilderFactory,
EntityRevisionLookup $entityRevisionLookup,
RdfVocabulary $rdfVocabulary,
- EntityTitleLookup $titleLookup
+ EntityTitleStoreLookup $titleLookup
) {
parent::setDumpEntitiesServices( $sqlEntityIdPagerFactory );
$this->entityPrefetcher = $entityPrefetcher;
diff --git a/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
b/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
index e960e25..ebcb25b 100644
--- a/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
+++ b/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\EditEntityFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\Api\EntityLoadingHelper;
@@ -33,7 +33,7 @@
class ApiHelperFactoryTest extends \PHPUnit_Framework_TestCase {
private function newApiHelperFactory() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$exceptionLocalizer = $this->getMock( ExceptionLocalizer::class
);
$dataTypeLookup = $this->getMock( PropertyDataTypeLookup::class
);
$summaryFormatter = $this->getMockBuilder(
SummaryFormatter::class )
diff --git a/repo/tests/phpunit/includes/Api/CreateRedirectTest.php
b/repo/tests/phpunit/includes/Api/CreateRedirectTest.php
index 0351b86..f299757 100644
--- a/repo/tests/phpunit/includes/Api/CreateRedirectTest.php
+++ b/repo/tests/phpunit/includes/Api/CreateRedirectTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\CreateRedirect;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
@@ -152,10 +152,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git a/repo/tests/phpunit/includes/Api/EntitySearchHelperTest.php
b/repo/tests/phpunit/includes/Api/EntitySearchHelperTest.php
index eb297fe..1f93b58 100644
--- a/repo/tests/phpunit/includes/Api/EntitySearchHelperTest.php
+++ b/repo/tests/phpunit/includes/Api/EntitySearchHelperTest.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataModel\Term\Term;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
use Wikibase\Lib\Interactors\TermSearchResult;
@@ -27,10 +27,10 @@
class EntitySearchHelperTest extends \PHPUnit_Framework_TestCase {
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
if ( $id->getSerialization() === 'Q111' ) {
diff --git a/repo/tests/phpunit/includes/Api/MergeItemsTest.php
b/repo/tests/phpunit/includes/Api/MergeItemsTest.php
index 8990d75..db248ee 100644
--- a/repo/tests/phpunit/includes/Api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/Api/MergeItemsTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Services\Statement\GuidGenerator;
use Wikibase\LabelDescriptionDuplicateDetector;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\MergeItems;
use Wikibase\Repo\Interactors\ItemMergeInteractor;
@@ -126,10 +126,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId
$entityId ) {
diff --git a/repo/tests/phpunit/includes/Api/QuerySearchEntitiesTest.php
b/repo/tests/phpunit/includes/Api/QuerySearchEntitiesTest.php
index 887c618..6b1151e 100644
--- a/repo/tests/phpunit/includes/Api/QuerySearchEntitiesTest.php
+++ b/repo/tests/phpunit/includes/Api/QuerySearchEntitiesTest.php
@@ -14,7 +14,7 @@
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\Lib\StaticContentLanguages;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Repo\Api\QuerySearchEntities;
@@ -45,10 +45,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnValue( $this->getMockTitle() ) );
diff --git a/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
index 376958d..2c69cdc 100644
--- a/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/Api/ResultBuilderTest.php
@@ -30,7 +30,7 @@
use Wikibase\DataModel\Term\TermList;
use Wikibase\EntityRevision;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\ResultBuilder;
/**
@@ -65,7 +65,7 @@
->method( 'getPrefixedText' )
->will( $this->returnValue( 'MockPrefixedText' ) );
- $mockEntityTitleLookup = $this->getMock(
EntityTitleLookup::class );
+ $mockEntityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$mockEntityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnValue( $mockTitle ) );
diff --git a/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php
b/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php
index a32017b..de8de63 100644
--- a/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php
+++ b/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\StaticContentLanguages;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Repo\Api\SearchEntities;
use Wikibase\Lib\Interactors\TermSearchResult;
@@ -46,10 +46,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnValue( $this->getMockTitle() ) );
diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 5e49928..0334c35 100644
--- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
@@ -16,7 +16,7 @@
use Wikibase\Dumpers\RdfDumpGenerator;
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Repo\Tests\Rdf\NTriplesRdfTestHelper;
@@ -88,10 +88,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId
$entityId ) {
diff --git a/repo/tests/phpunit/includes/EditEntityTest.php
b/repo/tests/phpunit/includes/EditEntityTest.php
index 8bee761..ad2e1ae 100644
--- a/repo/tests/phpunit/includes/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/EditEntityTest.php
@@ -19,7 +19,7 @@
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\EditEntity;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Tests\MockRepository;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Store\EntityPermissionChecker;
@@ -50,10 +50,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
@@ -127,7 +127,7 @@
/**
* @param MockRepository $mockRepository
* @param EntityDocument $entity
- * @param EntityTitleLookup $titleLookup
+ * @param EntityTitleStoreLookup $titleLookup
* @param User|null $user
* @param bool $baseRevId
* @param bool[]|null $permissions map of actions to bool, indicating
which actions are allowed.
@@ -138,7 +138,7 @@
private function makeEditEntity(
MockRepository $mockRepository,
EntityDocument $entity,
- EntityTitleLookup $titleLookup,
+ EntityTitleStoreLookup $titleLookup,
User $user = null,
$baseRevId = false,
array $permissions = null,
diff --git
a/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
b/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
index 39fa67d..a8c8319 100644
--- a/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
+++ b/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
/**
@@ -23,7 +23,7 @@
class EntityIdHtmlLinkFormatterFactoryTest extends PHPUnit_Framework_TestCase {
private function getFormatterFactory() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$languageNameLookup = $this->getMock( LanguageNameLookup::class
);
$languageNameLookup->expects( $this->never() )
diff --git a/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
b/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
index 1c40394..8ebb7ff 100644
--- a/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
@@ -15,7 +15,7 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\ItemContent;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Content\EntityContentFactory;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
@@ -39,7 +39,7 @@
$context = new RequestContext();
$context->setRequest( new FauxRequest() );
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git
a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index 50a0210..5b04201 100644
--- a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -12,7 +12,7 @@
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Interactors\ItemMergeException;
@@ -106,10 +106,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $mock = $this->getMock( EntityTitleLookup::class );
+ $mock = $this->getMock( EntityTitleStoreLookup::class );
$mock->expects( $this->any() )
->method( 'getTitleForId' )
@@ -165,10 +165,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git
a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
index 52ee0f6..6e73e03 100644
--- a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Interactors\RedirectCreationException;
@@ -151,10 +151,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git a/repo/tests/phpunit/includes/ItemDisambiguationTest.php
b/repo/tests/phpunit/includes/ItemDisambiguationTest.php
index c3f95e7..0ab8707 100644
--- a/repo/tests/phpunit/includes/ItemDisambiguationTest.php
+++ b/repo/tests/phpunit/includes/ItemDisambiguationTest.php
@@ -9,7 +9,7 @@
use Wikibase\ItemDisambiguation;
use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
/**
* @covers Wikibase\ItemDisambiguation
@@ -35,7 +35,7 @@
* @return ItemDisambiguation
*/
private function newInstance() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnValue( $this->getMock(
Title::class ) ) );
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index bfd210a..a4fc08b 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\LinkedData\EntityDataRequestHandler;
@@ -83,7 +83,7 @@
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 258219b..3095d1f 100644
---
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\EntityRevision;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Tests\MockRepository;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\RedirectRevision;
@@ -86,7 +86,7 @@
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'wikibase-item' ) );
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
index 42d2a62..c7330e2 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
@@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\LinkedData\EntityDataUriManager;
/**
@@ -36,7 +36,7 @@
}
protected function makeUriManager() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
index cb55670..e6e8507 100644
---
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\ParserOutput\DispatchingEntityViewFactory;
use Wikibase\Repo\ParserOutput\EntityParserOutputGenerator;
@@ -41,7 +41,7 @@
$this->getMockBuilder(
DispatchingEntityViewFactory::class )
->disableOriginalConstructor()->getMock(),
$this->getMock( EntityInfoBuilderFactory::class ),
- $this->getMock( EntityTitleLookup::class ),
+ $this->getMock( EntityTitleStoreLookup::class ),
new LanguageFallbackChainFactory(),
$this->getMockBuilder( TemplateFactory::class )
->disableOriginalConstructor()->getMock(),
diff --git
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
index a6fd4ff..c5a9c1a 100644
---
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\EntityIdComposer;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\Sql\SqlEntityInfoBuilderFactory;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\ParserOutput\DispatchingEntityViewFactory;
@@ -313,10 +313,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookupMock() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
diff --git
a/repo/tests/phpunit/includes/ParserOutput/ReferencedEntitiesDataUpdaterTest.php
b/repo/tests/phpunit/includes/ParserOutput/ReferencedEntitiesDataUpdaterTest.php
index e5cd174..4990732 100644
---
a/repo/tests/phpunit/includes/ParserOutput/ReferencedEntitiesDataUpdaterTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/ReferencedEntitiesDataUpdaterTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\SiteLinkList;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\StatementList;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\ParserOutput\ReferencedEntitiesDataUpdater;
/**
@@ -45,7 +45,7 @@
* @return ReferencedEntitiesDataUpdater
*/
private function newInstance( $count = 0 ) {
- $entityTitleLookup = $this->getMockBuilder(
EntityTitleLookup::class )
+ $entityTitleLookup = $this->getMockBuilder(
EntityTitleStoreLookup::class )
->disableOriginalConstructor()
->getMock();
$entityTitleLookup->expects( $this->exactly( $count ) )
diff --git a/repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php
index 37374a2..96a922e 100644
--- a/repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Rdf\DedupeBag;
use Wikibase\Rdf\HashDedupeBag;
use Wikibase\Rdf\RdfBuilder;
@@ -62,10 +62,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function ( EntityId
$entityId ) {
diff --git a/repo/tests/phpunit/includes/Specials/SpecialEntityDataTest.php
b/repo/tests/phpunit/includes/Specials/SpecialEntityDataTest.php
index 4c9cb6f..7c9fa1d 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialEntityDataTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialEntityDataTest.php
@@ -16,7 +16,7 @@
use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
use Wikibase\Repo\LinkedData\EntityDataRequestHandler;
@@ -60,7 +60,7 @@
private function newRequestHandler() {
$mockRepository = EntityDataTestProvider::getMockRepository();
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git a/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
b/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
index b60c39f..2a8507d 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
@@ -10,7 +10,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Repo\SiteLinkTargetProvider;
use Wikibase\Repo\Specials\SpecialItemByTitle;
@@ -33,10 +33,10 @@
class SpecialItemByTitleTest extends SpecialPageTestBase {
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockTitleLookup() {
- $mock = $this->getMock( EntityTitleLookup::class );
+ $mock = $this->getMock( EntityTitleStoreLookup::class );
$mock->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git a/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
b/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
index da6631c..86cbf79 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
@@ -10,7 +10,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\PropertyInfoStore;
use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
use Wikibase\Repo\Specials\SpecialListProperties;
@@ -83,10 +83,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback(
diff --git a/repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
b/repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
index 0843755..fde2de2 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
@@ -15,7 +15,7 @@
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\MessageException;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Interactors\ItemMergeException;
use Wikibase\Repo\Interactors\ItemMergeInteractor;
@@ -105,10 +105,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId
$entityId ) {
@@ -182,10 +182,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git a/repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
b/repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
index 811b347..f414877 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
@@ -12,7 +12,7 @@
use User;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\MessageException;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Interactors\RedirectCreationException;
use Wikibase\Repo\Interactors\RedirectCreationInteractor;
@@ -92,10 +92,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git
a/repo/tests/phpunit/includes/Specials/SpecialWikibaseRepoPageTestBase.php
b/repo/tests/phpunit/includes/Specials/SpecialWikibaseRepoPageTestBase.php
index ccc6164..5d56806 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialWikibaseRepoPageTestBase.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialWikibaseRepoPageTestBase.php
@@ -21,7 +21,7 @@
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\SummaryFormatter;
use Wikibase\Lib\Tests\MockRepository;
@@ -63,10 +63,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
protected function getEntityTitleLookup() {
- $titleLookup = $this->getMock( EntityTitleLookup::class );
+ $titleLookup = $this->getMock( EntityTitleStoreLookup::class );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
index cb65339..e9bf2e0 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
@@ -16,7 +16,7 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LabelConflictFinder;
use Wikibase\Lib\Store\SiteLinkStore;
use Wikibase\Lib\Store\Sql\PrefetchingWikiPageEntityMetaDataAccessor;
@@ -59,7 +59,7 @@
$this->getMock( EntityIdParser::class ),
$entityIdComposer,
$this->getMock( EntityIdLookup::class ),
- $this->getMock( EntityTitleLookup::class ),
+ $this->getMock( EntityTitleStoreLookup::class ),
new EntityNamespaceLookup( [] )
);
}
diff --git
a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
index b90d018..a5115bc 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
@@ -8,7 +8,7 @@
use MediaWikiTestCase;
use Title;
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Store\EntityIdLookup;
use WikiPage;
use Wikibase\DataModel\Entity\EntityId;
@@ -130,10 +130,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getMockEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
diff --git a/repo/tests/phpunit/includes/Store/StoreTest.php
b/repo/tests/phpunit/includes/Store/StoreTest.php
index e5ee121..8e429d7 100644
--- a/repo/tests/phpunit/includes/Store/StoreTest.php
+++ b/repo/tests/phpunit/includes/Store/StoreTest.php
@@ -5,7 +5,7 @@
use Wikibase\IdGenerator;
use Wikibase\Lib\Store\EntityChangeLookup;
use Wikibase\Lib\Store\EntityNamespaceLookup;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LabelConflictFinder;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Repo\Store\ChangeStore;
@@ -44,7 +44,7 @@
$wikibaseRepo->getEntityIdParser(),
$wikibaseRepo->getEntityIdComposer(),
$this->getMock( EntityIdLookup::class ),
- $this->getMock( EntityTitleLookup::class ),
+ $this->getMock( EntityTitleStoreLookup::class ),
new EntityNamespaceLookup( [] )
)
);
diff --git
a/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
b/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
index 507a503..569bcb5 100644
--- a/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
+++ b/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Services\Diff\EntityDiffer;
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\EditEntityFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Repo\UpdateRepo\UpdateRepoOnDeleteJob;
@@ -80,10 +80,10 @@
/**
* @param ItemId $itemId
*
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup( ItemId $itemId ) {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->with( $itemId )
diff --git a/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
b/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
index cf6ffa7..e0d4623 100644
--- a/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
+++ b/repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Services\Diff\EntityDiffer;
use Wikibase\DataModel\Services\Diff\EntityPatcher;
use Wikibase\EditEntityFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Repo\Hooks\EditFilterHookRunner;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Repo\UpdateRepo\UpdateRepoOnMoveJob;
@@ -76,10 +76,10 @@
/**
* @param ItemId $itemId
*
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup( ItemId $itemId ) {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->with( $itemId )
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 30045e2..390c5d3 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -47,7 +47,7 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Lib\WikibaseSnakFormatterBuilders;
use Wikibase\Lib\WikibaseValueFormatterBuilders;
@@ -176,7 +176,7 @@
public function testGetEntityTitleLookupReturnType() {
$returnValue = $this->getWikibaseRepo()->getEntityTitleLookup();
- $this->assertInstanceOf( EntityTitleLookup::class, $returnValue
);
+ $this->assertInstanceOf( EntityTitleStoreLookup::class,
$returnValue );
}
public function testGetEntityIdLookupReturnType() {
diff --git a/repo/tests/phpunit/maintenance/dumpRdfTest.php
b/repo/tests/phpunit/maintenance/dumpRdfTest.php
index b54a527..cff04cd 100644
--- a/repo/tests/phpunit/maintenance/dumpRdfTest.php
+++ b/repo/tests/phpunit/maintenance/dumpRdfTest.php
@@ -32,7 +32,7 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\DumpRdf;
-use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleStoreLookup;
use Wikibase\Lib\Tests\MockRepository;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Repo\Store\EntityIdPager;
@@ -211,10 +211,10 @@
}
/**
- * @return EntityTitleLookup
+ * @return EntityTitleStoreLookup
*/
private function getEntityTitleLookup() {
- $entityTitleLookup = $this->getMock( EntityTitleLookup::class );
+ $entityTitleLookup = $this->getMock(
EntityTitleStoreLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId
$entityId ) {
--
To view, visit https://gerrit.wikimedia.org/r/321870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief1e17291f302aa1c2d80642a4fed6b802160ad3
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
