Merge pull request #67 from PrestaShop/dev

Release 4.4.1
PrestaShop · Mar 9, 2023 · acacee4 · acacee4
2 parents 5169fb8 + a7b58b5
commit acacee4
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 3 deletions.
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>contactform</name>
     <displayName><![CDATA[Contact form]]></displayName>
-    <version><![CDATA[4.4.0]]></version>
+    <version><![CDATA[4.4.1]]></version>
     <description><![CDATA[Adds a contact form to the "Contact us" page.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

diff --git a/contactform.php b/contactform.php
@@ -54,7 +54,7 @@ public function __construct()
         $this->name = 'contactform';
         $this->author = 'PrestaShop';
         $this->tab = 'front_office_features';
-        $this->version = '4.4.0';
+        $this->version = '4.4.1';
         $this->bootstrap = true;
 
         parent::__construct();
@@ -76,7 +76,7 @@ public function __construct()
      */
     public function install()
     {
-        return parent::install() && $this->registerHook('registerGDPRConsent');
+        return parent::install() && $this->registerHook(['registerGDPRConsent', 'displayContactContent']);
     }
 
     /**

diff --git a/tests/phpstan/phpstan-1.7.2.5.neon b/tests/phpstan/phpstan-1.7.2.5.neon
@@ -7,3 +7,4 @@ parameters:
     - '#Access to an undefined property Cookie\:\:\$contactFormTokenTTL.#'
     - '#Call to method assign\(\) on an unknown class Smarty_Data.#'
     - '#Parameter \#4 \$templateVars of static method MailCore\:\:Send\(\) expects string, array<string, mixed> given.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore\:\:registerHook\(\) expects string, array<int, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.3.4.neon b/tests/phpstan/phpstan-1.7.3.4.neon
@@ -7,3 +7,4 @@ parameters:
     - '#Access to an undefined property Cookie\:\:\$contactFormTokenTTL.#'
     - '#Call to method assign\(\) on an unknown class Smarty_Data.#'
     - '#Parameter \#4 \$templateVars of static method MailCore\:\:send\(\) expects string, array<string, mixed> given.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore\:\:registerHook\(\) expects string, array<int, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.4.4.neon b/tests/phpstan/phpstan-1.7.4.4.neon
@@ -6,3 +6,4 @@ parameters:
     - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
     - '#Access to an undefined property Cookie\:\:\$contactFormTokenTTL.#'
     - '#Parameter \#4 \$templateVars of static method MailCore\:\:send\(\) expects string, array<string, mixed> given.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore\:\:registerHook\(\) expects string, array<int, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.5.1.neon b/tests/phpstan/phpstan-1.7.5.1.neon
@@ -6,3 +6,4 @@ parameters:
     - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
     - '#Access to an undefined property Cookie\:\:\$contactFormTokenTTL.#'
     - '#Parameter \#4 \$templateVars of static method MailCore\:\:send\(\) expects string, array<string, mixed> given.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore\:\:registerHook\(\) expects string, array<int, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.6.neon b/tests/phpstan/phpstan-1.7.6.neon
@@ -6,3 +6,4 @@ parameters:
     - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
     - '#Access to an undefined property Cookie\:\:\$contactFormTokenTTL.#'
     - '#Parameter \#4 \$templateVars of static method MailCore\:\:send\(\) expects string, array<string, mixed> given.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore\:\:registerHook\(\) expects string, array<int, string> given.#'
diff --git a/upgrade/Upgrade-4.4.1.php b/upgrade/Upgrade-4.4.1.php
@@ -0,0 +1,33 @@
+<?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.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <[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_4_4_1($object)
+{
+    return $object->registerHook('displayContactContent');
+}