Merge pull request #62 from daniellienert/bugfix/fix-missing-escape

BUGFIX: Fix missing escape of [ character

Author: daniellienert

Classes/Controller/SuggestController.php

@@ -14,7 +14,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
-use Flowpack\SearchPlugin\Utility\Sanitation;
+use Flowpack\SearchPlugin\Utility\SearchTerm;
 use Neos\Cache\Frontend\VariableFrontend;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
@@ -116,7 +116,7 @@ protected function buildRequestForTerm(string $term, string $contextNodeIdentifi
 
         // The suggest function only works well with one word
         // special search characters are escaped
-        $suggestTerm = Sanitation::sanitizeSearchInput(explode(' ', $term)[0]);
+        $suggestTerm = SearchTerm::sanitizeSearchInput(explode(' ', $term)[0]);
 
         if (!$this->elasticSearchQueryTemplateCache->has($cacheKey)) {
             $contentContext = $this->createContentContext('live', $dimensionCombination ? json_decode($dimensionCombination, true) : []);

Classes/EelHelper/SuggestionIndexHelper.php

@@ -14,7 +14,7 @@
  */
 
 use Flowpack\SearchPlugin\Exception;
-use Flowpack\SearchPlugin\Utility\Sanitation;
+use Flowpack\SearchPlugin\Utility\SearchTerm;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
 
@@ -48,7 +48,7 @@ protected function prepareInput($input): ?array
     {
         $process = static function (?string $input) {
             $input = preg_replace("/\r|\n/", '', $input);
-            return array_values(array_filter(explode(' ', Sanitation::sanitizeSearchInput(strip_tags($input)))));
+            return array_values(array_filter(explode(' ', SearchTerm::sanitizeSearchInput(strip_tags($input)))));
         };
 
         if (\is_string($input)) {

Classes/Utility/Sanitation.php Classes/Utility/SearchTerm.phpClasses/Utility/Sanitation.php renamed to Classes/Utility/SearchTerm.php

@@ -13,12 +13,12 @@
  * source code.
  */
 
-class Sanitation
+class SearchTerm
 {
 
     public static function sanitizeSearchInput(string $input): string
     {
-        return str_replace(['=', '>', '<', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '\\', '/'], ['', '', '', '(', '\)', '\{', '\}', '[', '\]', '\^', '\"', '\~', '\*', '\?', '\:', '\\\\', '\/'], $input);
+        return str_replace(['=', '>', '<', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '\\', '/'], ['', '', '', '(', '\)', '\{', '\}', '\[', '\]', '\^', '\"', '\~', '\*', '\?', '\:', '\\\\', '\/'], $input);
     }
 
 }