MERGE: Merge branch '4.0' into master

kdambekalns · kdambekalns · commit 7d2e2aa005e4 · 2019-03-12T11:42:36.000+01:00
# Conflicts:
#	Classes/Driver/Version1/Query/FilteredQuery.php
#	Classes/Driver/Version5/IndexerDriver.php
#	Classes/Driver/Version5/Query/FilteredQuery.php
#	Classes/Eel/ElasticSearchQueryBuilder.php
#	README.md
diff --git a/Classes/Eel/ElasticSearchQueryBuilder.php b/Classes/Eel/ElasticSearchQueryBuilder.php
@@ -842,7 +842,7 @@ protected function convertHitsToNodes(array $hits): array
          * we might be able to use https://github.com/elasticsearch/elasticsearch/issues/3300 as soon as it is merged.
          */
         foreach ($hits as $hit) {
-            $nodePath = $hit[isset($hit['fields']) ? 'fields' : '_source']['__path'];
+            $nodePath = $hit[isset($hit['fields']['__path']) ? 'fields' : '_source']['__path'];
             if (is_array($nodePath)) {
                 $nodePath = current($nodePath);
             }

Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,7 @@ protected function convertHitsToNodes(array $hits): array`
`842`	`842`	`* we might be able to use https://github.com/elasticsearch/elasticsearch/issues/3300 as soon as it is merged.`
`843`	`843`	`*/`
`844`	`844`	`foreach ($hits as $hit) {`
`845`		`- $nodePath = $hit[isset($hit['fields']) ? 'fields' : '_source']['__path'];`
	`845`	`+ $nodePath = $hit[isset($hit['fields']['__path']) ? 'fields' : '_source']['__path'];`
`846`	`846`	`if (is_array($nodePath)) {`
`847`	`847`	`$nodePath = current($nodePath);`
`848`	`848`	`}`