TASK: Merge branch '5.0' into 6.0

# Conflicts:
#	.travis.yml

Author: daniellienert

.travis.yml

@@ -21,8 +21,9 @@ before_install:
   - cd ..
   - git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION}
   - cd neos-base-distribution
-  - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:dev-master
   - composer require --no-update --no-interaction neos/nodetypes
+  - composer remove --no-update --no-interaction neos/site-kickstarter
+  - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:^6.0
 install:
   - composer install --no-interaction
   - cd ..

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -681,7 +681,7 @@ public function count()
     public function fulltext($searchWord, array $options = [])
     {
         // 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(trim(json_encode($searchWord), '"'), $options);
+        $this->request->fulltext(trim(json_encode($searchWord, JSON_UNESCAPED_UNICODE), '"'), $options);
         $this->request->highlight(150, 2);
 
         return $this;