Removed 3rd $method argument from the `Elastica\SearchableInterface…

…::search` and `Elastica\SearchableInterface::count` as they are not unused anymore. Removed Request class
ruflin · Jan 12, 2025 · df87b52 · df87b52
1 parent 6d122c6
commit df87b52
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased](https://github.com/ruflin/Elastica/compare/8.1.0...8.x)
 
 ### Backward Compatibility Breaks
+* Removed 3rd `$method` argument from the `Elastica\SearchableInterface::search` and `Elastica\SearchableInterface::count` as they are not unused anymore. The following classes are affected: `Elastica\Search` and `Elastica\Index`
+* Removed `Elastica\Request` class as constants are not used anymore and no longer needed.
+
 ### Added
 ### Changed
 ### Deprecated

diff --git a/src/Index.php b/src/Index.php
@@ -527,18 +527,18 @@ public function createSearch($query = '', ?array $options = null, ?BuilderInterf
         return $search;
     }
 
-    public function search($query = '', ?array $options = null, string $method = Request::POST): ResultSet
+    public function search($query = '', ?array $options = null): ResultSet
     {
         $search = $this->createSearch($query, $options);
 
-        return $search->search('', null, $method);
+        return $search->search('', null);
     }
 
-    public function count($query = '', string $method = Request::POST): int
+    public function count($query = ''): int
     {
         $search = $this->createSearch($query);
 
-        return $search->count('', false, $method);
+        return $search->count('', false);
     }
 
     /**

diff --git a/src/Request.php b/src/Request.php
diff --git a/src/Search.php b/src/Search.php
@@ -283,7 +283,7 @@ public function getPath(): string
      * @throws ServerResponseException  if the status code of response is 5xx
      * @throws ClientException
      */
-    public function search($query = '', ?array $options = null, string $method = Request::POST): ResultSet
+    public function search($query = '', ?array $options = null): ResultSet
     {
         $this->setOptionsAndQuery($options, $query);
 
@@ -323,7 +323,7 @@ public function search($query = '', ?array $options = null, string $method = Req
      *
      * @phpstan-return ($fullResult is false ? int : ResultSet)
      */
-    public function count($query = '', bool $fullResult = false, string $method = Request::POST)
+    public function count($query = '', bool $fullResult = false)
     {
         $this->setOptionsAndQuery(null, $query);
 

diff --git a/src/SearchableInterface.php b/src/SearchableInterface.php
@@ -43,15 +43,14 @@ interface SearchableInterface
      * @phpstan-param TCreateQueryArgs $query
      *
      * @param array<string, mixed>|null $options associative array of options (option=>value)
-     * @param string                    $method  Request method, see Request's constants
      *
      * @throws NoNodeAvailableException if all the hosts are offline
      * @throws ClientResponseException  if the status code of response is 4xx
      * @throws ServerResponseException  if the status code of response is 5xx
      * @throws InvalidException
      * @throws ClientException
      */
-    public function search($query = '', ?array $options = null, string $method = Request::POST): ResultSet;
+    public function search($query = '', ?array $options = null): ResultSet;
 
     /**
      * Counts results for a query.
@@ -62,16 +61,14 @@ public function search($query = '', ?array $options = null, string $method = Req
      *
      * @phpstan-param TCreateQueryArgsMatching $query
      *
-     * @param string $method Request method, see Request's constants
-     *
      * @throws NoNodeAvailableException if all the hosts are offline
      * @throws ClientResponseException  if the status code of response is 4xx
      * @throws ServerResponseException  if the status code of response is 5xx
      * @throws ClientException
      *
      * @return int number of documents matching the query
      */
-    public function count($query = '', string $method = Request::POST);
+    public function count($query = '');
 
     /**
      * @param AbstractQuery|AbstractSuggest|array|Collapse|Query|string|Suggest|null $query

diff --git a/tests/IndexTest.php b/tests/IndexTest.php
@@ -12,7 +12,6 @@
 use Elastica\Query\QueryString;
 use Elastica\Query\SimpleQueryString;
 use Elastica\Query\Term;
-use Elastica\Request;
 use Elastica\Script\Script;
 use Elastica\Status;
 use Elastica\Test\Base as BaseTest;
@@ -165,14 +164,14 @@ public function testCountGet(): void
 
         $index->refresh();
 
-        $this->assertEquals(2, $index->count('', Request::GET));
+        $this->assertEquals(2, $index->count(''));
 
         $query = new Term();
         $key = 'name';
         $value = 'nicolas';
         $query->setTerm($key, $value);
 
-        $this->assertEquals(1, $index->count($query, Request::GET));
+        $this->assertEquals(1, $index->count($query));
     }
 
     /**
@@ -794,10 +793,10 @@ public function testSearchGet(): void
         $index->addDocuments($docs);
         $index->refresh();
 
-        $resultSet = $index->search('hans', null, Request::GET);
+        $resultSet = $index->search('hans', null);
         $this->assertEquals(1, $resultSet->count());
 
-        $count = $index->count('hans', Request::GET);
+        $count = $index->count('hans');
         $this->assertEquals(1, $count);
     }
 

diff --git a/tests/SearchTest.php b/tests/SearchTest.php
@@ -14,7 +14,6 @@
 use Elastica\Query\FunctionScore;
 use Elastica\Query\MatchAll;
 use Elastica\Query\QueryString;
-use Elastica\Request;
 use Elastica\ResultSet;
 use Elastica\Script\Script;
 use Elastica\Search;
@@ -478,7 +477,7 @@ public function testSearchGet(): void
         $client = $this->_getClient();
         $search1 = new Search($client);
 
-        $result = $search1->search([], [], 'GET');
+        $result = $search1->search([], []);
         $this->assertFalse($result->getResponse()->hasError());
     }
 
@@ -578,19 +577,19 @@ public function testCountRequestGet(): void
 
         $search->addIndex($index);
 
-        $count = $search->count('farrelley', false, Request::GET);
+        $count = $search->count('farrelley', false);
         $this->assertEquals(5, $count);
 
-        $count = $search->count('marley', false, Request::GET);
+        $count = $search->count('marley', false);
         $this->assertEquals(6, $count);
 
-        $count = $search->count('', false, Request::GET);
+        $count = $search->count('', false);
         $this->assertEquals(6, $count, 'Uses previous query set');
 
-        $count = $search->count(new MatchAll(), false, Request::GET);
+        $count = $search->count(new MatchAll(), false);
         $this->assertEquals(11, $count);
 
-        $count = $search->count('bunny', false, Request::GET);
+        $count = $search->count('bunny', false);
         $this->assertEquals(0, $count);
     }