Fix tests

Author: Hlavtox

classes/Database/Uninstall.php

@@ -22,6 +22,7 @@
 
 use Db;
 use Tab;
+use Validate;
 
 class Uninstall
 {

classes/GoogleAnalyticsTools.php

@@ -45,7 +45,7 @@ public function filter($gaScripts, $filterable)
      * Renders purchase event for order
      *
      * @param array $orderProducts
-     * @param array $transaction
+     * @param array $orderData
      * @param string $callbackUrl
      *
      * @return string|void

classes/Hook/HookActionValidateOrder.php

@@ -53,19 +53,20 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
      */
     public function run()
     {
-      // Check if we are creating backoffice order
-      if ($this->context->controller->controller_name != 'AdminOrders' && $this->context->controller->controller_name != 'Admin') {
-        return;
-      }
+        // Check if we are creating backoffice order
+        if ($this->context->controller->controller_name != 'AdminOrders' && $this->context->controller->controller_name != 'Admin') {
+            return;
+        }
 
-      // Mark this ID to immediately display it on next page load
-      if (!empty($this->context->cookie->__get('ga_admin_order'))) {
-        $ga_admin_order = $this->context->cookie->__get('ga_admin_order') . "," . ($this->params['order'])->id;
-      } else {
-        $ga_admin_order = ($this->params['order'])->id;
-      }
-      $this->context->cookie->__set('ga_admin_order', $ga_admin_order);
-      $this->context->cookie->write();
+        // Mark this ID to immediately display it on next page load
+        $order = $this->params['order'];
+        if (!empty($this->context->cookie->__get('ga_admin_order'))) {
+            $ga_admin_order = $this->context->cookie->__get('ga_admin_order') . ',' . $order->id;
+        } else {
+            $ga_admin_order = $order->id;
+        }
+        $this->context->cookie->__set('ga_admin_order', $ga_admin_order);
+        $this->context->cookie->write();
     }
 
     /**

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -23,7 +23,6 @@
 use Cart;
 use Configuration;
 use Context;
-use Currency;
 use Db;
 use Order;
 use PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler;
@@ -64,21 +63,13 @@ public function run()
 
         // Process manual orders instantly, we have their IDs in cookie
         $gaScripts .= $this->processManualOrders();
-        
+
         // Backload old orders that failed to load normally
         $gaScripts .= $this->backloadFailedOrders();
 
         return $gaScripts;
     }
 
-    /**
-     * @param array $params
-     */
-    public function setParams($params)
-    {
-        $this->params = $params;
-    }
-
     /**
      * Checks if there are any orders that failed to be sent normally through front office and processes them
      */
@@ -100,7 +91,7 @@ protected function backloadFailedOrders()
         $failedOrders = Db::getInstance()->ExecuteS(
             'SELECT DISTINCT o.id_order, g.sent FROM `' . _DB_PREFIX_ . 'orders` o
             LEFT JOIN `' . _DB_PREFIX_ . GanalyticsRepository::TABLE_NAME . '` g ON o.id_order = g.id_order
-            WHERE (g.sent IS NULL OR g.sent = 0) AND o.date_add BETWEEN NOW() - INTERVAL ' . $backloadDays .' DAY AND NOW() - INTERVAL 30 MINUTE'
+            WHERE (g.sent IS NULL OR g.sent = 0) AND o.date_add BETWEEN NOW() - INTERVAL ' . $backloadDays . ' DAY AND NOW() - INTERVAL 30 MINUTE'
         );
 
         // Process each failed order
@@ -123,7 +114,7 @@ protected function processManualOrders()
         }
 
         // Separate them by IDs and process one by one
-        $adminOrders = explode(",", $adminOrders);
+        $adminOrders = explode(',', $adminOrders);
         foreach ($adminOrders as $idOrder) {
             $gaScripts .= $this->processOrder((int) $idOrder);
         }
@@ -136,7 +127,7 @@ protected function processManualOrders()
     }
 
     /**
-     * Renders tracking code for given order 
+     * Renders tracking code for given order
      *
      * @param int $idOrder
      */
@@ -167,7 +158,7 @@ public function processOrder($idOrder)
 
         // Prepare transaction data
         $orderData = $orderWrapper->wrapOrder($order);
-        
+
         // Add payment event
         $gaScripts .= $this->module->getTools()->renderEvent(
             'add_payment_info',

classes/Hook/HookDisplayOrderConfirmation.php

@@ -25,10 +25,9 @@
 use Context;
 use PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler;
 use PrestaShop\Module\Ps_Googleanalytics\Repository\GanalyticsRepository;
-use PrestaShop\Module\Ps_Googleanalytics\Wrapper\ProductWrapper;
 use PrestaShop\Module\Ps_Googleanalytics\Wrapper\OrderWrapper;
+use PrestaShop\Module\Ps_Googleanalytics\Wrapper\ProductWrapper;
 use Ps_Googleanalytics;
-use Shop;
 use Validate;
 
 class HookDisplayOrderConfirmation implements HookInterface
@@ -75,7 +74,7 @@ public function run()
 
         // Prepare transaction data
         $orderData = $orderWrapper->wrapOrder($order);
-        
+
         // Add payment event
         $gaScripts .= $this->module->getTools()->renderEvent(
             'add_payment_info',

classes/Wrapper/OrderWrapper.php

@@ -23,10 +23,8 @@
 use Configuration;
 use Context;
 use Currency;
-use Order;
 use PrestaShop\Module\Ps_Googleanalytics\Hooks\WrapperInterface;
 use Shop;
-use Validate;
 
 class OrderWrapper implements WrapperInterface
 {

tests/phpstan/phpstan-1.7.6.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.#'
 		- '#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.#'

tests/phpstan/phpstan-1.7.7.neon

@@ -4,3 +4,4 @@ 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.#'
+		- '#Property TabCore\:\:\$name \(string\) does not accept array.#'

upgrade/upgrade-5.0.0.php

@@ -28,7 +28,7 @@ function upgrade_module_5_0_0($object)
 {
     $database = new PrestaShop\Module\Ps_Googleanalytics\Database\Install($object);
 
-    return 
+    return
         Configuration::deleteByName('GA_V4_ENABLED') &&
         $object->registerHook('actionValidateOrder') &&
         $database->installTab() &&