Merge branch '2.11.x'

Author: rbayet

.github/workflows/02-phpstan.yml

@@ -39,14 +39,22 @@ jobs:
           - php-versions: '8.3'
             magento-versions: '2.4.7-p8'
             magento-editions: 'enterprise'
-            experimental: true
+            experimental: false
           - php-versions: '8.3'
             magento-versions: '2.4.8-p3'
             magento-editions: 'enterprise'
-            experimental: true
+            experimental: false
           - php-versions: '8.4'
             magento-versions: '2.4.8-p3'
             magento-editions: 'enterprise'
+            experimental: false
+          - php-versions: '8.4'
+            magento-versions: '2.4.9-beta1'
+            magento-editions: 'enterprise'
+            experimental: true
+          - php-versions: '8.5'
+            magento-versions: '2.4.9-beta1'
+            magento-editions: 'enterprise'
             experimental: true
 
     continue-on-error: ${{ matrix.experimental }}

.github/workflows/20-integration.yml

@@ -130,54 +130,90 @@ jobs:
                     magento-editions: 'community'
                     db: 'mysql80'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.3'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql80'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.3'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql84'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.3'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql84'
                     engine: 'opensearch3'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.4'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'community'
                     db: 'mysql80'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.4'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql80'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.4'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql80'
                     engine: 'opensearch3'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.4'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql84'
                     engine: 'opensearch2'
-                    experimental: true
+                    experimental: false
                   - php-versions: '8.4'
                     magento-versions: '2.4.8-p3'
                     magento-editions: 'enterprise'
                     db: 'mysql84'
                     engine: 'opensearch3'
+                    experimental: false
+                  - php-versions: '8.4'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'community'
+                    db: 'mysql80'
+                    engine: 'opensearch3'
+                    experimental: true
+                  - php-versions: '8.5'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'community'
+                    db: 'mysql80'
+                    engine: 'opensearch3'
+                    experimental: true
+                  - php-versions: '8.4'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'enterprise'
+                    db: 'mysql80'
+                    engine: 'opensearch3'
+                    experimental: true
+                  - php-versions: '8.5'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'enterprise'
+                    db: 'mysql80'
+                    engine: 'opensearch3'
+                    experimental: true
+                  - php-versions: '8.4'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'enterprise'
+                    db: 'mysql84'
+                    engine: 'opensearch3'
+                    experimental: true
+                  - php-versions: '8.5'
+                    magento-versions: '2.4.9-beta1'
+                    magento-editions: 'enterprise'
+                    db: 'mysql84'
+                    engine: 'opensearch3'
                     experimental: true
 
         continue-on-error: ${{ matrix.experimental }}

src/module-elasticsuite-catalog/Api/Layer/Filter/TypeProviderInterface.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Smile ElasticSuite to newer versions in the future.
+ *
+ * @category  Smile
+ * @package   Smile\ElasticsuiteCatalog
+ * @author    Vadym Honcharuk <[email protected]>
+ * @copyright 2026 Smile
+ * @license   Open Software License ("OSL") v. 3.0
+ */
+
+namespace Smile\ElasticsuiteCatalog\Api\Layer\Filter;
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+/**
+ * Filter type provider interface.
+ *
+ * @category Smile
+ * @package  Smile\ElasticsuiteCatalog
+ * @author   Vadym Honcharuk <[email protected]>
+ */
+interface TypeProviderInterface
+{
+    /**
+     * Return filter class name.
+     *
+     * @param Attribute $attribute               The attribute model.
+     * @param string    $originalFilterClassName The original/default filter class name.
+     *
+     * @return string
+     */
+    public function getFilterClassName(Attribute $attribute, string $originalFilterClassName): string;
+}

src/module-elasticsuite-catalog/Block/Navigation/Renderer/Slider.php

@@ -163,7 +163,7 @@ protected function getFieldFormat()
 
         $attribute = $this->getFilter()->getAttributeModel();
 
-        $format['pattern']           = (string) $attribute->getDisplayPattern();
+        $format['pattern']           = str_replace('%%', '%', (string) $attribute->getDisplayPattern());
         $format['precision']         = (int) $attribute->getDisplayPrecision();
         $format['requiredPrecision'] = (int) $attribute->getDisplayPrecision();
         $format['integerRequired']   = (int) $attribute->getDisplayPrecision() > 0;

src/module-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php

@@ -517,7 +517,7 @@ private function addDisplayFields(Fieldset $fieldset)
             [
                 'name'  => 'display_pattern',
                 'label' => __('Display pattern'),
-                'note'  => __('A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €'),
+                'note'  => __('A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 € or %s%% => 20%'),
             ]
         );
 

src/module-elasticsuite-catalog/Model/Layer/Filter/Decimal.php

@@ -13,6 +13,7 @@
  */
 namespace Smile\ElasticsuiteCatalog\Model\Layer\Filter;
 
+use Magento\Framework\Exception\LocalizedException;
 use Smile\ElasticsuiteCatalog\Model\Search\Request\Field\Mapper as RequestFieldMapper;
 
 /**
@@ -110,23 +111,35 @@ protected function _renderRangeLabel($fromValue, $toValue)
     /**
      * Retrieve ES filter field.
      *
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     *
      * @return string
+     * @throws LocalizedException
      */
-    private function getFilterField()
+    protected function getFilterField()
     {
         return $this->requestFieldMapper->getMappedFieldName(
             $this->getAttributeModel()->getAttributeCode()
         );
     }
 
