Merge pull request #66 from arnordhaenens/feature/prevent_php_8_prese…

…rved_keyword_conflict

Prevent future conflict with PHP8 preserved keyword `match`

changelog.md

@@ -2,71 +2,79 @@
 
 All notable changes to `Elasticsearch` will be documented in this file.
 
+## Version 0.13.0
+
+### Fixed
+
+* Rename `AviationCode\Elasticsearch\Query\Dsl\FullText\Match`
+  to `AviationCode\Elasticsearch\Query\Dsl\FullText\MatchQuery` to respect the new `match` preserved keyword as of PHP8.
+  See [https://www.php.net/manual/en/reserved.keywords.php](https://www.php.net/manual/en/reserved.keywords.php)
+
 ## Version 0.12.0
 
-## Added
+### Added
 
 * Fetch aggregations from SimplePaginator
 
 ## Version 0.11.0
 
-## Added
+### Added
 
 * Add support for Count API
 
-## Fixed
+### Fixed
 
 * Don't skip the first x documents equal to `$perPage`
 
-
 ## Version 0.10.0
 
-## Added
+### Added
 
 * Add composite bucket support
 
-
 ## Version 0.9.0
 
-## Added
+### Added
 
 * Add Laravel 8 support
 
-## Removed
+### Removed
 
 * Remove Laravel 5.X support
 
 ## Version 0.8.0
 
-## Added
+### Added
 
 * `select($fields)` to query builder filtering results down subset of fields.
 
 ## Version 0.7.0
 
-## Added
+### Added
+
+* Skip method on query builder (alias)
+* From method to offset a query by X records. Is limited by the max-window size on your elastic configuration (default:
+  10.000)
+* Add paginate method on query builder compatible with Eloquent Builder paginator
 
- * Skip method on query builder (alias)
- * From method to offset a query by X records. Is limited by the max-window size on your elastic configuration (default: 10.000)
- * Add paginate method on query builder compatible with Eloquent Builder paginator
+### Fixed
 
-## Fixed
- * Add missing terms query
+* Add missing terms query
 
 ## Version 0.6.2
 
 ### Fixes
 
-* Fix: Include path eloquent collection ([PR-57](https://github.com/AviationCode/elasticsearch/pull/57)) 
+* Fix: Include path eloquent collection ([PR-57](https://github.com/AviationCode/elasticsearch/pull/57))
 
 ## Version 0.6.1
 
 ### Fixes
 
-* Fix: publish vendor config ([PR-56](https://github.com/AviationCode/elasticsearch/pull/56)) 
-
+* Fix: publish vendor config ([PR-56](https://github.com/AviationCode/elasticsearch/pull/56))
 
 ## Version 0.6.0
+
 ### Breaking changes
 
 Any value type aggregation (sum, value_count, avg, ...) which returned a `SimpleValue` object having `value()` method
@@ -83,7 +91,7 @@ $result->aggregation->total;
 Chaining aggregations will place them on the parent aggregation.
 
 Expected aggregation structure:
- 
+
 * categories
     * sales
 * total_sales
@@ -107,14 +115,13 @@ $aggs->terms('categories', 'category')
 $aggs->sum('total_sales', 'item_count');
 ```
 
-
-
-
 ### Changes
+
 * Make SimpleValue no longer return an object instead return value
 * Aggregation returns the aggregation object to add chaining
 
 ### Added
+
 * Add Significant Terms bucket aggregation
 * Add Perecentiles metric aggregation
 * Add percentile ranks metric aggregation
@@ -158,16 +165,18 @@ $aggs->sum('total_sales', 'item_count');
 ### Added
 
 * Add `elastic:create-index` command to interactively create index
-* Serialize aggregations to array / json. 
+* Serialize aggregations to array / json.
 
 ### Fixes
+
 * Fix search threw exception when requesting empty filter
 * Fix zero size ignored in query
 * Fix incorrect index name taken from eloquent models
 
 ## Version 0.3.0
 
 ### Added
+
 * Use new extended config format (support https, basic auth...)
 
 ### Fixes

src/Query/Dsl/Boolean/Boolean.php

@@ -2,7 +2,7 @@
 
 namespace AviationCode\Elasticsearch\Query\Dsl\Boolean;
 
-use AviationCode\Elasticsearch\Query\Dsl\FullText\Match;
+use AviationCode\Elasticsearch\Query\Dsl\FullText\MatchQuery;
 use AviationCode\Elasticsearch\Query\Dsl\FullText\MatchBoolPrefix;
 use AviationCode\Elasticsearch\Query\Dsl\FullText\MatchPhrase;
 use AviationCode\Elasticsearch\Query\Dsl\FullText\MatchPhrasePrefix;
@@ -224,7 +224,7 @@ public function wildcard(string $field, $value, array $options = []): self
      */
     public function match(string $key, $query, array $options = []): self
     {
-        $this->clauses[] = new Match($key, $query, $options);
+        $this->clauses[] = new MatchQuery($key, $query, $options);
 
         return $this;
     }

src/Query/Dsl/FullText/Match.php → src/Query/Dsl/FullText/MatchQuery.php

@@ -9,7 +9,7 @@
  *
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html
  */
-class Match implements Arrayable
+class MatchQuery implements Arrayable
 {
     public const KEY = 'match';
 

tests/Unit/Query/Dsl/FullText/MatchTest.php → tests/Unit/Query/Dsl/FullText/MatchQueryTest.php

@@ -2,15 +2,15 @@
 
 namespace AviationCode\Elasticsearch\Tests\Unit\Query\Dsl\FullText;
 
-use AviationCode\Elasticsearch\Query\Dsl\FullText\Match;
+use AviationCode\Elasticsearch\Query\Dsl\FullText\MatchQuery;
 use AviationCode\Elasticsearch\Tests\Unit\TestCase;
 
-class MatchTest extends TestCase
+class MatchQueryTest extends TestCase
 {
     /** @test **/
     public function it_builds_match_clause()
     {
-        $match = new Match('message', 'this is a test');
+        $match = new MatchQuery('message', 'this is a test');
 
         $this->assertEquals([
             'match' => [
@@ -24,7 +24,7 @@ public function it_builds_match_clause()
     /** @test **/
     public function it_builds_match_clause_with_options()
     {
-        $match = new Match('message', 'this is a test', ['operator' => 'and']);
+        $match = new MatchQuery('message', 'this is a test', ['operator' => 'and']);
 
         $this->assertEquals([
             'match' => [