NEXT-12169 - Increase ES version for CI

Author: philipreinken

.github/workflows/jest.yml

@@ -20,7 +20,7 @@ jobs:
             MYSQL_ROOT_PASSWORD: shopware
             MYSQL_DATABASE: shopware
       elasticsearch:
-        image: elastic/elasticsearch:7.1.1
+        image: elastic/elasticsearch:7.3.0
         env:
           discovery.type: single-node
 
@@ -67,7 +67,7 @@ jobs:
             MYSQL_ROOT_PASSWORD: shopware
             MYSQL_DATABASE: shopware
       elasticsearch:
-        image: elastic/elasticsearch:7.1.1
+        image: elastic/elasticsearch:7.3.0
         env:
           discovery.type: single-node
 

.github/workflows/php-check.yml

@@ -20,7 +20,7 @@ jobs:
             MYSQL_ROOT_PASSWORD: shopware
             MYSQL_DATABASE: shopware
       elasticsearch:
-        image: elastic/elasticsearch:7.1.1
+        image: elastic/elasticsearch:7.3.0
         env:
           discovery.type: single-node
 

.github/workflows/phpunit.yml

@@ -21,7 +21,7 @@ jobs:
             MYSQL_ROOT_PASSWORD: shopware
             MYSQL_DATABASE: shopware
       elasticsearch:
-        image: elastic/elasticsearch:7.1.1
+        image: elastic/elasticsearch:7.3.0
         env:
           discovery.type: single-node
 

.github/workflows/validate-snippets.yml

@@ -24,7 +24,7 @@ jobs:
             MYSQL_ROOT_PASSWORD: shopware
             MYSQL_DATABASE: shopware
       elasticsearch:
-        image: elastic/elasticsearch:7.1.1
+        image: elastic/elasticsearch:7.3.0
         env:
           discovery.type: single-node
 

.gitlab-ci.yml

@@ -93,7 +93,7 @@ PHP Unit:
         -   name: $MYSQL_IMAGE
             alias: mysql
             entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
-        -   name: elastic/elasticsearch:7.1.1
+        -   name: elastic/elasticsearch:7.3.0
             alias: elasticsearch
             command: [ "bin/elasticsearch", "-Expack.security.enabled=false", "-Ediscovery.type=single-node" ]
     rules:

src/Docs/Resources/current/50-how-to/500-using-elasticsearch.md

@@ -1,7 +1,7 @@
 [titleEn]: <>(Using elasticsearch)
 [hash]: <>(article:how_to_elasticsearch)
 
-As soon as several thousand data sets are used in a project it makes sense to deal with Elasticsearch. Elasticsearch 7.1 or newer is required.
+As soon as several thousand data sets are used in a project it makes sense to deal with Elasticsearch. Elasticsearch 7.3 or newer is required.
 The Elasticsearch integration for shopware is in the `shopware/elasticsearch` bundle. If this is not available in your project you can simply add it via `composer require shopware/elasticsearch`.
 
 To activate Elasticsearch the following environment variables have to be set:

src/Docs/Resources/deprecated/4-how-to/500-using-elasticsearch.md

@@ -1,7 +1,7 @@
 [titleEn]: <>(Using elasticsearch)
 [hash]: <>(article:how_to_elasticsearch)
 
-As soon as several thousand data sets are used in a project it makes sense to deal with Elasticsearch. Elasticsearch 7.1 or newer is required.
+As soon as several thousand data sets are used in a project it makes sense to deal with Elasticsearch. Elasticsearch 7.3 or newer is required.
 The Elasticsearch integration for shopware is in the `shopware/elasticsearch` bundle. If this is not available in your project you can simply add it via `composer require shopware/elasticsearch`.
 
 To activate Elasticsearch the following environment variables have to be set:

src/Elasticsearch/Framework/Indexing/ElasticsearchIndexer.php

@@ -14,7 +14,6 @@
 use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
 use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent;
-use Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\JsonFieldSerializer;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexer as AbstractEntityIndexer;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexingMessage;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -285,7 +284,7 @@ public function handle(EntityIndexingMessage $message): void
         $result = $this->client->bulk([
             'index' => $index,
             'type' => $definition->getEntityDefinition()->getEntityName(),
-            'body' => JsonFieldSerializer::encodeJson($documents),
+            'body' => $documents,
         ]);
 
         $this->cacheClearer->invalidateTags([$entity . '.id']);

src/Elasticsearch/Product/ElasticsearchProductDefinition.php

@@ -69,15 +69,15 @@ public function getMapping(Context $context): array
                     'configuratorSettings' => $this->mapper->mapField($definition, $definition->getField('configuratorSettings'), $context),
                 ]
             ),
-            //            'dynamic_templates' => [
-            //                [
-            //                    'cheapest_price' => [
-            //                        'match_pattern' => 'regex',
-            //                        'match' => '^cheapest_price_rule',
-            //                        'mapping' => ['type' => 'double'],
-            //                    ],
-            //                ],
-            //            ],
+            'dynamic_templates' => [
+                [
+                    'cheapest_price' => [
+                        'match_pattern' => 'regex',
+                        'match' => '^cheapest_price_rule',
+                        'mapping' => ['type' => 'double'],
+                    ],
+                ],
+            ],
         ];
     }
 
@@ -164,10 +164,10 @@ private function mapCheapestPrices(EntityCollection $collection, array $document
             foreach ($price as $rule => $currencies) {
                 foreach ($currencies as $currency => $taxes) {
                     $key = 'cheapest_price_' . $rule . '_' . $currency . '_gross';
-                    $document[$key] = (float) $taxes['gross'];
+                    $document[$key] = $taxes['gross'];
 
                     $key = 'cheapest_price_' . $rule . '_' . $currency . '_net';
-                    $document[$key] = (float) $taxes['net'];
+                    $document[$key] = $taxes['net'];
                 }
             }
         }