support Elasticsearch 7

broadway · May 11, 2020 · 5b1823c · 5b1823c
1 parent 87d9b3b
commit 5b1823c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ php:
   - 7.4
 
 env:
-  - ELASTICSEARCH_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.8.deb
+  - ELASTICSEARCH_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.6.2-amd64.deb
 
 before_install:
   # Disable XDebug speed up test execution.

diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ $ composer require broadway/read-model-elasticsearch
 
 | Elasticsearch Version | broadway/read-model-elasticsearch version |
 | --------------------- | ----------------------------------------- |
+| 7                     | 0.7                                       |
 | 6                     | 0.6                                       |
 | 5                     | 0.5                                       |
 | 2                     | 0.1                                       |

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.2",
         "broadway/broadway": "^2.3.1",
-        "elasticsearch/elasticsearch": "^6.0"
+        "elasticsearch/elasticsearch": "^7.0"
     },
     "authors": [
       {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,8 @@
 version: '3.2'
 services:
   elasticsearch:
-    image: elasticsearch:6.8.8
+    image: elasticsearch:7.6.2
     ports:
       - "9200:9200"
+    environment:
+      - discovery.type=single-node
diff --git a/src/ElasticSearchRepository.php b/src/ElasticSearchRepository.php
@@ -234,12 +234,10 @@ public function createIndex(): bool
         if (count($this->notAnalyzedFields)) {
             $indexParams['body'] = [
                 'mappings' => [
-                    $class => [
-                        '_source' => [
-                            'enabled' => true,
-                        ],
-                        'properties' => $this->createNotAnalyzedFieldsMapping($this->notAnalyzedFields),
+                    '_source' => [
+                        'enabled' => true,
                     ],
+                    'properties' => $this->createNotAnalyzedFieldsMapping($this->notAnalyzedFields),
                 ],
             ];
         }

diff --git a/test/ElasticSearchRepositoryTest.php b/test/ElasticSearchRepositoryTest.php
@@ -67,15 +67,18 @@ public function it_creates_an_index_with_non_analyzed_terms()
         $this->client->cluster()->health(['index' => $index, 'wait_for_status' => 'yellow', 'timeout' => '10s']);
         $mapping = $this->client->indices()->getMapping(['index' => $index]);
 
-        $this->assertArrayHasKey($index, $mapping);
-        $this->assertArrayHasKey($type, $mapping[$index]['mappings']);
-        $nonAnalyzedTerms = [];
-
-        foreach ($mapping[$index]['mappings'][$type]['properties'] as $key => $value) {
-            $nonAnalyzedTerms[] = $key;
-        }
-
-        $this->assertEquals([$nonAnalyzedTerm], $nonAnalyzedTerms);
+        $expectedMapping = [
+            'test_non_analyzed_index' => [
+                'mappings' => [
+                    'properties' => [
+                        'name' => [
+                            'type' => 'keyword',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedMapping, $mapping);
     }
 
     /**