Merge pull request #47 from ensi-platform/v8-ecs-521

V8 add orWhereMultiMatch

Author: MsNatali

composer.json

@@ -42,7 +42,10 @@
         "test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "laravel": {

src/Concerns/DecoratesBoolQuery.php

@@ -93,6 +93,13 @@ public function whereMultiMatch(array $fields, string $query, string|MultiMatchO
         return $this;
     }
 
+    public function orWhereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static
+    {
+        $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
+
+        return $this;
+    }
+
     public function whereWildcard(string $field, string $query, ?WildcardOptions $options = null): static
     {
         $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());

src/Contracts/BoolQuery.php

@@ -29,6 +29,8 @@ public function orWhereMatch(string $field, string $query, string|MatchOptions $
 
     public function whereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static;
 
+    public function orWhereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static;
+
     public function whereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;
 
     public function orWhereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;

src/Filtering/BoolQueryBuilder.php

@@ -170,6 +170,20 @@ protected function makeMatch(string $field, string $query, string|MatchOptions $
     }
 
     public function whereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static
+    {
+        $this->must->add($this->makeMultiMatch($fields, $query, $type));
+
+        return $this;
+    }
+
+    public function orWhereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static
+    {
+        $this->should->add($this->makeMultiMatch($fields, $query, $type));
+
+        return $this;
+    }
+
+    protected function makeMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): MultiMatch
     {
         $options = is_string($type) ? MultiMatchOptions::make($type) : $type;
 
@@ -178,9 +192,7 @@ public function whereMultiMatch(array $fields, string $query, string|MultiMatchO
             $fields
         );
 
-        $this->must->add(new MultiMatch($fields, $query, $options ?? new MultiMatchOptions()));
-
-        return $this;
+        return new MultiMatch($fields, $query, $options ?? new MultiMatchOptions());
     }
 
     public function whereWildcard(string $field, string $query, ?WildcardOptions $options = null): static
@@ -197,7 +209,7 @@ public function orWhereWildcard(string $field, string $query, ?WildcardOptions $
         return $this;
     }
 
-    public function makeWildcard(string $field, string $query, ?WildcardOptions $options = null): Wildcard
+    protected function makeWildcard(string $field, string $query, ?WildcardOptions $options = null): Wildcard
     {
         return new Wildcard($this->absolutePath($field), $query, $options ?: new WildcardOptions());
     }

tests/Unit/Aggregating/AggregationCollectionTest.php

@@ -8,6 +8,7 @@
 use Ensi\LaravelElasticQuery\Tests\Unit\UnitTestCase;
 use InvalidArgumentException;
 use Mockery;
