nystudio107 / craft-instantanalytics-ga4

src/helpers/Field.php

Spacing +2 added lines, -2 removed lines

@@ -190,8 +190,8 @@
                 // Prefix the keys with the global set name
                 $prefix = $global->handle;
                 $fields = array_combine(
-                    array_map(static function ($key) use ($prefix) {
-                        return $prefix . '.' . $key;
+                    array_map(static function($key) use ($prefix) {
+                        return $prefix.'.'.$key;
                     }, array_keys($fields)),
                     $fields
                 );

src/ga4/ComponentFactory.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         ];
 
         if (!array_key_exists($componentName, $componentMap)) {
-            throw new \InvalidArgumentException(Craft::t('instant-analytics-ga4', 'Unknown event type - ' . $componentName));
+            throw new \InvalidArgumentException(Craft::t('instant-analytics-ga4', 'Unknown event type - '.$componentName));
         }
         
         return new $componentMap[$componentName];

src/controllers/TrackController.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      *         The actions must be in 'kebab-case'
      * @access protected
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'track-page-view-url',
         'track-event-url'
     ];

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
         // so we can't extract it from the passed in $config
         $majorVersion = '4';
         // Dev server container name & port are based on the major version of this plugin
-        $devPort = 3000 + (int)$majorVersion;
-        $versionName = 'v' . $majorVersion;
+        $devPort = 3000 + (int) $majorVersion;
+        $versionName = 'v'.$majorVersion;
         return [
             'components' => [
                 'ga4' => Ga4::class,
@@ -50,8 +50,8 @@ 
                     'assetClass' => InstantAnalyticsAsset::class,
                     'checkDevServer' => true,
                     'class' => VitePluginService::class,
-                    'devServerInternal' => 'http://craft-instantanalytics-ga4-' . $versionName . '-buildchain-dev:' . $devPort,
-                    'devServerPublic' => 'http://localhost:' . $devPort,
+                    'devServerInternal' => 'http://craft-instantanalytics-ga4-'.$versionName.'-buildchain-dev:'.$devPort,
+                    'devServerPublic' => 'http://localhost:'.$devPort,
                     'errorEntry' => 'src/js/app.ts',
                     'useDevServer' => true,
                 ],

src/ga4/Analytics.php

Spacing +3 added lines, -3 removed lines

@@ -179,7 +179,7 @@ 
      * @param string $listName
      * @throws \yii\base\InvalidConfigException
      */
-    public function addCommerceProductImpression(Product|Variant $productVariant, int $index = 0, string $listName = 'default') {
+    public function addCommerceProductImpression(Product | Variant $productVariant, int $index = 0, string $listName = 'default') {
         InstantAnalytics::$plugin->commerce->addCommerceProductImpression($productVariant);
     }
 
@@ -192,7 +192,7 @@ 
      * @throws \yii\base\InvalidConfigException
      *@deprecated `Analytics::addCommerceProductDetailView()` is deprecated. Use `Analytics::addCommerceProductImpression()` instead.
      */
-    public function addCommerceProductDetailView(Product|Variant $productVariant, int $index = 0, string $listName = 'default') {
+    public function addCommerceProductDetailView(Product | Variant $productVariant, int $index = 0, string $listName = 'default') {
         Craft::$app->getDeprecator()->log('Analytics::addCommerceProductDetailView()', '`Analytics::addCommerceProductDetailView()` is deprecated. Use `Analytics::addCommerceProductImpression()` instead.');
         $this->addCommerceProductImpression($productVariant);
     }
@@ -338,7 +338,7 @@ 
             // Load them up for GA4
             foreach ($campaignParams as $key => $method) {
                 $value = $request->getParam($key) ?? $session->get($key) ?? null;
-                $method = 'set' . $method;
+                $method = 'set'.$method;
 
                 $this->$method($value);
 

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

@@ -72,7 +72,7 @@ 
             $urlParts = parse_url($url);
             $url = $urlParts['path'] ?? '/';
             if (isset($urlParts['query'])) {
-                $url .= '?' . $urlParts['query'];
+                $url .= '?'.$urlParts['query'];
             }
         }
 
@@ -113,7 +113,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}',
@@ -144,7 +144,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}',
@@ -168,7 +168,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();
@@ -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;
@@ -296,7 +296,7 @@ 
     public static function getSessionCookie(): ?array
     {
         $measurementId = App::parseEnv(InstantAnalytics::$settings->googleAnalyticsMeasurementId);
-        $cookieName = '_ga_' . StringHelper::removeLeft($measurementId, 'G-');
+        $cookieName = '_ga_'.StringHelper::removeLeft($measurementId, 'G-');
         if (isset($_COOKIE[$cookieName])) {
             $sessionCookie = null;