Merge branch '2.11.x'

Smile-SA · Feb 7, 2025 · 07329f7 · 07329f7
2 parents beee5d5 + 734c81e
commit 07329f7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/02-phpstan.yml b/.github/workflows/02-phpstan.yml
@@ -142,7 +142,7 @@ jobs:
 
       - name: "[Init] Unconditionally add phpstan/phpstan"
         working-directory: ${{ env.magento-directory }}
-        run: composer require --dev smile/magento2-smilelab-phpstan ^1.0
+        run: composer require --dev --no-update smile/magento2-smilelab-phpstan ^1.0
 
       - name: "[Init] Fix Magento directory permissions"
         env:

diff --git a/src/module-elasticsuite-catalog/etc/mview.xml b/src/module-elasticsuite-catalog/etc/mview.xml
@@ -22,6 +22,8 @@
             <table name="catalog_category_product" entity_column="product_id" />
             <!-- This subscription aims to reindex products modified in the search terms merchandiser -->
             <table name="smile_elasticsuitecatalog_search_query_product_position" entity_column="product_id" />
+            <!-- Forcefully re-adding what was (or will depending on the version) removed in https://github.com/magento/magento2/commit/b3969936251e1a03427cd24c209abb6af3a0ce1b -->
+            <table name="cataloginventory_stock_item" entity_column="product_id" />
         </subscriptions>
     </view>
     <view id="elasticsuite_categories_fulltext" class="Smile\ElasticsuiteCatalog\Model\Category\Indexer\Fulltext" group="indexer">

diff --git a/...it/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/BucketSelectorTest.php b/...it/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/BucketSelectorTest.php
@@ -11,7 +11,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\Builder\PipelineBuilder;
+namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder;
 
 use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder\BucketSelector as BucketSelectorBuilder;
 use Smile\ElasticsuiteCore\Search\Request\Aggregation\Pipeline\BucketSelector;

diff --git a/...st/Unit/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/MaxBucketTest.php b/...st/Unit/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/MaxBucketTest.php
@@ -11,7 +11,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\Builder\PipelineBuilder;
+namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder;
 
 use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder\MaxBucket as MaxBucketBuilder;
 use Smile\ElasticsuiteCore\Search\Request\Aggregation\Pipeline\MaxBucket;

diff --git a/...it/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/MovingFunctionTest.php b/...it/Search/Adapter/Elasticsuite/Request/Aggregation/PipelineBuilder/MovingFunctionTest.php
@@ -11,7 +11,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\Builder\PipelineBuilder;
+namespace Smile\ElasticsuiteCore\Test\Unit\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder;
 
 use Smile\ElasticsuiteCore\Search\Adapter\Elasticsuite\Request\Aggregation\PipelineBuilder\MovingFunction as MovingFunctionBuilder;
 use Smile\ElasticsuiteCore\Search\Request\Aggregation\Pipeline\MovingFunction;

diff --git a/src/module-elasticsuite-core/Test/Unit/Search/Request/SortOrder/ScriptTest.php b/src/module-elasticsuite-core/Test/Unit/Search/Request/SortOrder/ScriptTest.php
@@ -11,7 +11,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Test\Unit\Search\Request;
+namespace Smile\ElasticsuiteCore\Test\Unit\Search\Request\SortOrder;
 
 use Smile\ElasticsuiteCore\Search\Request\SortOrder\Script as ScriptSortOrder;
 use Smile\ElasticsuiteCore\Search\Request\SortOrderInterface;

diff --git a/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml b/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml
@@ -61,7 +61,8 @@
         <filter name="ascii_folding" type="asciifolding" language="default">
             <preserve_original>false</preserve_original>
         </filter>
-
+        <filter name="stemmer_before" type="trim" language="default"/>
+        <filter name="stemmer_after" type="trim" language="default"/>
         <filter name="stemmer" type="stemmer" language="ar">
             <language>arabic</language>
         </filter>
@@ -212,8 +213,10 @@
                 <filter ref="elision" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
+                <filter ref="stemmer_before" />
                 <filter ref="stemmer_override" />
                 <filter ref="stemmer" />
+                <filter ref="stemmer_after" />
             </filters>
             <char_filters>
                 <char_filter ref="html_strip" />
@@ -254,8 +257,10 @@
                 <filter ref="elision" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
+                <filter ref="stemmer_before" />
                 <filter ref="stemmer_override" />
                 <filter ref="stemmer" />
+                <filter ref="stemmer_after" />
                 <filter ref="shingle" />
             </filters>
             <char_filters>
@@ -292,8 +297,10 @@
                 <filter ref="elision" />
                 <filter ref="word_delimiter" />
                 <filter ref="lowercase" />
+                <filter ref="stemmer_before" />
                 <filter ref="stemmer_override" />
                 <filter ref="stemmer" />
+                <filter ref="stemmer_after" />
                 <filter ref="edge_ngram_filter"/>
             </filters>
             <char_filters>