Thiemo Mättig (WMDE) has submitted this change and it was merged.
Change subject: Move EntityTitleLookup into Wikibase\Lib\Store namespace
......................................................................
Move EntityTitleLookup into Wikibase\Lib\Store namespace
Change-Id: I6b6014e86b95a7b8f74b06f0fc1a1491805bdc04
---
M lib/includes/formatters/EntityIdHtmlLinkFormatter.php
M lib/includes/formatters/EntityIdTitleFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/includes/store/EntityTitleLookup.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
M repo/includes/ClaimHtmlGenerator.php
M repo/includes/DiffView.php
M repo/includes/EditEntity.php
M repo/includes/EntityDiffVisualizer.php
M repo/includes/EntityView.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/LinkedData/EntityDataUriManager.php
M repo/includes/Localizer/MessageParameterFormatter.php
M repo/includes/ParserOutputJsConfigBuilder.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/includes/View/ClaimsView.php
M repo/includes/View/SnakHtmlGenerator.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/ApiWikibase.php
M repo/includes/api/ResultBuilder.php
M repo/includes/api/SearchEntities.php
M repo/includes/content/EntityContent.php
M repo/includes/content/EntityContentFactory.php
M repo/includes/content/EntityHandler.php
M repo/includes/content/ItemContent.php
M repo/includes/content/PropertyContent.php
M repo/includes/serializers/EntityRevisionSerializer.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialWikibaseRepoPage.php
M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/EditEntityTest.php
M repo/tests/phpunit/includes/EntityViewTest.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/Localizer/MessageParameterFormatterTest.php
M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/serializers/EntityRevisionSerializerTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
M repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
48 files changed, 62 insertions(+), 49 deletions(-)
Approvals:
WikidataJenkins: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
index 2273325..a3a6b0f 100644
--- a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
@@ -7,8 +7,8 @@
use Title;
use ValueFormatters\FormatterOptions;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Formats entity IDs by generating an HTML link to the corresponding page
title.
diff --git a/lib/includes/formatters/EntityIdTitleFormatter.php
b/lib/includes/formatters/EntityIdTitleFormatter.php
index e6d8c36..c18ddd7 100644
--- a/lib/includes/formatters/EntityIdTitleFormatter.php
+++ b/lib/includes/formatters/EntityIdTitleFormatter.php
@@ -4,7 +4,7 @@
use ValueFormatters\FormatterOptions;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Formats entity IDs by generating the corresponding page title.
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index aa0b06e..81514cc 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -11,10 +11,10 @@
use ValueFormatters\GlobeCoordinateFormatter;
use ValueFormatters\QuantityFormatter;
use ValueFormatters\ValueFormatter;
-use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Defines the formatters for DataValues supported by Wikibase.
diff --git a/lib/includes/store/EntityTitleLookup.php
b/lib/includes/store/EntityTitleLookup.php
index 9991531..ce179dd 100644
--- a/lib/includes/store/EntityTitleLookup.php
+++ b/lib/includes/store/EntityTitleLookup.php
@@ -1,9 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Lib\Store;
use MWException;
use Title;
+use Wikibase\DataModel\Entity\EntityId;
/**
* Represents a mapping from entity IDs to wiki page titles.
diff --git a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
index 1cff30a..18d21de 100644
--- a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
+++ b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
@@ -72,7 +72,7 @@
protected function newEntityIdLinkFormatter() {
$options = new FormatterOptions();
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$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 1784181..fe98b0c 100644
--- a/lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
+++ b/lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
@@ -72,7 +72,7 @@
protected function newEntityIdTitleFormatter() {
$options = new FormatterOptions();
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup->expects( $this->any() )->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 28170de..165f8e0 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use Wikibase\Lib\Serializers\ClaimSerializer;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\View\SnakHtmlGenerator;
/**
diff --git a/repo/includes/DiffView.php b/repo/includes/DiffView.php
index e3461b1..2d63337 100644
--- a/repo/includes/DiffView.php
+++ b/repo/includes/DiffView.php
@@ -8,11 +8,12 @@
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
-use Wikibase\DataModel\Entity\ItemId;
use Html;
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Class for generating views of DiffOp objects.
diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index 6e8f6ba..762dd8c 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -14,6 +14,7 @@
use User;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\WikibaseRepo;
use WikiPage;
diff --git a/repo/includes/EntityDiffVisualizer.php
b/repo/includes/EntityDiffVisualizer.php
index b6303e0..74c8863 100644
--- a/repo/includes/EntityDiffVisualizer.php
+++ b/repo/includes/EntityDiffVisualizer.php
@@ -10,6 +10,7 @@
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Content\EntityContentDiff;
/**
diff --git a/repo/includes/EntityView.php b/repo/includes/EntityView.php
index b33b75b..2db0dfc 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/EntityView.php
@@ -12,6 +12,7 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\View\ClaimsView;
use Wikibase\Repo\View\FingerprintView;
use Wikibase\Repo\View\SectionEditLinkGenerator;
diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php
b/repo/includes/LinkedData/EntityDataRequestHandler.php
index e443d5f..2dc3a78 100644
--- a/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -14,7 +14,7 @@
use Wikibase\Lib\Store\BadRevisionException;
use Wikibase\Lib\Store\EntityRedirectResolvingDecorator;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\StorageException;
/**
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index cfb35a5..0c8eab1 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -15,9 +15,9 @@
use Wikibase\Api\ResultBuilder;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\RdfSerializer;
/**
diff --git a/repo/includes/LinkedData/EntityDataUriManager.php
b/repo/includes/LinkedData/EntityDataUriManager.php
index faf3c7a..b7fe55d 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\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Manages URIs for the linked data interface
diff --git a/repo/includes/Localizer/MessageParameterFormatter.php
b/repo/includes/Localizer/MessageParameterFormatter.php
index c2fd2d3..16528e1 100644
--- a/repo/includes/Localizer/MessageParameterFormatter.php
+++ b/repo/includes/Localizer/MessageParameterFormatter.php
@@ -10,8 +10,8 @@
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\MediaWikiNumberLocalizer;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* ValueFormatter for formatting objects that may be encountered in
diff --git a/repo/includes/ParserOutputJsConfigBuilder.php
b/repo/includes/ParserOutputJsConfigBuilder.php
index 771d2a2..9f95ee3 100644
--- a/repo/includes/ParserOutputJsConfigBuilder.php
+++ b/repo/includes/ParserOutputJsConfigBuilder.php
@@ -8,6 +8,7 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* @since 0.5
diff --git a/repo/includes/UpdateRepoOnMoveJob.php
b/repo/includes/UpdateRepoOnMoveJob.php
index dea5cf2..4e3cb5b 100644
--- a/repo/includes/UpdateRepoOnMoveJob.php
+++ b/repo/includes/UpdateRepoOnMoveJob.php
@@ -11,8 +11,9 @@
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\StorageException;
-use Wikibase\Repo\WikibaseRepo;
use Wikibase\Lib\Store\EntityStore;
+use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\WikibaseRepo;
/**
* Job for updating the repo after a page on the client has been moved.
diff --git a/repo/includes/View/ClaimsView.php
b/repo/includes/View/ClaimsView.php
index 18a1d92..003b0b0 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -8,8 +8,8 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\ReferencedEntitiesFinder;
/**
diff --git a/repo/includes/View/SnakHtmlGenerator.php
b/repo/includes/View/SnakHtmlGenerator.php
index 7a8ab71..8d186c3 100644
--- a/repo/includes/View/SnakHtmlGenerator.php
+++ b/repo/includes/View/SnakHtmlGenerator.php
@@ -5,9 +5,9 @@
use InvalidArgumentException;
use ValueFormatters\FormattingException;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\PropertyNotFoundException;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Base class for generating Snak html.
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 4f431fa..6029a20 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -254,7 +254,7 @@
/**
* @since 0.5
*
- * @return \Wikibase\EntityTitleLookup
+ * @return EntityTitleLookup
*/
public function getEntityTitleLookup() {
return $this->getEntityContentFactory();
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index d7189cd..fe89bcb 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -16,13 +16,13 @@
use Wikibase\EntityFactory;
use Wikibase\EntityPermissionChecker;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Localizer\ExceptionLocalizer;
use Wikibase\Lib\PropertyDataTypeLookup;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\BadRevisionException;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\Store\UnresolvedRedirectException;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/api/ResultBuilder.php
b/repo/includes/api/ResultBuilder.php
index d1cadf8..701a321 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -11,10 +11,10 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Reference;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Serializers\EntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Builder for Api Results
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 016b082..cabe955 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\EntityFactory;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Term;
use Wikibase\Utils;
diff --git a/repo/includes/content/EntityContent.php
b/repo/includes/content/EntityContent.php
index ececba7..40c1b73 100644
--- a/repo/includes/content/EntityContent.php
+++ b/repo/includes/content/EntityContent.php
@@ -30,6 +30,7 @@
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Content\EntityContentDiff;
use Wikibase\Repo\EntitySearchTextGenerator;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/content/EntityContentFactory.php
b/repo/includes/content/EntityContentFactory.php
index dd929e5..0cad4fa 100644
--- a/repo/includes/content/EntityContentFactory.php
+++ b/repo/includes/content/EntityContentFactory.php
@@ -10,6 +10,7 @@
use Title;
use User;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Factory for EntityContent objects.
diff --git a/repo/includes/content/EntityHandler.php
b/repo/includes/content/EntityHandler.php
index e3a23ae..bfe5b87 100644
--- a/repo/includes/content/EntityHandler.php
+++ b/repo/includes/content/EntityHandler.php
@@ -21,6 +21,7 @@
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Updates\DataUpdateAdapter;
use Wikibase\Validators\EntityValidator;
use Wikibase\Validators\ValidatorErrorLocalizer;
diff --git a/repo/includes/content/ItemContent.php
b/repo/includes/content/ItemContent.php
index e064496..6bfc647 100644
--- a/repo/includes/content/ItemContent.php
+++ b/repo/includes/content/ItemContent.php
@@ -13,6 +13,7 @@
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\ItemSearchTextGenerator;
/**
diff --git a/repo/includes/content/PropertyContent.php
b/repo/includes/content/PropertyContent.php
index 839c8b5..67dd1a7 100644
--- a/repo/includes/content/PropertyContent.php
+++ b/repo/includes/content/PropertyContent.php
@@ -8,6 +8,7 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Content object for articles representing Wikibase properties.
diff --git a/repo/includes/serializers/EntityRevisionSerializer.php
b/repo/includes/serializers/EntityRevisionSerializer.php
index 54a3cd0..20b645c 100644
--- a/repo/includes/serializers/EntityRevisionSerializer.php
+++ b/repo/includes/serializers/EntityRevisionSerializer.php
@@ -4,12 +4,12 @@
use InvalidArgumentException;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\Serializers\EntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Serializers\SerializerObject;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* Serializer for some information related to Content. This is not a full
Content serialization,
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index c6b3f97..b2a9815 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -5,9 +5,9 @@
use Html;
use Site;
use SiteStore;
-use Wikibase\EntityTitleLookup;
use Wikibase\ItemHandler;
use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
/**
diff --git a/repo/includes/specials/SpecialItemDisambiguation.php
b/repo/includes/specials/SpecialItemDisambiguation.php
index 8fb919b..1828ed3 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -8,10 +8,10 @@
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\EntityTitleLookup;
use Wikibase\ItemDisambiguation;
use Wikibase\Lib\EntityIdHtmlLinkFormatter;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\TermIndex;
diff --git a/repo/includes/specials/SpecialWikibaseRepoPage.php
b/repo/includes/specials/SpecialWikibaseRepoPage.php
index 21dd051..d92c849 100644
--- a/repo/includes/specials/SpecialWikibaseRepoPage.php
+++ b/repo/includes/specials/SpecialWikibaseRepoPage.php
@@ -14,9 +14,9 @@
use Wikibase\EditEntity;
use Wikibase\EntityPermissionChecker;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
use Wikibase\SummaryFormatter;
diff --git a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
index 8d5f30e..d4ff495 100644
--- a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
@@ -13,8 +13,8 @@
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\SnakList;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\DispatchingSnakFormatter;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\View\SnakHtmlGenerator;
/**
@@ -61,7 +61,7 @@
* @return EntityTitleLookup
*/
protected function getEntityTitleLookupMock() {
- $lookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $lookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$lookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/tests/phpunit/includes/EditEntityTest.php
b/repo/tests/phpunit/includes/EditEntityTest.php
index a03a8bf..5647651 100644
--- a/repo/tests/phpunit/includes/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/EditEntityTest.php
@@ -15,7 +15,7 @@
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\EditEntity;
use Wikibase\EntityPermissionChecker;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* @covers Wikibase\EditEntity
@@ -75,7 +75,7 @@
* @return EntityTitleLookup
*/
protected function newTitleLookupMock() {
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup->expects( $this->any() )
->method( 'getTitleForID' )
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php
b/repo/tests/phpunit/includes/EntityViewTest.php
index a64a02e..bb22e7e 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/EntityViewTest.php
@@ -23,13 +23,13 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\EntityView;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\ParserOutputJsConfigBuilder;
use Wikibase\ReferencedEntitiesFinder;
use Wikibase\Repo\WikibaseRepo;
@@ -67,7 +67,7 @@
* @return EntityTitleLookup
*/
protected function getEntityTitleLookupMock() {
- $lookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $lookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$lookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index 0f8d757..f4df1d1 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -77,7 +77,7 @@
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$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 acf171a..06d9ae6 100644
---
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -33,7 +33,7 @@
->method( 'getDataTypeIdForProperty' )
->will( $this->returnValue( 'string' ) );
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$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 61ede59..9e7629b 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
@@ -35,7 +35,7 @@
}
protected function makeUriManager() {
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( EntityId $id )
{
diff --git
a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
index 1bb2244..08e4ada 100644
--- a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
+++ b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Localizer\MessageParameterFormatter;
/**
@@ -82,7 +82,7 @@
* @return EntityTitleLookup
*/
private function getMockTitleLookup() {
- $mock = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $mock = $this->getMock( 'Wikibase\Lib\Store\EntityTitleLookup'
);
$mock->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback(
diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
index 8aef20e..fe205ff 100644
--- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
+++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
@@ -14,12 +14,12 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\ParserOutputJsConfigBuilder;
use Wikibase\ReferencedEntitiesFinder;
@@ -220,7 +220,7 @@
* @return EntityTitleLookup
*/
private function getEntityTitleLookupMock() {
- $lookup = $this->getMockBuilder( 'Wikibase\EntityTitleLookup' )
+ $lookup = $this->getMockBuilder(
'Wikibase\Lib\Store\EntityTitleLookup' )
->disableOriginalConstructor()
->getMock();
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index 8a5121f..edec60e 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -17,8 +17,8 @@
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\View\ClaimsView;
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Repo\View\SnakHtmlGenerator;
@@ -130,7 +130,7 @@
* @return EntityTitleLookup
*/
private function getEntityTitleLookupMock() {
- $lookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $lookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$lookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
index f5123c6..fa30180 100644
--- a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
@@ -7,8 +7,8 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\EntityTitleLookup;
use Wikibase\Lib\DispatchingSnakFormatter;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\View\SnakHtmlGenerator;
/**
@@ -115,7 +115,7 @@
* @return EntityTitleLookup
*/
protected function getEntityTitleLookupMock() {
- $lookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $lookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$lookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index add8699..e84dc9c 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -38,7 +38,7 @@
public function testGetEntityTitleLookupReturnType() {
$returnValue =
$this->getDefaultInstance()->getEntityTitleLookup();
- $this->assertInstanceOf( 'Wikibase\EntityTitleLookup',
$returnValue );
+ $this->assertInstanceOf(
'Wikibase\Lib\Store\EntityTitleLookup', $returnValue );
}
public function testGetEntityRevisionLookupReturnType() {
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 21fb3e5..afc2ead 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -58,7 +58,7 @@
->method( 'getPrefixedText' )
->will( $this->returnValue( 'MockPrefixedText' ) );
- $mockEntityTitleLookup = $this->getMock(
'\Wikibase\EntityTitleLookup' );
+ $mockEntityTitleLookup = $this->getMock(
'\Wikibase\Lib\Store\EntityTitleLookup' );
$mockEntityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnValue( $mockTitle ) );
diff --git
a/repo/tests/phpunit/includes/serializers/EntityRevisionSerializerTest.php
b/repo/tests/phpunit/includes/serializers/EntityRevisionSerializerTest.php
index 3454fd2..93a90ec 100644
--- a/repo/tests/phpunit/includes/serializers/EntityRevisionSerializerTest.php
+++ b/repo/tests/phpunit/includes/serializers/EntityRevisionSerializerTest.php
@@ -7,10 +7,10 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\EntityRevision;
-use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageWithConversion;
use Wikibase\Lib\Serializers\SerializationOptions;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Serializers\EntityRevisionSerializationOptions;
use Wikibase\Serializers\EntityRevisionSerializer;
@@ -48,7 +48,7 @@
* @return EntityTitleLookup
*/
protected function getTitleLookupMock() {
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup->expects( $this->any() )
->method( 'getTitleForId' )
diff --git a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
index 7f4570b..a78d6c8 100644
--- a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
@@ -78,7 +78,7 @@
$entityRevisionLookup = $mockRepo;
- $titleLookup = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$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 6376e3c..5ef25d0 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
@@ -8,9 +8,9 @@
use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\EntityTitleLookup;
-use Wikibase\Repo\Specials\SpecialItemByTitle;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikibase\Repo\Specials\SpecialItemByTitle;
/**
* @covers Wikibase\Repo\Specials\SpecialItemByTitle
@@ -32,7 +32,7 @@
* @return EntityTitleLookup
*/
private function getMockTitleLookup() {
- $mock = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $mock = $this->getMock( 'Wikibase\Lib\Store\EntityTitleLookup'
);
$mock->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback(
diff --git
a/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
b/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
index 626c15a..57ebc5a 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
@@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\EntityTitleLookup;
+use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Specials\SpecialItemDisambiguation;
use Wikibase\TermIndex;
@@ -30,7 +30,7 @@
* @return EntityTitleLookup
*/
private function getMockTitleLookup() {
- $mock = $this->getMock( 'Wikibase\EntityTitleLookup' );
+ $mock = $this->getMock( 'Wikibase\Lib\Store\EntityTitleLookup'
);
$mock->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback(
--
To view, visit https://gerrit.wikimedia.org/r/154982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b6014e86b95a7b8f74b06f0fc1a1491805bdc04
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
