Merge pull request #994 from PrestaShop/dev

Release 3.15.1
PrestaShop · Mar 1, 2024 · 5e06b7e · 5e06b7e
2 parents 6c04ae4 + fb83f48
commit 5e06b7e
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 62 deletions.
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_facetedsearch</name>
     <displayName><![CDATA[Faceted search]]></displayName>
-    <version><![CDATA[3.15.0]]></version>
+    <version><![CDATA[3.15.1]]></version>
     <description><![CDATA[Displays a block allowing multiple filters.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,16 +39,16 @@
     "chai": "^4.3.10",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.10.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prestashop": "^0.2.1",
     "eslint-plugin-import": "^2.29.1",
     "mini-css-extract-plugin": "^1.0.0",
     "mocha": "^10.2.0",
     "node-sass": "^9.0.0",
-    "sass-loader": "^14.1.0",
+    "sass-loader": "^14.1.1",
     "style-loader": "^2.0.0",
-    "webpack": "^5.90.1",
+    "webpack": "^5.90.3",
     "webpack-cli": "^4.10.0"
   },
   "dependencies": {

diff --git a/ps_facetedsearch.php b/ps_facetedsearch.php
@@ -96,7 +96,7 @@ public function __construct()
     {
         $this->name = 'ps_facetedsearch';
         $this->tab = 'front_office_features';
-        $this->version = '3.15.0';
+        $this->version = '3.15.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;

diff --git a/src/Form/Attribute/FormModifier.php b/src/Form/Attribute/FormModifier.php
@@ -30,17 +30,21 @@
 
 use PrestaShop\Module\FacetedSearch\Constraint\UrlSegment;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Translation\DataCollectorTranslator;
 use PrestaShopBundle\Translation\TranslatorComponent;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class FormModifier
 {
     /**
-     * @var TranslatorComponent
+     * @var DataCollectorTranslator|TranslatorComponent
      */
     private $translator;
 
-    public function __construct(TranslatorComponent $translator)
+    /**
+     * @param DataCollectorTranslator|TranslatorComponent $translator
+     */
+    public function __construct($translator)
     {
         $this->translator = $translator;
     }

diff --git a/src/Form/AttributeGroup/FormModifier.php b/src/Form/AttributeGroup/FormModifier.php
@@ -32,17 +32,21 @@
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Translation\DataCollectorTranslator;
 use PrestaShopBundle\Translation\TranslatorComponent;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class FormModifier
 {
     /**
-     * @var TranslatorComponent
+     * @var DataCollectorTranslator|TranslatorComponent
      */
     private $translator;
 
-    public function __construct(TranslatorComponent $translator)
+    /**
+     * @param DataCollectorTranslator|TranslatorComponent $translator
+     */
+    public function __construct($translator)
     {
         $this->translator = $translator;
     }

diff --git a/src/Form/Feature/FormModifier.php b/src/Form/Feature/FormModifier.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\FacetedSearch\Constraint\UrlSegment;
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Translation\DataCollectorTranslator;
 use PrestaShopBundle\Translation\TranslatorComponent;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -46,9 +47,7 @@ public function modify(
         FormBuilderInterface $formBuilder,
         array $data
     ) {
-        /**
-         * @var TranslatorComponent
-         */
+        /** @var DataCollectorTranslator|TranslatorComponent $translator */
         $translator = $this->context->getTranslator();
         $invalidCharsHint = $translator->trans(
             'Invalid characters: <>;=#{}_',

diff --git a/src/Form/FeatureValue/FormModifier.php b/src/Form/FeatureValue/FormModifier.php
@@ -23,6 +23,7 @@
 use Context;
 use PrestaShop\Module\FacetedSearch\Constraint\UrlSegment;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Translation\DataCollectorTranslator;
 use PrestaShopBundle\Translation\TranslatorComponent;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -45,9 +46,7 @@ public function modify(
         FormBuilderInterface $formBuilder,
         array $data
     ) {
-        /**
-         * @var TranslatorComponent
-         */
+        /** @var DataCollectorTranslator|TranslatorComponent $translator */
         $translator = $this->context->getTranslator();
         $invalidCharsHint = $translator->trans(
             'Invalid characters: <>;=#{}_',