EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366193 )
Change subject: Move HashSearchConfig into main codebase
......................................................................
Move HashSearchConfig into main codebase
This was previously only used for test cases, but it will be useful
for the interleaving where we need to build a query a second time
using a slightly different configuration. As such move it into
the primary code base.
Change-Id: I29b3b090385ad70d23aed9ef03bbef21587ce0fa
---
M autoload.php
A includes/HashSearchConfig.php
M tests/unit/CompletionSuggesterTest.php
M tests/unit/ConnectionTest.php
M tests/unit/InterwikiResolverTest.php
M tests/unit/Maintenance/AnalysisConfigBuilderTest.php
M tests/unit/Maintenance/ReindexerTest.php
M tests/unit/Query/FullTextQueryStringQueryBuilder.php
M tests/unit/Query/RegexInSourceFeatureTest.php
M tests/unit/RescoreBuilderTest.php
M tests/unit/TestUtils.php
M tests/unit/UpdaterTest.php
M tests/unit/UtilTest.php
13 files changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/93/366193/1
diff --git a/autoload.php b/autoload.php
index e6b67f0..85cdb60 100644
--- a/autoload.php
+++ b/autoload.php
@@ -54,6 +54,7 @@
'CirrusSearch\\ForceSearchIndex' => __DIR__ .
'/maintenance/forceSearchIndex.php',
'CirrusSearch\\FullTextQueryBuilderProfiles' => __DIR__ .
'/profiles/FullTextQueryBuilderProfiles.php',
'CirrusSearch\\HTMLCompletionProfileSettings' => __DIR__ .
'/includes/HTMLCompletionProfileSettings.php',
+ 'CirrusSearch\\HashSearchConfig' => __DIR__ .
'/includes/HashSearchConfig.php',
'CirrusSearch\\Hooks' => __DIR__ . '/includes/Hooks.php',
'CirrusSearch\\InterwikiResolver' => __DIR__ .
'/includes/InterwikiResolver.php',
'CirrusSearch\\InterwikiResolverFactory' => __DIR__ .
'/includes/InterwikiResolverFactory.php',
@@ -187,7 +188,6 @@
'CirrusSearch\\Searcher' => __DIR__ . '/includes/Searcher.php',
'CirrusSearch\\SiteMatrixInterwikiResolver' => __DIR__ .
'/includes/SiteMatrixInterwikiResolver.php',
'CirrusSearch\\Test\\DummyConnection' => __DIR__ .
'/tests/unit/TestUtils.php',
- 'CirrusSearch\\Test\\HashSearchConfig' => __DIR__ .
'/tests/unit/TestUtils.php',
'CirrusSearch\\Updater' => __DIR__ . '/includes/Updater.php',
'CirrusSearch\\UserTesting' => __DIR__ . '/includes/UserTesting.php',
'CirrusSearch\\Util' => __DIR__ . '/includes/Util.php',
diff --git a/includes/HashSearchConfig.php b/includes/HashSearchConfig.php
new file mode 100644
index 0000000..b0db798
--- /dev/null
+++ b/includes/HashSearchConfig.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace CirrusSearch;
+
+use GlobalVarConfig;
+use MultiConfig;
+
+class HashSearchConfig extends \CirrusSearch\SearchConfig {
+ public function __construct( array $settings, array $flags = [] ) {
+ $config = new \HashConfig( $settings );
+ if ( in_array( 'inherit', $flags ) ) {
+ $config = new MultiConfig( [ $config, new
GlobalVarConfig ] );
+ }
+ $this->setSource( $config );
+ }
+
+ /**
+ * Allow overriding Wiki ID
+ * @return mixed|string
+ */
+ public function getWikiId() {
+ if ( $this->has( '_wikiID' ) ) {
+ return $this->get( '_wikiID' );
+ }
+ return parent::getWikiId();
+ }
+}
diff --git a/tests/unit/CompletionSuggesterTest.php
b/tests/unit/CompletionSuggesterTest.php
index f40bfde..e741755 100644
--- a/tests/unit/CompletionSuggesterTest.php
+++ b/tests/unit/CompletionSuggesterTest.php
@@ -2,7 +2,6 @@
namespace CirrusSearch;
-use CirrusSearch\Test\HashSearchConfig;
use CirrusSearch\Test\DummyConnection;
use CirrusSearch\BuildDocument\Completion\SuggestBuilder;
diff --git a/tests/unit/ConnectionTest.php b/tests/unit/ConnectionTest.php
index 1c747b5..99f3e43 100644
--- a/tests/unit/ConnectionTest.php
+++ b/tests/unit/ConnectionTest.php
@@ -2,8 +2,6 @@
namespace CirrusSearch;
-use CirrusSearch\Test\HashSearchConfig;
-
/**
* Make sure cirrus doens't break any hooks.
*
diff --git a/tests/unit/InterwikiResolverTest.php
b/tests/unit/InterwikiResolverTest.php
index 6bd7723..e7cb30e 100644
--- a/tests/unit/InterwikiResolverTest.php
+++ b/tests/unit/InterwikiResolverTest.php
@@ -5,6 +5,7 @@
use MediaWiki\MediaWikiServices;
use CirrusSearch\CirrusTestCase;
use CirrusSearch\CirrusConfigInterwikiResolver;
+use CirrusSearch\HashSearchConfig;
use CirrusSearch\SiteMatrixInterwikiResolver;
use CirrusSearch\InterwikiResolverFactory;
diff --git a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
index 798c898..ff2f37a 100644
--- a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
+++ b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
@@ -3,7 +3,7 @@
namespace CirrusSearch\Tests\Maintenance;
use CirrusSearch\Maintenance\AnalysisConfigBuilder;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
use CirrusSearch\CirrusTestCase;
/**
diff --git a/tests/unit/Maintenance/ReindexerTest.php
b/tests/unit/Maintenance/ReindexerTest.php
index 62c93e8..88f0019 100644
--- a/tests/unit/Maintenance/ReindexerTest.php
+++ b/tests/unit/Maintenance/ReindexerTest.php
@@ -3,7 +3,7 @@
namespace CirrusSearch\Maintenance;
use CirrusSearch\Connection;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
class ReindexerTest extends \MediaWikiTestCase {
diff --git a/tests/unit/Query/FullTextQueryStringQueryBuilder.php
b/tests/unit/Query/FullTextQueryStringQueryBuilder.php
index ce0a4db..a4503ef 100644
--- a/tests/unit/Query/FullTextQueryStringQueryBuilder.php
+++ b/tests/unit/Query/FullTextQueryStringQueryBuilder.php
@@ -3,7 +3,7 @@
namespace CirrusSearch\Query;
use CirrusSearch\CirrusTestCase;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
use CirrusSearch\Search\SearchContext;
use CirrusSearch\Util;
diff --git a/tests/unit/Query/RegexInSourceFeatureTest.php
b/tests/unit/Query/RegexInSourceFeatureTest.php
index b57a9da..1723f79 100644
--- a/tests/unit/Query/RegexInSourceFeatureTest.php
+++ b/tests/unit/Query/RegexInSourceFeatureTest.php
@@ -2,7 +2,7 @@
namespace CirrusSearch\Query;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
/**
* @group CirrusSearch
diff --git a/tests/unit/RescoreBuilderTest.php
b/tests/unit/RescoreBuilderTest.php
index ebe0006..28730b4 100644
--- a/tests/unit/RescoreBuilderTest.php
+++ b/tests/unit/RescoreBuilderTest.php
@@ -3,7 +3,7 @@
namespace CirrusSearch\Search;
use CirrusSearch\CirrusTestCase;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
/**
* @group CirrusSearch
diff --git a/tests/unit/TestUtils.php b/tests/unit/TestUtils.php
index 6651762..7be5cd8 100644
--- a/tests/unit/TestUtils.php
+++ b/tests/unit/TestUtils.php
@@ -2,30 +2,7 @@
namespace CirrusSearch\Test;
-use GlobalVarConfig;
use MediaWiki\MediaWikiServices;
-use MultiConfig;
-
-class HashSearchConfig extends \CirrusSearch\SearchConfig {
- public function __construct( array $settings, array $flags = [] ) {
- $config = new \HashConfig( $settings );
- if ( in_array( 'inherit', $flags ) ) {
- $config = new MultiConfig( [ $config, new
GlobalVarConfig ] );
- }
- $this->setSource( $config );
- }
-
- /**
- * Allow overriding Wiki ID
- * @return mixed|string
- */
- public function getWikiId() {
- if ( $this->has( '_wikiID' ) ) {
- return $this->get( '_wikiID' );
- }
- return parent::getWikiId();
- }
-}
class DummyConnection extends \CirrusSearch\Connection {
public function __construct() {
diff --git a/tests/unit/UpdaterTest.php b/tests/unit/UpdaterTest.php
index ff37608..17de8c5 100644
--- a/tests/unit/UpdaterTest.php
+++ b/tests/unit/UpdaterTest.php
@@ -2,7 +2,6 @@
namespace CirrusSearch;
-use CirrusSearch\Test\HashSearchConfig;
use CirrusSearch\Search\CirrusIndexField;
/**
diff --git a/tests/unit/UtilTest.php b/tests/unit/UtilTest.php
index c227e5c..d51c0ba 100644
--- a/tests/unit/UtilTest.php
+++ b/tests/unit/UtilTest.php
@@ -2,7 +2,6 @@
namespace CirrusSearch;
-use CirrusSearch\Test\HashSearchConfig;
use MediaWiki\MediaWikiServices;
use Language;
--
To view, visit https://gerrit.wikimedia.org/r/366193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29b3b090385ad70d23aed9ef03bbef21587ce0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
