Merge pull request #158 from Hlavtox/remove-ajaxdie

Remove usage of deprecated method ajaxDie
PrestaShop · Feb 25, 2024 · 24ed023 · 24ed023
2 parents d5ab0a8 + 08a4132
commit 24ed023
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/controllers/admin/AdminGanalyticsAjax.php b/controllers/admin/AdminGanalyticsAjax.php
@@ -31,9 +31,11 @@ public function init()
 
         if (Validate::isLoadedObject($order) && (isset($this->context->employee->id) && $this->context->employee->id)) {
             (new GanalyticsRepository())->markOrderAsSent((int) $orderId);
-            $this->ajaxDie('OK');
+            $this->ajaxRender('OK');
+            exit;
         }
 
-        $this->ajaxDie('KO');
+        $this->ajaxRender('KO');
+        exit;
     }
 }
diff --git a/controllers/front/ajax.php b/controllers/front/ajax.php
@@ -35,11 +35,13 @@ public function initContent()
         $order = new Order($orderId);
 
         if (!Validate::isLoadedObject($order) || $order->id_customer != (int) Tools::getValue('customer')) {
-            $this->ajaxDie('KO');
+            $this->ajaxRender('KO');
+            exit;
         }
 
         (new GanalyticsRepository())->markOrderAsSent((int) $orderId);
 
-        $this->ajaxDie('OK');
+        $this->ajaxRender('OK');
+        exit;
     }
 }
diff --git a/tests/phpstan/phpstan-1.7.7.neon b/tests/phpstan/phpstan-1.7.7.neon
@@ -6,3 +6,4 @@ parameters:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
 		- '#Access to an undefined property Cookie\:\:\$ga_admin_order.#'
 		- '#Access to an undefined property Cookie\:\:\$ga_admin_refund.#'
+		- '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string given.#'