TASK: Merge branch '6.0' into master

daniellienert · daniellienert · commit 7c28dbc3dcc9 · 2020-08-11T13:57:23.000+02:00
diff --git a/Classes/Eel/ElasticSearchQueryResult.php b/Classes/Eel/ElasticSearchQueryResult.php
@@ -255,7 +255,7 @@ public function getSuggestions(): array
      * @return array the Elasticsearch hit, or NULL if it does not exist.
      * @api
      */
-    public function searchHitForNode(NodeInterface $node): array
+    public function searchHitForNode(NodeInterface $node): ?array
     {
         return $this->elasticSearchQuery->getQueryBuilder()->getFullElasticSearchHitForNode($node);
     }

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public function getSuggestions(): array`
`255`	`255`	`* @return array the Elasticsearch hit, or NULL if it does not exist.`
`256`	`256`	`* @api`
`257`	`257`	`*/`
`258`		`- public function searchHitForNode(NodeInterface $node): array`
	`258`	`+ public function searchHitForNode(NodeInterface $node): ?array`
`259`	`259`	`{`
`260`	`260`	`return $this->elasticSearchQuery->getQueryBuilder()->getFullElasticSearchHitForNode($node);`
`261`	`261`	`}`