Merge pull request PrestaShop#108 from Hlavtox/remove-ajaxdie

Hlavtox · web-flow · commit f5b3c74764f9 · 2024-02-29T11:15:33.000+01:00
Remove usage of ajaxDie
diff --git a/controllers/front/subscription.php b/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));
+                }
             }
         }
     }
diff --git a/tests/phpstan/phpstan-1.7.1.2.neon b/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\(\).#'
diff --git a/tests/phpstan/phpstan-1.7.2.5.neon b/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\(\).#'
diff --git a/tests/phpstan/phpstan-1.7.3.4.neon b/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\(\).#'
diff --git a/tests/phpstan/phpstan-1.7.4.4.neon b/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\(\).#'
diff --git a/tests/phpstan/phpstan-1.7.5.1.neon b/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.#'
diff --git a/tests/phpstan/phpstan-1.7.6.neon b/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.#'
diff --git a/tests/phpstan/phpstan-1.7.7.neon b/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.#'

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,12 @@ public function postProcess()`
`54`	`54`
`55`	`55`	`if ($this->ajax) {`
`56`	`56`	`header('Content-Type: application/json');`
`57`		`- $this->ajaxDie(json_encode($this->variables));`
	`57`	`+ if (version_compare(_PS_VERSION_, '1.7.5', '>=')) {`
	`58`	`+ $this->ajaxRender(json_encode($this->variables));`
	`59`	`+ exit;`
	`60`	`+ } else {`
	`61`	`+ $this->ajaxDie(json_encode($this->variables));`
	`62`	`+ }`
`58`	`63`	`}`
`59`	`64`	`}`
`60`	`65`	`}`