Merge branch '3.0'

# Conflicts:
#	Classes/Controller/SuggestController.php

Author: dfeyer

Classes/Controller/SuggestController.php

@@ -25,7 +25,7 @@ class SuggestController extends ActionController
 
     /**
      * @Flow\Inject
-     * @var ElasticSearchClient
+     * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient
      */
     protected $elasticSearchClient;
 
@@ -48,6 +48,13 @@ class SuggestController extends ActionController
         'json' => JsonView::class
     ];
 
+    public function initializeObject()
+    {
+        if ($this->objectManager->isRegistered(ElasticSearchClient::class)) {
+            $this->elasticSearchClient = $this->objectManager->get(ElasticSearchClient::class);
+        }
+    }
+
     /**
      * @param string $contextNodeIdentifier
      * @param string $dimensionCombination
@@ -165,11 +172,13 @@ protected function extractCompletions($response)
      */
     protected function extractSuggestions($response)
     {
+        if ($this->elasticSearchClient === null) {
+            throw new \RuntimeException('The SuggestController needs an ElasticSearchClient, it seems you run without the flowpack/elasticsearch-contentrepositoryadaptor package, though.', 1487189823);
+        }
         $suggestionOptions = isset($response['suggest']) ? $response['suggest'] : [];
         if (count($suggestionOptions['suggestions'][0]['options']) > 0) {
             return $suggestionOptions['suggestions'][0]['options'];
         }
-
         return [];
     }
 }

Configuration/Routes.yaml

@@ -10,7 +10,7 @@
   appendExceedingArguments: true
   httpMethods: ['GET']
 -
-  name: 'flowpack/searchplugin - SuggestController->ajax'
+  name: 'flowpack/searchplugin - AjaxSearchController->search'
   uriPattern: 'flowpack/ajaxsearch'
   defaults:
     '@package':    'Flowpack.SearchPlugin'

composer.json

@@ -12,6 +12,10 @@
         "neos/fusion": "^3.0",
         "neos/neos": "^3.0"
     },
+    "suggest": {
+        "flowpack/elasticsearch-contentrepositoryadaptor": "Provides search using Elasticsearch",
+        "flowpack/simplesearch-contentrepositoryadaptor": "A simple php search engine based on sqlite"
+    },
     "autoload": {
         "psr-4": {
             "Flowpack\\SearchPlugin\\": "Classes"