TASK: Merge branch '3.0' into 4.0

Author: daniellienert

Classes/Driver/Version5/IndexerDriver.php

@@ -46,8 +46,8 @@ public function document($indexName, NodeInterface $node, ElasticSearchDocument
                     'script' => [
                         'lang' => 'painless',
                         'inline' => '
-                            HashMap fulltext = (ctx._source.containsKey("__fulltext") ? ctx._source.__fulltext : new HashMap());
-                            HashMap fulltextParts = (ctx._source.containsKey("__fulltextParts") ? ctx._source.__fulltextParts : new HashMap());
+                            HashMap fulltext = (ctx._source.containsKey("__fulltext") && ctx._source.__fulltext instanceof Map ? ctx._source.__fulltext : new HashMap());
+                            HashMap fulltextParts = (ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof Map ? ctx._source.__fulltextParts : new HashMap());
                             ctx._source = params.newData;
                             ctx._source.__fulltext = fulltext;
                             ctx._source.__fulltextParts = fulltextParts',
@@ -122,7 +122,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
                     'lang' => 'painless',
                     'inline' => '
                         ctx._source.__fulltext = new HashMap();
-                        if (!ctx._source.containsKey("__fulltextParts")) {
+                        if (!ctx._source.containsKey("__fulltextParts") || !(ctx._source.__fulltextParts instanceof Map)) {
                             ctx._source.__fulltextParts = new HashMap();
                         }