TASK: Merge branch '4.0' into master

daniellienert · daniellienert · commit c1595241908d · 2020-12-20T12:03:50.000+01:00
# Conflicts:
#	Classes/Controller/SuggestController.php
diff --git a/Classes/Controller/SuggestController.php b/Classes/Controller/SuggestController.php
@@ -69,7 +69,7 @@ public function initializeObject()
      * @throws QueryBuildingException
      * @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException
      */
-    public function indexAction(string $term, string $contextNodeIdentifier, string $dimensionCombination = null): void
+    public function indexAction(string $term = '', string $contextNodeIdentifier, string $dimensionCombination = null): void
     {
         if ($this->elasticSearchClient === null) {
             throw new \RuntimeException('The SuggestController needs an ElasticSearchClient, it seems you run without the flowpack/elasticsearch-contentrepositoryadaptor package, though.', 1487189823);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function initializeObject()`
`69`	`69`	`* @throws QueryBuildingException`
`70`	`70`	`* @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException`
`71`	`71`	`*/`
`72`		`- public function indexAction(string $term, string $contextNodeIdentifier, string $dimensionCombination = null): void`
	`72`	`+ public function indexAction(string $term = '', string $contextNodeIdentifier, string $dimensionCombination = null): void`
`73`	`73`	`{`
`74`	`74`	`if ($this->elasticSearchClient === null) {`
`75`	`75`	`throw new \RuntimeException('The SuggestController needs an ElasticSearchClient, it seems you run without the flowpack/elasticsearch-contentrepositoryadaptor package, though.', 1487189823);`