Merge branch '2.10.x' into 2.11.x

Author: rbayet

src/module-elasticsuite-core/Api/Index/Mapping/FieldInterface.php

@@ -53,6 +53,17 @@ interface FieldInterface
     const ANALYZER_REFERENCE  = 'reference';
     const ANALYZER_EDGE_NGRAM = 'standard_edge_ngram';
 
+    /**
+     * Token filter types declarations.
+     */
+    const TOKEN_FILTER_TYPE_WORD_DELIMITER = 'word_delimiter_graph';
+    const TOKEN_FILTER_TYPE_REMOVE_DUPLICATES = 'remove_duplicates';
+
+    /**
+     * Tokenizer declarations.
+     */
+    const TOKENIZER_WHITESPACE = 'whitespace';
+
     /**
      * Field filter logical operators.
      */

src/module-elasticsuite-core/etc/elasticsuite_analysis.xml

@@ -29,15 +29,18 @@
             <length>8192</length>
         </filter>
         <filter name="lowercase" type="lowercase" language="default"/>
+        <filter name="word_delimiter_before" type="trim" language="default" />
         <filter name="word_delimiter" type="word_delimiter_graph" language="default">
             <generate_word_parts>true</generate_word_parts>
+            <generate_number_parts>true</generate_number_parts>
             <catenate_words>true</catenate_words>
             <catenate_numbers>true</catenate_numbers>
             <catenate_all>true</catenate_all>
             <split_on_case_change>true</split_on_case_change>
             <split_on_numerics>true</split_on_numerics>
             <preserve_original>true</preserve_original>
         </filter>
+        <filter name="remove_duplicates" type="remove_duplicates" language="default" />
         <filter name="shingle" type="shingle" language="default">
             <min_shingle_size>2</min_shingle_size>
             <max_shingle_size>4</max_shingle_size>
@@ -51,6 +54,7 @@
         </filter>
         <filter name="reference_word_delimiter" type="word_delimiter_graph" language="default">
             <generate_word_parts>true</generate_word_parts>
+            <generate_number_parts>true</generate_number_parts>
             <catenate_words>false</catenate_words>
             <catenate_numbers>false</catenate_numbers>
             <catenate_all>false</catenate_all>
@@ -214,6 +218,7 @@
                 <filter ref="ascii_folding" />
                 <filter ref="trim" />
                 <filter ref="elision" />
+                <filter ref="word_delimiter_before" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
                 <filter ref="stemmer_before" />
@@ -230,6 +235,7 @@
                 <filter ref="ascii_folding" />
                 <filter ref="trim" />
                 <filter ref="elision" />
+                <filter ref="word_delimiter_before" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
             </filters>
@@ -258,6 +264,7 @@
                 <filter ref="ascii_folding" />
                 <filter ref="trim" />
                 <filter ref="elision" />
+                <filter ref="word_delimiter_before" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
                 <filter ref="stemmer_before" />
@@ -298,6 +305,7 @@
                 <filter ref="ascii_folding" />
                 <filter ref="trim" />
                 <filter ref="elision" />
+                <filter ref="word_delimiter_before" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
                 <filter ref="stemmer_before" />