CS, simplify

Author: Hlavtox

classes/GoogleAnalyticsTools.php

@@ -280,7 +280,8 @@ public function jsonEncodeWithBlacklist($data, $ignoredKeys = [])
      *
      * @return string render gtag event for output
      */
-    public function renderEvent($eventName, $eventData, $ignoredKeys = []) {
+    public function renderEvent($eventName, $eventData, $ignoredKeys = [])
+    {
         return sprintf(
             'gtag("event", "%1$s", %2$s);',
             $eventName,

classes/Hook/HookDisplayFooterProduct.php

@@ -22,7 +22,6 @@
 
 use Configuration;
 use Context;
-use PrestaShop\Module\Ps_Googleanalytics\GoogleAnalyticsTools;
 use PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler;
 use PrestaShop\Module\Ps_Googleanalytics\Wrapper\ProductWrapper;
 use Product;
@@ -61,9 +60,9 @@ public function run()
         }
         // Add product view
         if ($isV4Enabled) {
-            $js = $this->getGoogleAnalytics4($this->module->getTools());
+            $js = $this->getGoogleAnalytics4();
         } else {
-            $js = $this->getUniversalAnalytics($this->module->getTools());
+            $js = $this->getUniversalAnalytics();
         }
 
         return $gaTagHandler->generate($js);
@@ -79,19 +78,19 @@ public function setParams($params)
         $this->params = $params;
     }
 
-    protected function getUniversalAnalytics(GoogleAnalyticsTools $gaTools)
+    protected function getUniversalAnalytics()
     {
         $gaProduct = $this->getProduct();
 
         $js = 'MBG.addProductDetailView(' . json_encode($gaProduct) . ');';
         if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) > 0) {
-            $js .= $gaTools->addProductClickByHttpReferal([$gaProduct], $this->context->currency->iso_code);
+            $js .= $this->module->getTools()->addProductClickByHttpReferal([$gaProduct], $this->context->currency->iso_code);
         }
 
         return $js;
     }
 
-    protected function getGoogleAnalytics4(GoogleAnalyticsTools $gaTools)
+    protected function getGoogleAnalytics4()
     {
         $gaProduct = $this->getProduct();
         $eventData = [
@@ -115,7 +114,7 @@ protected function getGoogleAnalytics4(GoogleAnalyticsTools $gaTools)
         );
 
         if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) > 0) {
-            $js .= $gaTools->addProductClickByHttpReferal([$gaProduct], $this->context->currency->iso_code);
+            $js .= $this->module->getTools()->addProductClickByHttpReferal([$gaProduct], $this->context->currency->iso_code);
         }
 
         return $js;

ps_googleanalytics.php

@@ -276,13 +276,14 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
     /**
      * Returns instance of GoogleAnalyticsTools
      */
-    public function getTools() {
+    public function getTools()
+    {
         if ($this->tools === null) {
             $this->tools = new PrestaShop\Module\Ps_Googleanalytics\GoogleAnalyticsTools(
                 (bool) Configuration::get('GA_V4_ENABLED')
             );
         }
-        
+
         return $this->tools;
     }
 }