Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238128
Change subject: Remove old copy of PropertyLabelResolver interface
......................................................................
Remove old copy of PropertyLabelResolver interface
Change-Id: I1a236cbfc05a0dc28d6a7377f34009383dde0f29
---
M client/includes/DataAccess/PropertyIdResolver.php
M client/includes/store/ClientStore.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
D lib/includes/store/PropertyLabelResolver.php
M lib/includes/store/TermPropertyLabelResolver.php
M lib/tests/phpunit/MockPropertyLabelResolver.php
M lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
M lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
9 files changed, 10 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/28/238128/1
diff --git a/client/includes/DataAccess/PropertyIdResolver.php
b/client/includes/DataAccess/PropertyIdResolver.php
index 581131f..81bfcb8 100644
--- a/client/includes/DataAccess/PropertyIdResolver.php
+++ b/client/includes/DataAccess/PropertyIdResolver.php
@@ -6,7 +6,7 @@
use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\PropertyLabelResolver;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
/**
* Resolves the PropertyId for the input, which might be a property label or
prefixed id.
diff --git a/client/includes/store/ClientStore.php
b/client/includes/store/ClientStore.php
index 2948382..260f737 100644
--- a/client/includes/store/ClientStore.php
+++ b/client/includes/store/ClientStore.php
@@ -9,6 +9,7 @@
use Wikibase\Client\Usage\UsageTracker;
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Store\EntityIdLookup;
diff --git a/client/includes/store/sql/DirectSqlStore.php
b/client/includes/store/sql/DirectSqlStore.php
index 0f78842..28ba010 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -19,6 +19,7 @@
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
use Wikibase\Lib\Store\CachingSiteLinkLookup;
use Wikibase\Lib\Store\EntityContentDataCodec;
diff --git a/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
b/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
index b1af0f2..3ab55ac 100644
--- a/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
+++ b/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
@@ -47,7 +47,7 @@
array( 'getSiteLinkLookup',
'Wikibase\Lib\Store\SiteLinkLookup' ),
array( 'getEntityLookup',
'Wikibase\DataModel\Services\Lookup\EntityLookup' ),
array( 'getTermIndex', 'Wikibase\TermIndex' ),
- array( 'getPropertyLabelResolver',
'Wikibase\PropertyLabelResolver' ),
+ array( 'getPropertyLabelResolver',
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' ),
array( 'newChangesTable', 'Wikibase\ChangesTable' ),
array( 'getPropertyInfoStore',
'Wikibase\PropertyInfoStore' ),
array( 'getUsageTracker',
'Wikibase\Client\Usage\UsageTracker' ),
diff --git a/lib/includes/store/PropertyLabelResolver.php
b/lib/includes/store/PropertyLabelResolver.php
deleted file mode 100644
index c55a6f0..0000000
--- a/lib/includes/store/PropertyLabelResolver.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-use Wikibase\DataModel\Entity\EntityId;
-
-/**
- * Resolves property labels (which are unique per language) into entity IDs.
- *
- * Copyright © 24.04.13 by the authors listed below.
- *
- * @license GPL 2+
- *
- * @author daniel
- */
-interface PropertyLabelResolver {
-
- /**
- * @param string[] $labels the labels
- * @param string $recache Flag, set to 'recache' to discard cached
data and fetch fresh data
- * from the database.
- *
- * @return EntityId[] a map of strings from $labels to the
corresponding entity ID.
- */
- public function getPropertyIdsForLabels( array $labels, $recache = '' );
-
-}
diff --git a/lib/includes/store/TermPropertyLabelResolver.php
b/lib/includes/store/TermPropertyLabelResolver.php
index 756036c..d4253b1 100644
--- a/lib/includes/store/TermPropertyLabelResolver.php
+++ b/lib/includes/store/TermPropertyLabelResolver.php
@@ -6,6 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
/**
* Resolves property labels (which are unique per language) into entity IDs
diff --git a/lib/tests/phpunit/MockPropertyLabelResolver.php
b/lib/tests/phpunit/MockPropertyLabelResolver.php
index d9627cf..2b0141a 100644
--- a/lib/tests/phpunit/MockPropertyLabelResolver.php
+++ b/lib/tests/phpunit/MockPropertyLabelResolver.php
@@ -3,7 +3,7 @@
namespace Wikibase\Test;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\PropertyLabelResolver;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
/**
* Mock resolver, based on a MockRepository
diff --git a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
b/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
index 1de7c0f..337808f 100644
--- a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
+++ b/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
@@ -10,7 +10,7 @@
use Wikibase\Lib\Store\EntityRedirectResolvingDecorator;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\UnresolvedRedirectException;
-use Wikibase\PropertyLabelResolver;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
/**
* @covers Wikibase\Lib\Store\EntityRedirectResolvingDecorator
@@ -118,7 +118,7 @@
}
public function testNoEntityId() {
- $target = $this->getMock( 'Wikibase\PropertyLabelResolver' );
+ $target = $this->getMock(
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' );
$target->expects( $this->once() )
->method( 'getPropertyIdsForLabels' )
->will( $this->throwException( new
UnresolvedRedirectException( new ItemId( 'Q12' ) ) ) );
@@ -131,7 +131,7 @@
}
public function testError() {
- $target = $this->getMock( 'Wikibase\PropertyLabelResolver' );
+ $target = $this->getMock(
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' );
$target->expects( $this->once() )
->method( 'getPropertyIdsForLabels' )
->will( $this->throwException( new RuntimeException(
'Boo!' ) ) );
diff --git a/lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
b/lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
index 706a9c9..5ddf604 100644
--- a/lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
+++ b/lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
@@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\PropertyLabelResolver;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
use Wikibase\TermIndexEntry;
use Wikibase\TermPropertyLabelResolver;
--
To view, visit https://gerrit.wikimedia.org/r/238128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a236cbfc05a0dc28d6a7377f34009383dde0f29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