+use Mockery\MockInterface;
 
 class AggregationCollectionTest extends UnitTestCase
 {
@@ -55,13 +56,13 @@ public function testGenerateUniqueName(AggregationCollection $target, string $na
         $this->assertEquals($expected, $target->generateUniqueName($name));
     }
 
-    public function provideGenerateUniqueName(): array
+    public static function provideGenerateUniqueName(): array
     {
         return [
             'no items no name' => [new AggregationCollection(), ' ', 'agg_1'],
             'no items with name' => [new AggregationCollection(), 'agg_2', 'agg_2_1'],
             'has items' => [
-                AggregationCollection::fromAggregation($this->mockAggregation('agg_1')),
+                AggregationCollection::fromAggregation(static::mockAggregation('agg_1')),
                 '',
                 'agg_2',
             ],
@@ -96,7 +97,7 @@ public function testParseResults(): void
         $this->assertEquals(['foo' => 'result', 'bar' => [20]], $testing->parseResults([])->all());
     }
 
-    private function mockAggregation(string $name, ?array $dsl = null, ?array $results = null): Aggregation
+    private static function mockAggregation(string $name, ?array $dsl = null, ?array $results = null): Aggregation|MockInterface
     {
         $agg = Mockery::mock(Aggregation::class);
         $agg->allows('name')->andReturn($name);

tests/Unit/ElasticClientTest.php

@@ -14,7 +14,7 @@ public function testResolveBasicAuthData(array $config, array $expected): void
         $this->assertEquals($expected, ElasticClient::resolveBasicAuthData($config));
     }
 
-    public function provideBasicAuthData(): array
+    public static function provideBasicAuthData(): array
     {
         return [
             'separate username and password' => [

tests/Unit/Filtering/BoolQueryTest.php

@@ -24,7 +24,7 @@ public function testFilter(BoolQueryBuilder $query, array $expected): void
         $this->assertArrayStructure(['bool' => ['filter' => [$expected]]], $query->toDSL());
     }
 
-    public function provideFilter(): array
+    public static function provideFilter(): array
     {
         return [
             'term' => [
@@ -53,7 +53,7 @@ public function testMustNot(BoolQueryBuilder $query, array $expected): void
         $this->assertArrayStructure(['bool' => ['must_not' => [$expected]]], $query->toDSL());
     }
 
-    public function provideMustNot(): array
+    public static function provideMustNot(): array
     {
         return [
             'term' => [BoolQueryBuilder::make()->whereNot('name', 'Product'), ['term']],
@@ -76,7 +76,7 @@ public function testEmptyMatchAll(BoolQueryBuilder $query): void
         $this->assertArrayFragment(['match_all' => new stdClass()], $query->toDSL());
     }
 
-    public function provideEmpty(): array
+    public static function provideEmpty(): array
     {
         return [
             'empty' => [BoolQueryBuilder::make()],
@@ -122,7 +122,7 @@ public function testWhereOperators(string $operator, array $expected): void
         $this->assertArrayFragment($expected, $dsl);
     }
 
-    public function provideWhereOperators(): array
+    public static function provideWhereOperators(): array
     {
         return [
             '=' => ['=', ['term' => ['rating' => 5]]],
@@ -144,7 +144,7 @@ public function testMatch(string|MatchOptions $options, array $expected): void
         $this->assertArrayFragment(['must' => [["match" => ['name' => array_merge(['query' => 'foo'], $expected)]]]], $dsl);
     }
 
-    public function provideMatch(): array
+    public static function provideMatch(): array
     {
         return [
             'operator' => ['and', ['operator' => 'and']],
@@ -170,7 +170,7 @@ public function testOrMatch(string|MatchOptions $options, array $expected): void
         $this->assertArrayFragment(['should' => [["match" => ['name' => array_merge(['query' => 'foo'], $expected)]]]], $dsl);
     }
 
-    public function provideOrMatch(): array
+    public static function provideOrMatch(): array
     {
         return [
             'operator' => ['and', ['operator' => 'and']],
@@ -196,7 +196,30 @@ public function testMultiMatch(string|MultiMatchOptions|null $options, array $ex
         $this->assertArrayFragment(array_merge(['query' => 'baz', 'fields' => ['foo', 'bar']], $expected), $dsl);
     }
 
-    public function provideMultiMatch(): array
+    public static function provideMultiMatch(): array
+    {
+        return [
+            'type as string' => [MatchType::CROSS_FIELDS, ['type' => MatchType::CROSS_FIELDS]],
+            'type in options' => [MultiMatchOptions::make(MatchType::PHRASE), ['type' => MatchType::PHRASE]],
+            'fuzziness' => [MultiMatchOptions::make(fuzziness: 'AUTO'), ['fuzziness' => 'AUTO']],
+            'multiple options' => [
+                MultiMatchOptions::make(type: MatchType::MOST_FIELDS, fuzziness: '3', minimumShouldMatch: '30%'),
+                ['minimum_should_match' => '30%', 'fuzziness' => '3', 'type' => MatchType::MOST_FIELDS],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideOrMultiMatch
+     */
+    public function testOrMultiMatch(string|MultiMatchOptions|null $options, array $expected): void
+    {
+        $dsl = BoolQueryBuilder::make()->OrWhereMultiMatch(['foo', 'bar'], 'baz', $options)->toDSL();
+
+        $this->assertArrayFragment(array_merge(['query' => 'baz', 'fields' => ['foo', 'bar']], $expected), $dsl);
+    }
+
+    public static function provideOrMultiMatch(): array
     {
         return [
             'type as string' => [MatchType::CROSS_FIELDS, ['type' => MatchType::CROSS_FIELDS]],
@@ -219,7 +242,7 @@ public function testWildcard(?WildcardOptions $options, array $expected): void
         $this->assertArrayFragment(['must' => [['wildcard' => ['foo' => array_merge(['value' => '%value%'], $expected)]]]], $dsl);
     }
 
-    public function provideWildcard(): array
+    public static function provideWildcard(): array
     {
         return [
             'empty options' => [WildcardOptions::make(0, false), ['boost' => 0, 'case_insensitive' => false]],
@@ -238,7 +261,7 @@ public function testOrWildcard(?WildcardOptions $options, array $expected): void
         $this->assertArrayFragment(['should' => [['wildcard' => ['foo' => array_merge(['value' => '%value%'], $expected)]]]], $dsl);
     }
 
-    public function provideOrWildcard(): array
+    public static function provideOrWildcard(): array
     {
         return [
             'empty options' => [WildcardOptions::make(0, false), ['boost' => 0, 'case_insensitive' => false]],