Merge branch 'master' into task-improve-errorhandling

Author: kdambekalns

.travis.yml

@@ -5,6 +5,10 @@ matrix:
       env: ES=1
     - php: 7.0
       env: ES=2
+    - php: 7.1
+      env: ES=1
+    - php: 7.1
+      env: ES=2
 sudo: false
 before_install:
   - export NEOS_TARGET_VERSION=3.0

Classes/Command/NodeTypeCommandController.php

@@ -17,7 +17,7 @@
 /**
  * Provides CLI features for debugging the node types.
  *
- * TODO: move to TYPO3CR or Neos
+ * TODO: move to ContentRepository or Neos
  *
  * @Flow\Scope("singleton")
  */

Classes/Driver/AbstractQuery.php

@@ -21,7 +21,7 @@
 abstract class AbstractQuery implements QueryInterface, \JsonSerializable, \ArrayAccess, ProtectedContextAwareInterface
 {
     /**
-     * The ElasticSearch request, as it is being built up.
+     * The Elasticsearch request, as it is being built up.
      *
      * @var array
      */

Classes/Driver/QueryInterface.php

@@ -132,7 +132,7 @@ public function setValueByPath($path, $value);
     /**
      * Append $data to the given array at $path inside $this->request.
      *
-     * Low-level method to manipulate the ElasticSearch Query
+     * Low-level method to manipulate the Elasticsearch Query
      *
      * @param string $path
      * @param array $data

Classes/Eel/ElasticSearchQuery.php

@@ -16,7 +16,7 @@
 
 /**
  * This ElasticSearchQuery object is just used inside ElasticSearchQueryResult->getQuery(), so that pagination
- * widgets etc work in the same manner for ElasticSearch results.
+ * widgets etc work in the same manner for Elasticsearch results.
  */
 class ElasticSearchQuery implements QueryInterface
 {

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -74,7 +74,7 @@ class ElasticSearchQueryBuilder implements QueryBuilderInterface, ProtectedConte
 
     /**
      * This (internal) array stores, for the last search request, a mapping from Node Identifiers
-     * to the full ElasticSearch Hit which was returned.
+     * to the full Elasticsearch Hit which was returned.
      *
      * This is needed to e.g. use result highlighting.
      *
@@ -83,7 +83,7 @@ class ElasticSearchQueryBuilder implements QueryBuilderInterface, ProtectedConte
     protected $elasticSearchHitsIndexedByNodeFromLastRequest;
 
     /**
-     * The ElasticSearch request, as it is being built up.
+     * The Elasticsearch request, as it is being built up.
      *
      * @var QueryInterface
      * @Flow\Inject
@@ -310,7 +310,7 @@ public function queryFilter($filterType, $filterOptions, $clauseType = 'must')
     /**
      * Append $data to the given array at $path inside $this->request.
      *
-     * Low-level method to manipulate the ElasticSearch Query
+     * Low-level method to manipulate the Elasticsearch Query
      *
      * @param string $path
      * @param array $data
@@ -473,7 +473,7 @@ public function suggestions($name, array $suggestionDefinition)
     }
 
     /**
-     * Get the ElasticSearch request as we need it
+     * Get the Elasticsearch request as we need it
      *
      * @return QueryInterface
      */
@@ -483,7 +483,7 @@ public function getRequest()
     }
 
     /**
-     * Log the current request to the ElasticSearch log for debugging after it has been executed.
+     * Log the current request to the Elasticsearch log for debugging after it has been executed.
      *
      * @param string $message an optional message to identify the log entry
      * @return $this
@@ -526,10 +526,10 @@ public function getFrom()
     }
 
     /**
-     * This low-level method can be used to look up the full ElasticSearch hit given a certain node.
+     * This low-level method can be used to look up the full Elasticsearch hit given a certain node.
      *
      * @param NodeInterface $node
-     * @return array the ElasticSearch hit for the node as array, or NULL if it does not exist.
+     * @return array the Elasticsearch hit for the node as array, or NULL if it does not exist.
      */
     public function getFullElasticSearchHitForNode(NodeInterface $node)
     {
@@ -616,7 +616,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;

Classes/Eel/ElasticSearchQueryResult.php

@@ -237,13 +237,13 @@ public function getSuggestions()
     }
 
     /**
-     * Returns the ElasticSearch "hit" (e.g. the raw content being transferred back from ElasticSearch)
+     * Returns the Elasticsearch "hit" (e.g. the raw content being transferred back from Elasticsearch)
      * for the given node.
      *
      * Can be used for example to access highlighting information.
      *
      * @param NodeInterface $node
-     * @return array the ElasticSearch hit, or NULL if it does not exist.
+     * @return array the Elasticsearch hit, or NULL if it does not exist.
      * @api
      */
     public function searchHitForNode(NodeInterface $node)
@@ -253,7 +253,7 @@ public function searchHitForNode(NodeInterface $node)
 
     /**
      * Returns the array with all sort values for a given node. The values are fetched from the raw content
-     * ElasticSearch returns within the hit data
+     * Elasticsearch returns within the hit data
      *
      * @param NodeInterface $node
      * @return array

Classes/ElasticSearchClient.php

@@ -27,7 +27,7 @@
 class ElasticSearchClient extends \Flowpack\ElasticSearch\Domain\Model\Client
 {
     /**
-     * The index name to be used for querying (by default "typo3cr")
+     * The index name to be used for querying (by default "neoscr")
      *
      * @var string
      */
@@ -64,7 +64,7 @@ public function getIndexName()
 
     /**
      * Retrieve the index to be used for querying or on-the-fly indexing.
-     * In ElasticSearch, this index is an *alias* to the currently used index.
+     * In Elasticsearch, this index is an *alias* to the currently used index.
      *
      * @return \Flowpack\ElasticSearch\Domain\Model\Index
      */

Classes/Indexer/NodeIndexer.php

@@ -110,7 +110,7 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac
     protected $systemDriver;
 
     /**
-     * The current ElasticSearch bulk request, in the format required by http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+     * The current Elasticsearch bulk request, in the format required by http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
      *
      * @var array
      */

Classes/Mapping/NodeTypeMappingBuilder.php

@@ -20,7 +20,7 @@
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 
 /**
- * Builds the mapping information for TYPO3CR Node Types in Elastic Search
+ * Builds the mapping information for ContentRepository Node Types in Elasticsearch
  *
  * @Flow\Scope("singleton")
  */
@@ -64,7 +64,7 @@ public function initializeObject($cause)
     }
 
     /**
-     * Converts a TYPO3CR Node Type name into a name which can be used for an Elastic Search Mapping
+     * Converts a ContentRepository Node Type name into a name which can be used for an Elasticsearch Mapping
      *
      * @param string $nodeTypeName
      * @return string