jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376541 )
Change subject: Add support for Elastica 5.3.0
......................................................................
Add support for Elastica 5.3.0
- Remove backports
- Fix Reindexer test
Bug: T174654
Change-Id: Ia232947de7e3434e3d7fa34dd4a2aa62bb204c94
Depends-On: I46edfa8462a7e8db691f5eb8b931fce1f8eef7e2
Depends-On: Ia8552a06a035d7d423e236b2f92c726fa08e34b2
---
M autoload.php
D includes/Elastica/MatchNone.php
M includes/Query/FullTextQueryStringQueryBuilder.php
D tests/unit/Elastica/MatchNoneTest.php
M tests/unit/Elastica/ReindexTaskTest.php
5 files changed, 12 insertions(+), 41 deletions(-)
Approvals:
Tjones: Looks good to me, but someone else must approve
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index a061bb7..5dc51da 100644
--- a/autoload.php
+++ b/autoload.php
@@ -39,7 +39,6 @@
'CirrusSearch\\Dump' => __DIR__ . '/includes/Dump.php',
'CirrusSearch\\ElasticaErrorHandler' => __DIR__ .
'/includes/ElasticaErrorHandler.php',
'CirrusSearch\\Elastica\\LtrQuery' => __DIR__ .
'/includes/Elastica/LtrQuery.php',
- 'CirrusSearch\\Elastica\\MatchNone' => __DIR__ .
'/includes/Elastica/MatchNone.php',
'CirrusSearch\\Elastica\\MultiSearch' => __DIR__ .
'/includes/Elastica/MultiSearch.php',
'CirrusSearch\\Elastica\\PooledHttp' => __DIR__ .
'/includes/Elastica/PooledHttp.php',
'CirrusSearch\\Elastica\\PooledHttps' => __DIR__ .
'/includes/Elastica/PooledHttps.php',
diff --git a/includes/Elastica/MatchNone.php b/includes/Elastica/MatchNone.php
deleted file mode 100644
index 10492bb..0000000
--- a/includes/Elastica/MatchNone.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace CirrusSearch\Elastica;
-
-/**
- * Backport of https://github.com/ruflin/Elastica/pull/1276
- *
- * @link
https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-query.html
- */
-class MatchNone extends \Elastica\Query\AbstractQuery {
- /**
- * Creates match none query.
- */
- public function __construct() {
- /** @suppress PhanTypeMismatchProperty (done like that in
Elastica) */
- $this->_params = new \stdClass();
- }
-}
diff --git a/includes/Query/FullTextQueryStringQueryBuilder.php
b/includes/Query/FullTextQueryStringQueryBuilder.php
index a27caa0..6f3d0e7 100644
--- a/includes/Query/FullTextQueryStringQueryBuilder.php
+++ b/includes/Query/FullTextQueryStringQueryBuilder.php
@@ -663,7 +663,7 @@
// text
$queryText,
// fallack
- new \CirrusSearch\Elastica\MatchNone(),
+ new \Elastica\Query\MatchNone(),
// field
null,
// analyzer
@@ -674,7 +674,7 @@
$tokCount->addCondition(
TokenCountRouter::GT,
$maxTokens,
- new \CirrusSearch\Elastica\MatchNone()
+ new \Elastica\Query\MatchNone()
);
}
$tokCount->addCondition(
diff --git a/tests/unit/Elastica/MatchNoneTest.php
b/tests/unit/Elastica/MatchNoneTest.php
deleted file mode 100644
index f3ccfba..0000000
--- a/tests/unit/Elastica/MatchNoneTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace CirrusSearch\Elastica;
-
-class MatchNoneTest extends \PHPUnit_Framework_TestCase {
- public function testMatchNone() {
- $query = new MatchNone();
- $expectedArray = [ 'match_none' => new \stdClass() ];
- $this->assertEquals( $expectedArray, $query->toArray() );
- }
-
- public function testBackPorts() {
- $this->assertFalse(
- class_exists( \Elastica\Query\MatchNone::class ),
- "MatchNone is now in elastica please remove this
backport"
- );
- }
-}
diff --git a/tests/unit/Elastica/ReindexTaskTest.php
b/tests/unit/Elastica/ReindexTaskTest.php
index abd726c..7f1e76e 100644
--- a/tests/unit/Elastica/ReindexTaskTest.php
+++ b/tests/unit/Elastica/ReindexTaskTest.php
@@ -132,13 +132,21 @@
->method( 'request' )
->will( $this->returnValueMap( [
[
- '_tasks/abc:123', Request::GET, [], [],
+ '_tasks/abc:123',
+ Request::GET,
+ [],
+ [],
+ \Elastica\Request::DEFAULT_CONTENT_TYPE,
new Response( json_encode(
$this->inProgressWithSlicesTaskResponse
), 200 )
],
[
- '_tasks', Request::GET, [], [
'parent_task_id' => 'abc:123', 'detailed' => 1 ],
+ '_tasks',
+ Request::GET,
+ [],
+ [ 'parent_task_id' => 'abc:123',
'detailed' => 1 ],
+ \Elastica\Request::DEFAULT_CONTENT_TYPE,
new Response( json_encode(
$this->sliceResponse( 2 )
), 200 )
--
To view, visit https://gerrit.wikimedia.org/r/376541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia232947de7e3434e3d7fa34dd4a2aa62bb204c94
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: Cindy-the-browser-test-bot <bernhardsone...@gmail.com>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Tjones <tjo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
