Merge pull request PrestaShop#110 from PrestaShop/dev

Release 2.8.2

Author: Hlavtox

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_emailsubscription</name>
     <displayName><![CDATA[E-mail subscription form]]></displayName>
-    <version><![CDATA[2.8.1]]></version>
+    <version><![CDATA[2.8.2]]></version>
     <description><![CDATA[Adds a block for newsletter subscription.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <confirmUninstall><![CDATA[Are you sure that you want to delete all of your contacts?]]></confirmUninstall>

controllers/front/subscription.php

@@ -54,7 +54,12 @@ public function postProcess()
 
             if ($this->ajax) {
                 header('Content-Type: application/json');
-                $this->ajaxDie(json_encode($this->variables));
+                if (version_compare(_PS_VERSION_, '1.7.5', '>=')) {
+                    $this->ajaxRender(json_encode($this->variables));
+                    exit;
+                } else {
+                    $this->ajaxDie(json_encode($this->variables));
+                }
             }
         }
     }

ps_emailsubscription.php

@@ -100,7 +100,7 @@ public function __construct()
         $this->confirmUninstall = $this->trans('Are you sure that you want to delete all of your contacts?', [], 'Modules.Emailsubscription.Admin');
         $this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
 
-        $this->version = '2.8.1';
+        $this->version = '2.8.2';
         $this->author = 'PrestaShop';
         $this->error = false;
         $this->valid = false;

tests/phpstan/phpstan-1.7.1.2.neon

@@ -11,3 +11,4 @@ parameters:
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array<string, string> given.#'
+    - '#Call to an undefined method Ps_EmailsubscriptionSubscriptionModuleFrontController::ajaxRender\(\).#'

tests/phpstan/phpstan-1.7.2.5.neon

@@ -10,4 +10,5 @@ parameters:
     - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array given.#'
-    - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array<string, string> given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array<string, string> given.#'
+    - '#Call to an undefined method Ps_EmailsubscriptionSubscriptionModuleFrontController::ajaxRender\(\).#'

tests/phpstan/phpstan-1.7.3.4.neon

@@ -11,3 +11,4 @@ parameters:
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Call to an undefined method Ps_EmailsubscriptionSubscriptionModuleFrontController::ajaxRender\(\).#'

tests/phpstan/phpstan-1.7.4.4.neon

@@ -9,4 +9,5 @@ parameters:
     - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array given.#'
-    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Call to an undefined method Ps_EmailsubscriptionSubscriptionModuleFrontController::ajaxRender\(\).#'

tests/phpstan/phpstan-1.7.5.1.neon

@@ -9,4 +9,5 @@ parameters:
     - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array given.#'
-    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string|false given.#'

tests/phpstan/phpstan-1.7.6.neon

@@ -10,3 +10,4 @@ parameters:
     - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array given.#'
     - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
+    - '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string|false given.#'

tests/phpstan/phpstan-1.7.7.neon

@@ -4,4 +4,5 @@ includes:
 parameters:
   ignoreErrors:
     - '#Access to an undefined property Cookie::\$shop.#'
-    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string|false given.#'