MERGE: Merge branch '2.1' into 3.0

# Conflicts:
#	Classes/Controller/SuggestController.php
#	Configuration/Routes.yaml
#	composer.json

Author: daniellienert

Classes/Controller/SuggestController.php

@@ -20,7 +20,7 @@ class SuggestController extends ActionController
 {
     /**
      * @Flow\Inject
-     * @var ElasticSearchClient
+     * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient
      */
     protected $elasticSearchClient;
 
@@ -31,6 +31,20 @@ class SuggestController extends ActionController
         'json' => JsonView::class
     ];
 
+    /**
+     * Sets the ElasticSearchClient instance needed for this to work. If no client is set,
+     * this controller cannot be used; but at least the package can otherwise be used with
+     * e.g. SimpleSearch.
+     *
+     * @return void
+     */
+    public function initializeObject()
+    {
+        if ($this->objectManager->isRegistered(ElasticSearchClient::class)) {
+            $this->elasticSearchClient = $this->objectManager->get(ElasticSearchClient::class);
+        }
+    }
+
     /**
      * @param string $term
      *
@@ -47,6 +61,10 @@ public function indexAction($term)
             ]
         ];
 
+        if ($this->elasticSearchClient === null) {
+            throw new \RuntimeException('The SuggestController needs an ElasticSearchClient, it seems you run without the flowpack/elasticsearch-contentrepositoryadaptor package, though.', 1487189823);
+        }
+
         $response = $this->elasticSearchClient->getIndex()->request('POST', '/_suggest', [], json_encode($request))->getTreatedContent();
         $suggestions = array_map(function ($option) {
             return $option['text'];

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"