Fix tests

Author: Hlavtox

classes/Hook/HookDisplayBeforeBodyClosingTag.php

@@ -162,7 +162,7 @@ private function renderProductListing()
         // Prepare items to our format
         $productWrapper = new ProductWrapper($this->context);
         $items = $productWrapper->prepareItemListFromProductList($listing['products']);
-        
+
         // Prepare info about the list
         $item_list_id = $this->context->controller->php_self;
         $item_list_name = $listing['label'];
@@ -245,7 +245,7 @@ private function renderBeginCheckout()
         // If using default OrderController that comes with prestashop, we will check if we are
         // on step 1 of the checkout. Otherwise, we will flush the output anyway. It's probably OPC
         // handling everything with javascript, so our code will load only once.
-        if (get_class($this->context->controller) == "OrderController") {
+        if (get_class($this->context->controller) == 'OrderController') {
             // If we are not in the first step of checkout, we don't do anything
             // TODO test how it behaves with logged in customer
             if (!$this->context->controller->getCheckoutProcess()->getSteps()[0]->isCurrent()) {

classes/Hook/HookDisplayFooterProduct.php

@@ -39,7 +39,7 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
     /**
      * run
      *
-     * @return string
+     * @return string|null
      */
     public function run()
     {
@@ -105,7 +105,8 @@ public function run()
      *
      * @return bool
      */
-    private function wasPreviousPageOurShop() {
+    private function wasPreviousPageOurShop()
+    {
         if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) !== false) {
             return true;
         }
@@ -135,6 +136,7 @@ private function getLastVisitedListing()
         // Check if the last listing is the page the user came from
         if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $last_listing['item_list_url']) !== false) {
             unset($last_listing['item_list_url']);
+
             return $last_listing;
         }
 

classes/Hook/HookDisplayHeader.php

@@ -20,13 +20,9 @@
 
 namespace PrestaShop\Module\Ps_Googleanalytics\Hooks;
 
-use Category;
 use Configuration;
 use Context;
 use Customer;
-use PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler;
-use PrestaShop\Module\Ps_Googleanalytics\Handler\ModuleHandler;
-use PrestaShop\Module\Ps_Googleanalytics\Wrapper\ProductWrapper;
 use Ps_Googleanalytics;
 use Tools;
 

classes/Hook/HookDisplayOrderConfirmation.php

@@ -69,7 +69,7 @@ public function run()
 
         // If the customer is revisiting confirmation screen and the order was already sent, we don't do anything
         if ($ganalyticsRepository->hasOrderBeenAlreadySent((int) $order->id)) {
-            // return $gaScripts;
+            return $gaScripts;
         }
 
         // Prepare transaction data

classes/Wrapper/ProductWrapper.php

@@ -22,11 +22,11 @@
 
 use Configuration;
 use Context;
-use Product;
-use Tools;
-use Shop;
 use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductLazyArray;
 use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductListingLazyArray;
+use Product;
+use Shop;
+use Tools;
 
 class ProductWrapper
 {
@@ -83,9 +83,9 @@ public function wrapProduct($product, $extras = [], $index = 0)
 
     /**
      * Takes provided list of product (lazy) arrays and converts it to a format that GA4 requires.
-     * 
+     *
      * @param array $productList
-     * 
+     *
      * @return array Item data standardized for GA
      */
     public function prepareItemListFromProductList($productList, $isCartList = false)
@@ -103,7 +103,7 @@ public function prepareItemListFromProductList($productList, $isCartList = false
             $product = $this->prepareItemFromProduct($product, $isCartList);
             $product['index'] = $counter;
             $items[] = $product;
-            $counter++;
+            ++$counter;
         }
 
         return $items;
@@ -115,9 +115,9 @@ public function prepareItemListFromProductList($productList, $isCartList = false
      * - ProductListingLazyArray from presented listings
      * - ProductListingLazyArray from presented cart
      * - Raw $cart->getProducts()
-     * 
+     *
      * @param ProductLazyArray|ProductListingLazyArray|array $product
-     * 
+     *
      * @return array Item data standardized for GA
      */
     public function prepareItemFromProduct($product, $isCartList = false)
@@ -139,7 +139,7 @@ public function prepareItemFromProduct($product, $isCartList = false)
             'affiliation' => Shop::isFeatureActive() ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
             'index' => 0,
             'price' => $product['price_amount'],
-            'quantity' => 1
+            'quantity' => 1,
         ];
 
         // Add manufacturer info if we have it
@@ -183,7 +183,7 @@ public function prepareItemFromProduct($product, $isCartList = false)
         $counter = 1;
         foreach ($productCategories as $productCategory) {
             $item[$counter == 1 ? 'item_category' : 'item_category' . $counter] = $productCategory['name'];
-            $counter++;
+            ++$counter;
         }
 
         return $item;