nystudio107 / craft-instantanalytics-ga4

src/InstantAnalytics.php

Spacing +12 added lines, -12 removed lines

@@ -246,7 +246,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event): void {
+            function(Event $event): void {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('instantAnalytics', [
@@ -266,7 +266,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event): void {
+            function(PluginEvent $event): void {
                 if ($event->plugin === $this) {
                     $request = Craft::$app->getRequest();
                     if ($request->isCpRequest) {
@@ -280,7 +280,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Determine if Craft Commerce is installed & enabled
                 self::$commercePlugin = Craft::$app->getPlugins()->getPlugin(self::COMMERCE_PLUGIN_HANDLE);
                 // Determine if SEOmatic is installed & enabled
@@ -310,7 +310,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event): void {
+            function(RegisterUrlRulesEvent $event): void {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
@@ -326,7 +326,7 @@ 
         Event::on(
             View::class,
             View::EVENT_BEFORE_RENDER_PAGE_TEMPLATE,
-            static function (TemplateEvent $event): void {
+            static function(TemplateEvent $event): void {
                 self::$currentTemplate = $event->template;
             }
         );
@@ -334,7 +334,7 @@ 
         Event::on(
             View::class,
             View::EVENT_AFTER_RENDER_PAGE_TEMPLATE,
-            function (TemplateEvent $event): void {
+            function(TemplateEvent $event): void {
                 if (self::$settings->autoSendPageView) {
                     $request = Craft::$app->getRequest();
                     if (!$request->getIsAjax()) {
@@ -348,7 +348,7 @@ 
         Event::on(
             Response::class,
             Response::EVENT_BEFORE_SEND,
-            function (Event $event): void {
+            function(Event $event): void {
                 // Initialize this sooner rather than later, since it's possible this will want to tinker with cookies
                 $this->ga4->getAnalytics();
             }
@@ -358,21 +358,21 @@ 
         Event::on(
             Response::class,
             Response::EVENT_AFTER_SEND,
-            function (Event $event): void {
+            function(Event $event): void {
                 $this->ga4->getAnalytics()->sendCollectedEvents();
             }
         );
 
         // Commerce-specific hooks
         if (self::$commercePlugin !== null) {
-            Event::on(Order::class, Order::EVENT_AFTER_COMPLETE_ORDER, function (Event $e): void {
+            Event::on(Order::class, Order::EVENT_AFTER_COMPLETE_ORDER, function(Event $e): void {
                 $order = $e->sender;
                 if (self::$settings->autoSendPurchaseComplete) {
                     $this->commerce->triggerOrderCompleteEvent($order);
                 }
             });
 
-            Event::on(Order::class, Order::EVENT_AFTER_ADD_LINE_ITEM, function (LineItemEvent $e): void {
+            Event::on(Order::class, Order::EVENT_AFTER_ADD_LINE_ITEM, function(LineItemEvent $e): void {
                 $lineItem = $e->lineItem;
                 if (self::$settings->autoSendAddToCart) {
                     $this->commerce->triggerAddToCartEvent($lineItem);
@@ -380,8 +380,8 @@ 
             });
 
             // Check to make sure Order::EVENT_AFTER_REMOVE_LINE_ITEM is defined
-            if (defined(Order::class . '::EVENT_AFTER_REMOVE_LINE_ITEM')) {
-                Event::on(Order::class, Order::EVENT_AFTER_REMOVE_LINE_ITEM, function (LineItemEvent $e): void {
+            if (defined(Order::class.'::EVENT_AFTER_REMOVE_LINE_ITEM')) {
+                Event::on(Order::class, Order::EVENT_AFTER_REMOVE_LINE_ITEM, function(LineItemEvent $e): void {
                     $lineItem = $e->lineItem;
                     if (self::$settings->autoSendRemoveFromCart) {
                         $this->commerce->triggerRemoveFromCartEvent($lineItem);

src/services/Commerce.php

Spacing +2 added lines, -2 removed lines

@@ -239,7 +239,7 @@ 
      * @param Product|Variant $productVariant the Product or Variant
      * @throws \yii\base\InvalidConfigException
      */
-    public function addCommerceProductImpression(Variant|Product $productVariant): void
+    public function addCommerceProductImpression(Variant | Product $productVariant): void
     {
         if ($productVariant) {
             $event = InstantAnalytics::$plugin->ga4->getAnalytics()->create()->ViewItemEvent();
@@ -419,7 +419,7 @@ 
                 $name = $cat->title;
 
                 while ($cat = $cat->parent) {
-                    $name = $cat->title . '/' . $name;
+                    $name = $cat->title.'/'.$name;
                 }
 
                 $cats[] = $name;

src/helpers/Analytics.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
             $urlParts = parse_url($url);
             $url = $urlParts['path'] ?? '/';
             if (isset($urlParts['query'])) {
-                $url .= '?' . $urlParts['query'];
+                $url .= '?'.$urlParts['query'];
             }
         }
 
@@ -112,7 +112,7 @@ 
         $path = parse_url($url, PHP_URL_PATH);
         $pathFragments = explode('/', rtrim($path, '/'));
         $fileName = end($pathFragments);
-        $trackingUrl = UrlHelper::siteUrl('instantanalytics/pageViewTrack/' . $fileName, $urlParams);
+        $trackingUrl = UrlHelper::siteUrl('instantanalytics/pageViewTrack/'.$fileName, $urlParams);
 
         InstantAnalytics::$plugin->logAnalyticsEvent(
             'Created pageViewTrackingUrl for: {trackingUrl}',
@@ -143,7 +143,7 @@ 
         $urlParams = compact('url', 'eventName', 'params');
 
         $fileName = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_BASENAME);
-        $trackingUrl = UrlHelper::siteUrl('instantanalytics/eventTrack/' . $fileName, $urlParams);
+        $trackingUrl = UrlHelper::siteUrl('instantanalytics/eventTrack/'.$fileName, $urlParams);
 
         InstantAnalytics::$plugin->logAnalyticsEvent(
             'Created eventTrackingUrl for: {trackingUrl}',
@@ -167,7 +167,7 @@ 
         $result = true;
         $request = Craft::$app->getRequest();
 
-        $logExclusion = static function (string $setting)
+        $logExclusion = static function(string $setting)
         {
             if (InstantAnalytics::$settings->logExcludedAnalytics) {
                 $request = Craft::$app->getRequest();
@@ -267,7 +267,7 @@ 
     public static function getClientId(): string
     {
         $cid = '';
-        $cookieName = '_ga_' . StringHelper::removeLeft(InstantAnalytics::$settings->googleAnalyticsMeasurementId, 'G-');
+        $cookieName = '_ga_'.StringHelper::removeLeft(InstantAnalytics::$settings->googleAnalyticsMeasurementId, 'G-');
         if (isset($_COOKIE[$cookieName])) {
             $parts = explode(".", $_COOKIE[$cookieName], 5);
             if ($parts !== false) {
@@ -277,11 +277,11 @@ 
             $cid = $_COOKIE['_ia'];
         } else {
             // Generate our own client id, otherwise.
-            $cid = static::gaGenUUID() . '.1';
+            $cid = static::gaGenUUID().'.1';
         }
 
         if (InstantAnalytics::$settings->createGclidCookie && !empty($cid)) {
-            setcookie('_ia', $cid, strtotime('+' . InstantAnalytics::$settings->sessionDuration . ' minutes'), '/'); // Two years
+            setcookie('_ia', $cid, strtotime('+'.InstantAnalytics::$settings->sessionDuration.' minutes'), '/'); // Two years
         }
 
         return $cid;