TASK: Merge branch '3.0' into 4.0

Author: daniellienert

Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php

@@ -37,7 +37,7 @@ public function initializeObject($cause)
     {
         parent::initializeObject($cause);
         if ($cause === ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
-            $this->adjustStringTypeMapping($this->defaultConfigurationPerType);
+            $this->migrateConfigurationForElasticVersion5($this->defaultConfigurationPerType);
         }
     }
 
@@ -64,7 +64,7 @@ public function buildMappingInformation(Index $index)
             $fullConfiguration = $nodeType->getFullConfiguration();
             if (isset($fullConfiguration['search']['elasticSearchMapping'])) {
                 $fullMapping = $fullConfiguration['search']['elasticSearchMapping'];
-                $this->adjustStringTypeMapping($fullMapping);
+                $this->migrateConfigurationForElasticVersion5($fullMapping);
                 $mapping->setFullMapping($fullMapping);
             }
 
@@ -84,7 +84,7 @@ public function buildMappingInformation(Index $index)
                 if (isset($propertyConfiguration['search']) && isset($propertyConfiguration['search']['elasticSearchMapping'])) {
                     if (is_array($propertyConfiguration['search']['elasticSearchMapping'])) {
                         $propertyMapping = $propertyConfiguration['search']['elasticSearchMapping'];
-                        $this->adjustStringTypeMapping($propertyMapping);
+                        $this->migrateConfigurationForElasticVersion5($propertyMapping);
                         $mapping->setPropertyByPath($propertyName, $propertyMapping);
                     }
                 } elseif (isset($propertyConfiguration['type']) && isset($this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping'])) {
@@ -102,6 +102,44 @@ public function buildMappingInformation(Index $index)
         return $mappings;
     }
 
+    /**
+     * @param array $mapping
+     * @return void
+     */
+    protected function migrateConfigurationForElasticVersion5(array &$mapping)
+    {
+        $this->migrateIncludeInAllToCopyTo($mapping);
+        $this->adjustStringTypeMapping($mapping);
+    }
+
+    /**
+     * include_in_all is deprecated with elasticsearch 5.x and raises
+     * warnings on index creation
+     *
+     * @param array $mapping
+     * @return void
+     */
+    protected function migrateIncludeInAllToCopyTo(array &$mapping)
+    {
+        $migrateIncludeInAll = function (&$mapping) {
+            if (isset($mapping['include_in_all'])) {
+                if ((bool)$mapping['include_in_all'] === true) {
+                    $mapping['copy_to'] = '_all';
+                }
+                unset($mapping['include_in_all']);
+            }
+        };
+
+        $migrateIncludeInAll($mapping);
+        
+        foreach ($mapping as &$item) {
+            if (is_array($item)) {
+                $migrateIncludeInAll($mapping);
+                $this->migrateIncludeInAllToCopyTo($item);
+            }
+        }
+    }
+
     /**
      * Adjust the mapping for string to text or keyword as needed.
      *
@@ -119,11 +157,7 @@ public function buildMappingInformation(Index $index)
      */
     protected function adjustStringTypeMapping(array &$mapping)
     {
-        foreach ($mapping as &$item) {
-            if (!is_array($item)) {
-                continue;
-            }
-
+        $adjustStringTypeMapping = function (&$item) {
             if (isset($item['type']) && $item['type'] === 'string') {
                 if (isset($item['index']) && $item['index'] === 'not_analyzed') {
                     $item['type'] = 'keyword';
@@ -140,8 +174,15 @@ protected function adjustStringTypeMapping(array &$mapping)
                     $item['index'] = true;
                 }
             }
+        };
 
-            $this->adjustStringTypeMapping($item);
+        $adjustStringTypeMapping($mapping);
+
+        foreach ($mapping as &$item) {
+            if (is_array($item)) {
+                $adjustStringTypeMapping($mapping);
+                $this->adjustStringTypeMapping($item);
+            }
         }
     }
 }

Documentation/ElasticConfiguration-5.x.md

@@ -8,8 +8,8 @@ But the following can make your life easier:
 # the following settings secure your cluster
 cluster.name: [PUT_YOUR_CUSTOM_NAME_HERE]
 node.name: [PUT_YOUR_CUSTOM_NAME_HERE]
-network.host: 127.0.0.1
+network.host: _local_
 ```
 
 **Note:** When using Elasticsearch 5.x changes to the mapping may be needed.
-More information on the [mapping in ElasticSearch 5.x](Documentation/ElasticMapping-5.x.md).
+More information on the [mapping in ElasticSearch 5.x](ElasticMapping-5.x.md).