Merge pull request #57 from PrestaShop/dev

Release 2.3.1

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_mainmenu</name>
 	<displayName><![CDATA[Main menu]]></displayName>
-	<version><![CDATA[2.3.0]]></version>
+	<version><![CDATA[2.3.1]]></version>
 	<description><![CDATA[Adds a new menu to the top of your e-commerce website.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[front_office_features]]></tab>

ps_mainmenu.php

@@ -66,7 +66,7 @@ public function __construct()
     {
         $this->name = 'ps_mainmenu';
         $this->tab = 'front_office_features';
-        $this->version = '2.3.0';
+        $this->version = '2.3.1';
         $this->author = 'PrestaShop';
         $this->imageFiles = null;
 
@@ -96,7 +96,7 @@ public function install($delete_params = true)
             !$this->registerHook('actionObjectProductUpdateAfter') ||
             !$this->registerHook('actionObjectProductDeleteAfter') ||
             !$this->registerHook('actionObjectProductAddAfter') ||
-            !$this->registerHook('categoryUpdate') ||
+            !$this->registerHook('actionCategoryUpdate') ||
             !$this->registerHook('actionShopDataDuplication') ||
             !$this->registerHook('displayTop')) {
             return false;
@@ -986,7 +986,7 @@ public function hookActionObjectProductAddAfter($params)
         $this->clearMenuCache();
     }
 
-    public function hookCategoryUpdate($params)
+    public function hookActionCategoryUpdate($params)
     {
         $this->clearMenuCache();
     }

tests/phpstan/phpstan-latest.neon

@@ -8,3 +8,4 @@ parameters:
     - '#Parameter \#1 \$id of class Supplier constructor expects null, int given.#'
     - '#Parameter \#2 \$idLang of class Supplier constructor expects null, int given.#'
     - '#Parameter \#2 \$selection of static method CMSCore\:\:getLinks\(\) expects null, array<int, int> given.#'
+    - '~^Binary operation "\." between string and array<string> results in an error\.$~'

upgrade/upgrade-2.3.1.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA <[email protected]>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_2_3_1($module)
+{
+    $module->unregisterHook('categoryUpdate');
+    $module->registerHook('actionCategoryUpdate');
+
+    return true;
+}