Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257806
Change subject: Revert "Move TermSearchInteractor stuff to Repo"
......................................................................
Revert "Move TermSearchInteractor stuff to Repo"
Needed by the ArticlePlaceholder.
This reverts commit 90538fc4599e63d6047858d8a08bafd5fd9799d6.
Change-Id: I5fac9b212b037040a0608edd8d081e639f9eee82
---
R lib/includes/Interactors/TermIndexSearchInteractor.php
R lib/includes/Interactors/TermSearchInteractor.php
R lib/includes/Interactors/TermSearchResult.php
R lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php
R lib/tests/phpunit/Interactors/TermSearchResultTest.php
M repo/includes/ItemDisambiguation.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/EntitySearchHelper.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/tests/phpunit/includes/ItemDisambiguationTest.php
M repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
M repo/tests/phpunit/includes/api/QuerySearchEntitiesTest.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
14 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/06/257806/1
diff --git a/repo/includes/Interactors/TermIndexSearchInteractor.php
b/lib/includes/Interactors/TermIndexSearchInteractor.php
similarity index 99%
rename from repo/includes/Interactors/TermIndexSearchInteractor.php
rename to lib/includes/Interactors/TermIndexSearchInteractor.php
index 15b9f20..1416a20 100644
--- a/repo/includes/Interactors/TermIndexSearchInteractor.php
+++ b/lib/includes/Interactors/TermIndexSearchInteractor.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\Interactors;
+namespace Wikibase\Lib\Interactors;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Term\Term;
diff --git a/repo/includes/Interactors/TermSearchInteractor.php
b/lib/includes/Interactors/TermSearchInteractor.php
similarity index 93%
rename from repo/includes/Interactors/TermSearchInteractor.php
rename to lib/includes/Interactors/TermSearchInteractor.php
index 864682f..959df49 100644
--- a/repo/includes/Interactors/TermSearchInteractor.php
+++ b/lib/includes/Interactors/TermSearchInteractor.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\Interactors;
+namespace Wikibase\Lib\Interactors;
/**
* Interface for searching for terms
diff --git a/repo/includes/Interactors/TermSearchResult.php
b/lib/includes/Interactors/TermSearchResult.php
similarity index 97%
rename from repo/includes/Interactors/TermSearchResult.php
rename to lib/includes/Interactors/TermSearchResult.php
index 0a618bc..603d891 100644
--- a/repo/includes/Interactors/TermSearchResult.php
+++ b/lib/includes/Interactors/TermSearchResult.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\Interactors;
+namespace Wikibase\Lib\Interactors;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Term\Term;
diff --git
a/repo/tests/phpunit/includes/Interactors/TermIndexSearchInteractorTest.php
b/lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php
similarity index 98%
rename from
repo/tests/phpunit/includes/Interactors/TermIndexSearchInteractorTest.php
rename to lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php
index b8b4359..314bf52 100644
--- a/repo/tests/phpunit/includes/Interactors/TermIndexSearchInteractorTest.php
+++ b/lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php
@@ -9,17 +9,17 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermFallback;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\Store\BufferingTermLookup;
use Wikibase\TermIndexEntry;
use Wikibase\Test\MockTermIndex;
/**
- * @covers Wikibase\Repo\Interactors\TermIndexSearchInteractor
+ * @covers Wikibase\Lib\Interactors\TermIndexSearchInteractor
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseLib
* @group WikibaseInteractor
*
* @licence GNU GPL v2+
diff --git a/repo/tests/phpunit/includes/Interactors/TermSearchResultTest.php
b/lib/tests/phpunit/Interactors/TermSearchResultTest.php
similarity index 91%
rename from repo/tests/phpunit/includes/Interactors/TermSearchResultTest.php
rename to lib/tests/phpunit/Interactors/TermSearchResultTest.php
index 0b6288c..ce3d45a 100644
--- a/repo/tests/phpunit/includes/Interactors/TermSearchResultTest.php
+++ b/lib/tests/phpunit/Interactors/TermSearchResultTest.php
@@ -6,13 +6,13 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Term\Term;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermSearchResult;
/**
- * @covers Wikibase\Repo\Interactors\TermSearchResult
+ * @covers Wikibase\Lib\Interactors\TermSearchResult
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseLib
*
* @licence GNU GPL v2+
* @author Adam Shorland
diff --git a/repo/includes/ItemDisambiguation.php
b/repo/includes/ItemDisambiguation.php
index 2ed99f1..48dc8c5 100644
--- a/repo/includes/ItemDisambiguation.php
+++ b/repo/includes/ItemDisambiguation.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermSearchResult;
/**
* Class representing the disambiguation of a list of WikibaseItems.
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 9967401..3959b32 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -61,7 +61,7 @@
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Lib\WikibaseContentLanguages;
use Wikibase\Lib\WikibaseValueFormatterBuilders;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
use Wikibase\PropertyInfoBuilder;
use Wikibase\Repo\Api\ApiHelperFactory;
diff --git a/repo/includes/api/EntitySearchHelper.php
b/repo/includes/api/EntitySearchHelper.php
index c04be29..8a78970 100644
--- a/repo/includes/api/EntitySearchHelper.php
+++ b/repo/includes/api/EntitySearchHelper.php
@@ -8,8 +8,8 @@
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\TermIndexEntry;
/**
diff --git a/repo/includes/specials/SpecialItemDisambiguation.php
b/repo/includes/specials/SpecialItemDisambiguation.php
index 3b8fa82..ea9cc3a 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -8,8 +8,8 @@
use Wikibase\ItemDisambiguation;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\Lib\WikibaseContentLanguages;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\TermIndexEntry;
diff --git a/repo/tests/phpunit/includes/ItemDisambiguationTest.php
b/repo/tests/phpunit/includes/ItemDisambiguationTest.php
index 244b18b..72ec78c 100644
--- a/repo/tests/phpunit/includes/ItemDisambiguationTest.php
+++ b/repo/tests/phpunit/includes/ItemDisambiguationTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Term;
use Wikibase\ItemDisambiguation;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermSearchResult;
/**
* @covers Wikibase\ItemDisambiguation
diff --git a/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
b/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
index dd6439e..46a1e62 100644
--- a/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
+++ b/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
@@ -10,8 +10,8 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\TermIndexEntry;
/**
@@ -67,7 +67,7 @@
* @return
TermIndexSearchInteractor|\PHPUnit_Framework_MockObject_MockObject
*/
private function getMockSearchInteractor( $search, $language, $type,
array $returnResults = array() ) {
- $mock = $this->getMockBuilder(
'Wikibase\Repo\Interactors\TermIndexSearchInteractor' )
+ $mock = $this->getMockBuilder(
'Wikibase\Lib\Interactors\TermIndexSearchInteractor' )
->disableOriginalConstructor()
->getMock();
$mock->expects( $this->atLeastOnce() )
diff --git a/repo/tests/phpunit/includes/api/QuerySearchEntitiesTest.php
b/repo/tests/phpunit/includes/api/QuerySearchEntitiesTest.php
index 0402a7b..85455a3 100644
--- a/repo/tests/phpunit/includes/api/QuerySearchEntitiesTest.php
+++ b/repo/tests/phpunit/includes/api/QuerySearchEntitiesTest.php
@@ -12,7 +12,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Term;
use Wikibase\Lib\ContentLanguages;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermSearchResult;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Repo\Api\QuerySearchEntities;
diff --git a/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
b/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
index 2e7c4ab..d526cf4 100644
--- a/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
+++ b/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
@@ -14,7 +14,7 @@
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Repo\Api\SearchEntities;
-use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\Lib\Interactors\TermSearchResult;
/**
* @covers Wikibase\Repo\Api\SearchEntities
diff --git
a/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
b/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
index f291016..d0aa41b 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Term;
use Wikibase\ItemDisambiguation;
-use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
+use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
use Wikibase\Repo\Specials\SpecialItemDisambiguation;
use Wikibase\TermIndexEntry;
@@ -66,7 +66,7 @@
),
),
);
- $mock = $this->getMockBuilder(
'Wikibase\Repo\Interactors\TermIndexSearchInteractor' )
+ $mock = $this->getMockBuilder(
'Wikibase\Lib\Interactors\TermIndexSearchInteractor' )
->disableOriginalConstructor()
->getMock();
--
To view, visit https://gerrit.wikimedia.org/r/257806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fac9b212b037040a0608edd8d081e639f9eee82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
