BUGFIX: Also map elasticsearch config that is passed directly

adjustStringTypeMapping() is also called directly with `$propertyConfiguration['search']['elasticSearchMapping‘]` - in this case the fields are not altered. This raises a lot of elasticsearch deprecation warnings.

Author: daniellienert

Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php

@@ -157,11 +157,7 @@ protected function migrateIncludeInAllToCopyTo(array &$mapping)
      */
     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';
@@ -178,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);
+            }
         }
     }
 }