Merge branch '3.0' into es-5-support

Author: daniellienert

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -549,20 +549,25 @@ public function getFullElasticSearchHitForNode(NodeInterface $node)
      */
     public function fetch()
     {
-        $timeBefore = microtime(true);
-        $request = $this->request->getRequestAsJson();
-        $response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', [], $request);
-        $timeAfterwards = microtime(true);
-
-        $this->result = $response->getTreatedContent();
-
-        $this->result['nodes'] = [];
-        if ($this->logThisQuery === true) {
-            $this->logger->log(sprintf('Query Log (%s): %s -- execution time: %s ms -- Limit: %s -- Number of results returned: %s -- Total Results: %s',
-                $this->logMessage, $request, (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($this->result['hits']['hits']), $this->result['hits']['total']), LOG_DEBUG);
-        }
-        if (array_key_exists('hits', $this->result) && is_array($this->result['hits']) && count($this->result['hits']) > 0) {
-            $this->result['nodes'] = $this->convertHitsToNodes($this->result['hits']);
+        try {
+            $timeBefore = microtime(true);
+            $request = $this->request->getRequestAsJson();
+            $response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', [], $request);
+            $timeAfterwards = microtime(true);
+
+            $this->result = $response->getTreatedContent();
+
+            $this->result['nodes'] = [];
+            if ($this->logThisQuery === true) {
+                $this->logger->log(sprintf('Query Log (%s): %s -- execution time: %s ms -- Limit: %s -- Number of results returned: %s -- Total Results: %s',
+                    $this->logMessage, $request, (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($this->result['hits']['hits']), $this->result['hits']['total']), LOG_DEBUG);
+            }
+            if (array_key_exists('hits', $this->result) && is_array($this->result['hits']) && count($this->result['hits']) > 0) {
+                $this->result['nodes'] = $this->convertHitsToNodes($this->result['hits']);
+            }
+        } catch (ApiException $exception) {
+            $this->logger->logException($exception);
+            $this->result['nodes'] = [];
         }
 
         return $this->result;
@@ -616,7 +621,7 @@ public function count()
     public function fulltext($searchWord)
     {
         // We automatically enable result highlighting when doing fulltext searches. It is up to the user to use this information or not use it.
-        $this->request->fulltext(json_encode($searchWord));
+        $this->request->fulltext(trim(json_encode($searchWord), '"'));
         $this->request->highlight(150, 2);
 
         return $this;

composer.json

@@ -3,7 +3,7 @@
     "type": "typo3-flow-package",
     "description": "This package provides functionality for using Elasticsearch on top of Neos.ContentRepository.Search",
     "homepage": "http://flowpack.org/",
-    "license": ["LGPL-3.0"],
+    "license": ["LGPL-3.0-only"],
     "require": {
         "php": ">=5.5.0",