[9.x] Check for meilisearch-php 0.19.0 instead (#513)

* Check for meilisearch-php 0.19.0 instead

* Update tests

* Update MeiliSearchEngine.php

Co-authored-by: Taylor Otwell <taylor@laravel.com>

Author: georgeboot

src/Engines/MeiliSearchEngine.php

@@ -127,7 +127,8 @@ protected function performSearch(Builder $builder, array $searchParams = [])
     {
         $meilisearch = $this->meilisearch->index($builder->index ?: $builder->model->searchableAs());
 
-        if (version_compare(MeiliSearch::VERSION, '0.21.0') >= 0) {
+        // meilisearch-php 0.19.0 is compatible with meilisearch server 0.21.0...
+        if (version_compare(MeiliSearch::VERSION, '0.19.0') >= 0 && isset($searchParams['filters'])) {
             $searchParams['filter'] = $searchParams['filters'];
 
             unset($searchParams['filters']);

tests/Unit/MeiliSearchEngineTest.php

@@ -48,12 +48,12 @@ public function test_search_sends_correct_parameters_to_meilisearch()
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->with('table')->andReturn($index = m::mock(Indexes::class));
         $index->shouldReceive('search')->with('mustang', [
-            'filters' => 'foo=1 AND bar=2',
+            'filter' => 'foo=1 AND bar=2',
         ]);
 
         $engine = new MeiliSearchEngine($client);
         $builder = new Builder(new SearchableModel(), 'mustang', function ($meilisearch, $query, $options) {
-            $options['filters'] = 'foo=1 AND bar=2';
+            $options['filter'] = 'foo=1 AND bar=2';
 
             return $meilisearch->search($query, $options);
         });
@@ -66,14 +66,14 @@ public function test_submitting_a_callable_search_with_search_method_returns_arr
             new SearchableModel(),
             $query = 'mustang',
             $callable = function ($meilisearch, $query, $options) {
-                $options['filters'] = 'foo=1';
+                $options['filter'] = 'foo=1';
 
                 return $meilisearch->search($query, $options);
             }
         );
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->with('table')->andReturn($index = m::mock(Indexes::class));
-        $index->shouldReceive('search')->with($query, ['filters' => 'foo=1'])->andReturn(new SearchResult($expectedResult = [
+        $index->shouldReceive('search')->with($query, ['filter' => 'foo=1'])->andReturn(new SearchResult($expectedResult = [
             'hits' => [],
             'offset' => 0,
             'limit' => 20,
@@ -95,14 +95,14 @@ public function test_submitting_a_callable_search_with_raw_search_method_works()
             new SearchableModel(),
             $query = 'mustang',
             $callable = function ($meilisearch, $query, $options) {
-                $options['filters'] = 'foo=1';
+                $options['filter'] = 'foo=1';
 
                 return $meilisearch->rawSearch($query, $options);
             }
         );
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->with('table')->andReturn($index = m::mock(Indexes::class));
-        $index->shouldReceive('rawSearch')->with($query, ['filters' => 'foo=1'])->andReturn($expectedResult = [
+        $index->shouldReceive('rawSearch')->with($query, ['filter' => 'foo=1'])->andReturn($expectedResult = [
             'hits' => [],
             'offset' => 0,
             'limit' => 20,
@@ -274,14 +274,14 @@ public function test_pagination_correct_parameters()
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->with('table')->andReturn($index = m::mock(Indexes::class));
         $index->shouldReceive('search')->with('mustang', [
-            'filters' => 'foo=1',
+            'filter' => 'foo=1',
             'limit' => $perPage,
             'offset' => ($page - 1) * $perPage,
         ]);
 
         $engine = new MeiliSearchEngine($client);
         $builder = new Builder(new SearchableModel(), 'mustang', function ($meilisearch, $query, $options) {
-            $options['filters'] = 'foo=1';
+            $options['filter'] = 'foo=1';
 
             return $meilisearch->search($query, $options);
         });
@@ -335,7 +335,7 @@ public function test_where_conditions_are_applied()
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->once()->andReturn($index = m::mock(Indexes::class));
         $index->shouldReceive('rawSearch')->once()->with($builder->query, array_filter([
-            'filters' => 'foo="bar" AND key="value"',
+            'filter' => 'foo="bar" AND key="value"',
             'limit' => $builder->limit,
         ]))->andReturn([]);
 
@@ -353,7 +353,7 @@ public function test_where_in_conditions_are_applied()
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->once()->andReturn($index = m::mock(Indexes::class));
         $index->shouldReceive('rawSearch')->once()->with($builder->query, array_filter([
-            'filters' => 'foo="bar" AND bar="baz" AND (qux=1 OR qux=2) AND (quux=1 OR quux=2)',
+            'filter' => 'foo="bar" AND bar="baz" AND (qux=1 OR qux=2) AND (quux=1 OR quux=2)',
             'limit' => $builder->limit,
         ]))->andReturn([]);
 
@@ -369,7 +369,7 @@ public function test_where_in_conditions_are_applied_without_other_conditions()
         $client = m::mock(Client::class);
         $client->shouldReceive('index')->once()->andReturn($index = m::mock(Indexes::class));
         $index->shouldReceive('rawSearch')->once()->with($builder->query, array_filter([
-            'filters' => '(qux=1 OR qux=2) AND (quux=1 OR quux=2)',
+            'filter' => '(qux=1 OR qux=2) AND (quux=1 OR quux=2)',
             'limit' => $builder->limit,
         ]))->andReturn([]);