[MediaWiki-commits] [Gerrit] Remove old copy of TermBuffer interface - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove old copy of TermBuffer interface
..


Remove old copy of TermBuffer interface

T108286

Change-Id: I508ff1e5751eb66c05fdda8f68550e5da47e7b6a
---
M lib/includes/store/BufferingTermLookup.php
M lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
D lib/includes/store/TermBuffer.php
M lib/tests/phpunit/store/LanguageFallbackLabelDescriptionLookupFactoryTest.php
M repo/includes/Hooks/LabelPrefetchHookHandlers.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
8 files changed, 7 insertions(+), 48 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Bene: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/store/BufferingTermLookup.php 
b/lib/includes/store/BufferingTermLookup.php
index 3622c40..e5da1a8 100644
--- a/lib/includes/store/BufferingTermLookup.php
+++ b/lib/includes/store/BufferingTermLookup.php
@@ -4,6 +4,7 @@
 
 use MapCacheLRU;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\Lib\Store\EntityTermLookupBase;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\TermIndexEntry;
diff --git 
a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php 
b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
index 0661685..6b3b890 100644
--- a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
+++ b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
 use Wikibase\DataModel\Services\Lookup\TermLookup;
 use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 
 /**
  * Factory to provide an LabelDescriptionLookup which does automatic 
prefetching
diff --git a/lib/includes/store/TermBuffer.php 
b/lib/includes/store/TermBuffer.php
deleted file mode 100644
index 8994c76..000
--- a/lib/includes/store/TermBuffer.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->once() )
->method( 'prefetchTerms' )
->with(
diff --git a/repo/includes/Hooks/LabelPrefetchHookHandlers.php 
b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
index e6b483e..1f8a258 100644
--- a/repo/includes/Hooks/LabelPrefetchHookHandlers.php
+++ b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
@@ -10,7 +10,7 @@
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\TermIndexEntry;
 
 /**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 90a4fc3..b92c6e4 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -94,7 +94,7 @@
 use Wikibase\Store;
 use Wikibase\Store\BufferingTermLookup;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\StringNormalizer;
 use Wikibase\SummaryFormatter;
 use Wikibase\View\EntityViewFactory;
diff --git 
a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php 
b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
index 2725da7..1486476 100644
--- a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
+++ b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
@@ -63,7 +63,7 @@
 * @return LabelPrefetchHookHandlers
 */
private function getLabelPrefetchHookHandlers( $prefetchTerms, array 
$termTypes, array $languageCodes ) {
-   $termBuffer = $this->getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->atLeastOnce() )
->method( 'prefetchTerms' )
->will( $this->returnCallback( $prefetchTerms ) );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php 
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 5e79011..13bd6e7 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -244,7 +244,7 @@
 
public function testGetTermBuffer() {
$service = $this->getWikibaseRepo()->getTermBuffer();
-   $this->assertInstanceOf( 'Wikibase\Store\TermBuffer', $service 
);
+   $this->assertInstanceOf( 
'Wikibase\DataModel\Services\Term\TermBuffer', $service );
}

[MediaWiki-commits] [Gerrit] Remove old copy of TermBuffer interface - change (mediawiki...Wikibase)

2015-09-14 Thread Jeroen De Dauw (Code Review) 
Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/238127

Change subject: Remove old copy of TermBuffer interface
..

Remove old copy of TermBuffer interface

Change-Id: I508ff1e5751eb66c05fdda8f68550e5da47e7b6a
---
M lib/includes/store/BufferingTermLookup.php
M lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
D lib/includes/store/TermBuffer.php
M lib/tests/phpunit/store/LanguageFallbackLabelDescriptionLookupFactoryTest.php
M repo/includes/Hooks/LabelPrefetchHookHandlers.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
8 files changed, 7 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/27/238127/1

diff --git a/lib/includes/store/BufferingTermLookup.php 
b/lib/includes/store/BufferingTermLookup.php
index 3622c40..e5da1a8 100644
--- a/lib/includes/store/BufferingTermLookup.php
+++ b/lib/includes/store/BufferingTermLookup.php
@@ -4,6 +4,7 @@
 
 use MapCacheLRU;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\Lib\Store\EntityTermLookupBase;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\TermIndexEntry;
diff --git 
a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php 
b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
index 0661685..6b3b890 100644
--- a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
+++ b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
 use Wikibase\DataModel\Services\Lookup\TermLookup;
 use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 
 /**
  * Factory to provide an LabelDescriptionLookup which does automatic 
prefetching
diff --git a/lib/includes/store/TermBuffer.php 
b/lib/includes/store/TermBuffer.php
deleted file mode 100644
index 8994c76..000
--- a/lib/includes/store/TermBuffer.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->once() )
->method( 'prefetchTerms' )
->with(
diff --git a/repo/includes/Hooks/LabelPrefetchHookHandlers.php 
b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
index e6b483e..1f8a258 100644
--- a/repo/includes/Hooks/LabelPrefetchHookHandlers.php
+++ b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
@@ -10,7 +10,7 @@
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\TermIndexEntry;
 
 /**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 90a4fc3..b92c6e4 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -94,7 +94,7 @@
 use Wikibase\Store;
 use Wikibase\Store\BufferingTermLookup;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\StringNormalizer;
 use Wikibase\SummaryFormatter;
 use Wikibase\View\EntityViewFactory;
diff --git 
a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php 
b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
index 2725da7..1486476 100644
--- a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
+++ b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
@@ -63,7 +63,7 @@
 * @return LabelPrefetchHookHandlers
 */
private function getLabelPrefetchHookHandlers( $prefetchTerms, array 
$termTypes, array $languageCodes ) {
-   $termBuffer = $this->getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->atLeastOnce() )
->method( 'prefetchTerms' )
->will( $this->returnCallback( $prefetchTerms ) );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php 
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 5e79011..13bd6e7 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -244,7 +244,7 @@
 
public function testGetTermBuffer() {
$service = $this->getWikibaseRepo()->getTermBuffer();
-   $this->assertInstanceOf( 'Wikibase\Store\TermBuffer', $service 
);
+   $this->assertInstanceOf( 
'Wikibase\DataModel\Services\Term\TermBuffer', $service );