Merge pull request #947 from PrestaShop/dev

Release version 3.14.1
PrestaShop · Nov 20, 2023 · 3c2b733 · 3c2b733
2 parents 18657b3 + fb449c4
commit 3c2b733
Show file tree

Hide file tree

Showing 9 changed files with 667 additions and 629 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.14.0]]></version>
+    <version><![CDATA[3.14.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
@@ -29,17 +29,17 @@
   },
   "homepage": "https://github.com/PrestaShop/ps_facetedsearch#readme",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.15",
+    "@babel/eslint-parser": "^7.23.3",
     "@babel/cli": "^7.23.0",
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.3",
     "@babel/node": "^7.22.19",
-    "@babel/preset-env": "^7.23.2",
+    "@babel/preset-env": "^7.23.3",
     "@babel/register": "^7.22.15",
     "babel-loader": "^9.1.3",
     "chai": "^4.3.10",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.8.1",
-    "eslint": "^8.52.0",
+    "eslint": "^8.54.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prestashop": "^0.2.1",
     "eslint-plugin-import": "^2.29.0",

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.14.0';
+        $this->version = '3.14.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;
@@ -964,6 +964,13 @@ private function getExistingFiltersOverview()
                 $tmp[] = (isset($supportedControllers[$c]) ? $supportedControllers[$c]['name'] : $c);
             }
             $filters_templates[$k]['controllers'] = implode(', ', $tmp);
+
+            // Format date for different core versions. Since 8.0, it has only two arguments.
+            if (version_compare(_PS_VERSION_, '8.0.0', '>=')) {
+                $filters_templates[$k]['date_add'] = Tools::displayDate($v['date_add'], true);
+            } else {
+                $filters_templates[$k]['date_add'] = Tools::displayDate($v['date_add'], null, true);
+            }
         }
 
         return $filters_templates;

diff --git a/tests/php/phpstan/phpstan-1.7.6.neon b/tests/php/phpstan/phpstan-1.7.6.neon
@@ -14,3 +14,4 @@ parameters:
     - '~^Parameter #1 \$string of method PrestaShop\\Module\\FacetedSearch\\URLSerializer::unserialize\(\) expects string, array given\.$~'
     - '~^Call to an undefined static method Search::findClosestWeightestWord\(\)\.$~'
     - '~^Parameter #1 \$master of static method DbCore::getInstance\(\) expects bool, int given\.$~'
+    - '~^Parameter #2 \$id_lang of static method ToolsCore::displayDate\(\) expects int|null, true given\.$~'
diff --git a/tests/php/phpstan/phpstan-1.7.7.neon b/tests/php/phpstan/phpstan-1.7.7.neon
@@ -10,3 +10,4 @@ parameters:
     - '~^Access to an undefined property Cookie::\$id_lang\.$~'
     - '~^Parameter #1 \$string of method PrestaShop\\Module\\FacetedSearch\\URLSerializer::unserialize\(\) expects string, array given\.$~'
     - '~^Parameter #1 \$master of static method DbCore::getInstance\(\) expects bool, int given\.$~'
+    - '~^Parameter #2 \$id_lang of static method ToolsCore::displayDate\(\) expects int|null, true given\.$~'
diff --git a/tests/php/phpstan/phpstan-1.7.8.neon b/tests/php/phpstan/phpstan-1.7.8.neon
@@ -9,3 +9,4 @@ parameters:
     - '~^Parameter #\d+ \$\w+ of static method ProductCore::priceCalculation\(\) expects \w+, \w+ given\.$~'
     - '~^Access to an undefined property Cookie::\$id_lang\.$~'
     - '~^Parameter #1 \$master of static method DbCore::getInstance\(\) expects bool, int given\.$~'
+    - '~^Parameter #2 \$id_lang of static method ToolsCore::displayDate\(\) expects int|null, true given\.$~'
diff --git a/tests/php/phpstan/phpstan-latest.neon b/tests/php/phpstan/phpstan-latest.neon
@@ -7,3 +7,5 @@ parameters:
     - '~^Parameter #2 \$active of static method CurrencyCore::getCurrencies\(\) expects bool, int given\.$~'
     - '~^Parameter #3 \$groupBy of static method CurrencyCore::getCurrencies\(\) expects bool, Shop given\.$~'
     - '~^Parameter #\d+ \$\w+ of static method ProductCore::priceCalculation\(\) expects \w+, \w+ given\.$~'
+    - '~^Parameter #2 \$full of static method ToolsCore::displayDate\(\) expects bool, null given\.$~'
+    - '~^Static method ToolsCore::displayDate\(\) invoked with 3 parameters, 1-2 required\.$~'
diff --git a/views/templates/admin/manage.tpl b/views/templates/admin/manage.tpl
@@ -66,11 +66,11 @@
 		<tbody>
 		  {foreach $filters_templates as $template}
 			<tr>
-			  <td class="center">{(int)$template['id_layered_filter']}</td>
+			  <td class="center">{$template['id_layered_filter']}</td>
 			  <td class="text-left">{$template['name']}</td>
 			  <td>{$template['controllers']}</td>
-			  <td class="center">{(int)$template['n_categories']}</td>
-			  <td>{Tools::displayDate($template['date_add'],null , true)}</td>
+			  <td class="center">{$template['n_categories']}</td>
+			  <td>{$template['date_add']}</td>
 			  <td>
 				{if empty($limit_warning)}
 				  <div class="btn-group-action">