Merge branch '7.0' into bugfix/370-alias-creation

Author: kdambekalns

.travis.yml

@@ -24,6 +24,7 @@ cache:
 
 before_install:
   - export NEOS_TARGET_VERSION=5.3
+  - export ESCRA_VERSION=~7.0
   - cd ..
   - if [ "$ES" = 6 ]; then wget --no-check-certificate https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.6.tar.gz && tar xvfz elasticsearch-6.8.6.tar.gz && mv elasticsearch-6.8.6 elasticsearch; fi
   - if [ "$ES" = 7 ]; then wget --no-check-certificate https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.9.0-linux-x86_64.tar.gz && tar xvfz elasticsearch-7.9.0-linux-x86_64.tar.gz && mv elasticsearch-7.9.0 elasticsearch; fi
@@ -32,10 +33,7 @@ before_install:
   - cd ..
   - git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION}
   - cd neos-base-distribution
-  - composer require --no-update --no-interaction neos/content-repository-search:dev-master
-  - composer require --no-update --no-interaction flowpack/elasticsearch:dev-master
-  - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:dev-master
-  - composer remove --no-update --no-interaction neos/site-kickstarter
+  - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:${ESCRA_VERSION}
 install:
   - composer install --no-interaction
   - cd ..

Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php

@@ -73,7 +73,7 @@ public function buildMappingInformation(Index $index): MappingCollection
 
                 if (isset($propertyConfiguration['search']['elasticSearchMapping'])) {
                     if (is_array($propertyConfiguration['search']['elasticSearchMapping'])) {
-                        $propertyMapping = $propertyConfiguration['search']['elasticSearchMapping'];
+                        $propertyMapping = array_filter($propertyConfiguration['search']['elasticSearchMapping']);
                         $mapping->setPropertyByPath($propertyName, $propertyMapping);
                     }
                 } elseif (isset($propertyConfiguration['type'], $this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping'])) {

Configuration/Settings.yaml

@@ -14,7 +14,7 @@ Flowpack:
       driver:
         version: '6.x'
         mapping:
-          6.x:
+          6.x: &v6x
             query:
               className: Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\Query\FilteredQuery
               arguments:
@@ -76,3 +76,4 @@ Flowpack:
               className: 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\SystemDriver'
             nodeTypeMappingBuilder:
               className: 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\Mapping\NodeTypeMappingBuilder'
+          7.x: *v6x