Minor tweaks and fixing tests

Author: Hlavtox

classes/Hook/HookActionOrderStatusPostUpdate.php

@@ -75,7 +75,7 @@ public function run()
         if ($gaRefundSent === false) {
             // We refund it and set the "sent" flag to true
             $js = $this->getGoogleAnalytics4($this->params['id_order']);
-            $this->context->cookie->__set('ga_admin_refund', $js);
+            $this->context->cookie->ga_admin_refund = $js;
             $this->context->cookie->write();
 
             // We save this information to database

classes/Hook/HookActionProductCancel.php

@@ -71,7 +71,7 @@ public function run()
             $orderDetail->product_name
         );
 
-        $this->context->cookie->__set('ga_admin_refund', $js);
+        $this->context->cookie->ga_admin_refund = $js;
         $this->context->cookie->write();
     }
 

classes/Hook/HookActionValidateOrder.php

@@ -62,16 +62,16 @@ public function run()
         $order = $this->params['order'];
 
         // We are checking this, because in case of multishipping, there could be multiple orders
-        if (!empty($this->context->cookie->__get('ga_admin_order'))) {
+        if (!empty($this->context->cookie->ga_admin_order)) {
             $ga_admin_order = sprintf(
                 '%1$s,%2$s',
-                $this->context->cookie->__get('ga_admin_order'),
+                $this->context->cookie->ga_admin_order,
                 $order->id
             );
         } else {
             $ga_admin_order = $order->id;
         }
-        $this->context->cookie->__set('ga_admin_order', $ga_admin_order);
+        $this->context->cookie->ga_admin_order = $ga_admin_order;
         $this->context->cookie->write();
     }
 

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -103,7 +103,7 @@ protected function processFailedOrders()
      */
     protected function processManualOrders()
     {
-        $adminOrders = $this->context->cookie->__get('ga_admin_order');
+        $adminOrders = $this->context->cookie->ga_admin_order;
         if (empty($adminOrders)) {
             return;
         }
@@ -115,8 +115,8 @@ protected function processManualOrders()
         }
 
         // Clean up the cookie
-        $this->context->cookie->__unset('ga_admin_order');
-        $this->context->cookie->write();;
+        unset($this->context->cookie->ga_admin_order);
+        $this->context->cookie->write();
     }
 
     /**

classes/Hook/HookDisplayHeader.php

@@ -118,14 +118,6 @@ private function displayGaTag()
      */
     public function setBackOffice($backOffice)
     {
-        $this->acknowledgeBackOfficeContext($backOffice);
-    }
-
-    /**
-     * @param bool $isBackOffice
-     */
-    public function acknowledgeBackOfficeContext($isBackOffice)
-    {
-        $this->backOffice = $isBackOffice;
+        $this->backOffice = $backOffice;
     }
 }

ps_googleanalytics.php

@@ -129,8 +129,8 @@ public function hookDisplayAdminOrder()
     {
         $gaTagHandler = new PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler($this, $this->context);
 
-        $output = $gaTagHandler->generate($this->context->cookie->__get('ga_admin_refund'));
-        $this->context->cookie->__unset('ga_admin_refund');
+        $output = $gaTagHandler->generate($this->context->cookie->ga_admin_refund);
+        unset($this->context->cookie->ga_admin_refund);
         $this->context->cookie->write();
 
         return $output;

tests/phpstan/phpstan-1.7.6.neon

@@ -7,3 +7,5 @@ parameters:
 		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'
 		- '#Property TabCore\:\:\$name \(string\) does not accept array.#'
 		- '#Parameter \#1 \$id of class Currency constructor expects null, int given.#'
+		- '#Access to an undefined property Cookie\:\:\$ga_admin_order.#'
+		- '#Access to an undefined property Cookie\:\:\$ga_admin_refund.#'

tests/phpstan/phpstan-1.7.7.neon

@@ -5,3 +5,5 @@ parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
 		- '#Property TabCore\:\:\$name \(string\) does not accept array.#'
+		- '#Access to an undefined property Cookie\:\:\$ga_admin_order.#'
+		- '#Access to an undefined property Cookie\:\:\$ga_admin_refund.#'

tests/phpstan/phpstan-1.7.8.neon

@@ -4,3 +4,5 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#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.#'

tests/phpstan/phpstan-latest.neon

@@ -4,3 +4,5 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#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.#'