+    /**
+     * Create the proper query filter for price, according to current customer group Id.
+     *
+     * @param array $bounds The price bounds to apply
+     *
+     * @return array
+     */
+    protected function getRangeCondition($bounds)
+    {
+        return $bounds;
+    }
+
     /**
      * Format value according to attribute display options
      *
      * @param mixed $value The value to format
      *
      * @return string
+     * @throws LocalizedException
      */
     private function formatValue($value)
     {
@@ -145,18 +158,4 @@ private function formatValue($value)
 
         return $value;
     }
-
-    /**
-     * Create the proper query filter for price, according to current customer group Id.
-     *
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     *
-     * @param array $bounds The price bounds to apply
-     *
-     * @return array
-     */
-    private function getRangeCondition($bounds)
-    {
-        return $bounds;
-    }
 }

src/module-elasticsuite-catalog/Model/Layer/FilterList.php

@@ -14,6 +14,11 @@
 
 namespace Smile\ElasticsuiteCatalog\Model\Layer;
 
+use Magento\Catalog\Model\Config\LayerCategoryConfig;
+use Magento\Catalog\Model\Layer\FilterableAttributeListInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Smile\ElasticsuiteCatalog\Api\Layer\Filter\TypeProviderInterface;
+
 /**
  * FilterList customization to support decimal filters.
  *
@@ -28,6 +33,37 @@ class FilterList extends \Magento\Catalog\Model\Layer\FilterList
      */
     const BOOLEAN_FILTER = 'boolean';
 
+    /**
+     * @var TypeProviderInterface[]
+     */
+    private $filterTypeProviders;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface           $objectManager        Object manager.
+     * @param FilterableAttributeListInterface $filterableAttributes Filterable attributes list.
+     * @param LayerCategoryConfig              $layerCategoryConfig  Category layer config.
+     * @param array                            $filters              Core filters array.
+     * @param array                            $filterTypeProviders  Injected custom type providers.
+     */
+    public function __construct(
+        ObjectManagerInterface           $objectManager,
+        FilterableAttributeListInterface $filterableAttributes,
+        LayerCategoryConfig              $layerCategoryConfig,
+        array                            $filters = [],
+        array                            $filterTypeProviders = []
+    ) {
+        parent::__construct(
+            $objectManager,
+            $filterableAttributes,
+            $layerCategoryConfig,
+            $filters
+        );
+
+        $this->filterTypeProviders = $filterTypeProviders;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -45,6 +81,13 @@ protected function getAttributeFilterClass(\Magento\Catalog\Model\ResourceModel\
             $filterClassName = $this->filterTypes[self::BOOLEAN_FILTER];
         }
 
+        // Allow injected providers to override the filter class.
+        foreach ($this->filterTypeProviders as $provider) {
+            if ($provider instanceof TypeProviderInterface) {
+                $filterClassName = $provider->getFilterClassName($attribute, $filterClassName);
+            }
+        }
+
         return $filterClassName;
     }
 }

src/module-elasticsuite-catalog/i18n/de_DE.csv

@@ -23,7 +23,7 @@
 "Sort products without value when sorting DESC","Produkte ohne Wert beim Sortieren von DESC sortieren"
 "Slider Display Configuration","Slider Anzeigeeinstellungen"
 "Display pattern","Anzeigemuster"
-"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €","Ein Muster wie %s UNIT bei dem %s der Wert ist. z.B.: $%s => $20 oder %s € => 20 €"
+"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 € or %s%% => 20%","Ein Muster wie %s UNIT bei dem %s der Wert ist. z.B.: $%s => $20 oder %s € => 20 € oder %s%% => 20%"
 "Display Precision","Darstellungsgenauigkeit"
 "The number of digits to use for precision when displaying.","Die Anzahl der Ziffern zur Verfeinerung der Ergebnisse."
 "No exact results found for: <b>'%1'</b>. The displayed items are the closest matches.","Wir konnten für: <b>'%1'</b> keine exakten Ergebnisse finden. Die gezeigten Elemente entsprechen den besten Übereinstimmungen."

src/module-elasticsuite-catalog/i18n/en_US.csv

@@ -23,7 +23,7 @@ Last,Last
 "Sort products without value when sorting DESC","Sort products without value when sorting DESC"
 "Slider Display Configuration","Slider Display Configuration"
 "Display pattern","Display pattern"
-"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €","A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €"
+"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 € or %s%% => 20%","A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 € or %s%% => 20%"
 "Display Precision","Display Precision"
 "The number of digits to use for precision when displaying.","The number of digits to use for precision when displaying."
 "No exact results found for: <b>'%1'</b>. The displayed items are the closest matches.","No exact results found for: <b>'%1'</b>. The displayed items are the closest matches."

src/module-elasticsuite-catalog/i18n/fr_FR.csv

@@ -23,7 +23,7 @@ Save,Sauvegarder
 "Sort products without value when sorting DESC","Trier les produits sans valeurs lors d'un tri DESC"
 "Slider Display Configuration","Slider Display Configuration"
 "Display pattern","Display pattern"
-"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €","A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 €"
+"A pattern like %s UNIT where %s is the value. Eg : $%s => $20 or %s € => 20 € or %s%% => 20%","Un motif comme %s UNIT où %s est la valeur. Exemple: $%s => $20 ou %s € => 20 € ou %s%% => 20%"
 "Display Precision","Display Precision"
 "The number of digits to use for precision when displaying.","The number of digits to use for precision when displaying."
 "No exact results found for: <b>'%1'</b>. The displayed items are the closest matches.","Aucun résultat exact pour la recherche: <b>'%1'</b>. Nous vous proposons des résultats approchants."