nystudio107 / craft-instantanalytics

src/InstantAnalytics.php

Spacing +13 added lines, -13 removed lines

@@ -83,7 +83,7 @@ 
         // Add in our Twig extensions
         $view->registerTwigExtension(new InstantAnalyticsTwigExtension());
         // Install our template hook
-        $view->hook('iaSendPageView', [$this, 'iaSendPageView']);
+        $view->hook('iaSendPageView', [ $this, 'iaSendPageView' ]);
         // Determine if Craft Commerce is installed & enabled
         self::$commercePlugin = Craft::$app->getPlugins()->getPlugin('commerce');
         // Determine if SEOmatic is installed & enabled
@@ -92,7 +92,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('instantAnalytics', InstantAnalyticsVariable::class);
@@ -103,7 +103,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     $request = Craft::$app->getRequest();
                     if (($request->isCpRequest) && (!$request->isConsoleRequest)) {
@@ -119,7 +119,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_BEFORE_RENDER_PAGE_TEMPLATE,
-                function (TemplateEvent $event) {
+                function(TemplateEvent $event) {
                     self::$currentTemplate = $event->template;
                 }
             );
@@ -127,7 +127,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_AFTER_RENDER_PAGE_TEMPLATE,
-                function (TemplateEvent $event) {
+                function(TemplateEvent $event) {
                     $settings = InstantAnalytics::$plugin->getSettings();
                     if ($settings->autoSendPageView) {
                         $this->sendPageView();
@@ -138,10 +138,10 @@ 
             Event::on(
                 UrlManager::class,
                 UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-                function (RegisterUrlRulesEvent $event) {
-                    $event->rules['instantanalytics/pageViewTrack/<filename:[-\w\.*]+>?'] =
+                function(RegisterUrlRulesEvent $event) {
+                    $event->rules[ 'instantanalytics/pageViewTrack/<filename:[-\w\.*]+>?' ] =
                         'instant-analytics/track/track-page-view-url';
-                    $event->rules['instantanalytics/eventTrack/<filename:[-\w\.*]+>?'] =
+                    $event->rules[ 'instantanalytics/eventTrack/<filename:[-\w\.*]+>?' ] =
                         'instant-analytics/track/track-event-url';
                 }
             );
@@ -155,7 +155,7 @@ 
             Craft::t(
                 'instant-analytics',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -166,7 +166,7 @@ 
      */
     public function settingsHtml()
     {
-        $commerceFields = [];
+        $commerceFields = [ ];
 
         if (self::$commercePlugin) {
             // TODO: pending Commerce for Craft 3
@@ -212,7 +212,7 @@ 
      */
     private function getPullFieldsFromLayoutId(int $layoutId)
     {
-        $result = ['' => "none"];
+        $result = [ '' => "none" ];
         $fieldLayout = Craft::$app->getFields()->getLayoutById($layoutId);
         $fieldLayoutFields = $fieldLayout->getFields();
         foreach ($fieldLayoutFields as $fieldLayoutField) {
@@ -223,7 +223,7 @@ 
                 case "RedactorI":
                 case "PreparseField_Preparse":
                 case "Categories":
-                    $result[$field->handle] = $field->name;
+                    $result[ $field->handle ] = $field->name;
                     break;
 
                 case "Tags":
@@ -271,7 +271,7 @@ 
         $request = Craft::$app->getRequest();
         if ($request->getIsSiteRequest() && !$request->getIsConsoleRequest()) {
             // If SEOmatic is installed, set the page title from it
-            if (self::$seomaticPlugin && isset($context['seomaticMeta'])) {
+            if (self::$seomaticPlugin && isset($context[ 'seomaticMeta' ])) {
                 // TODO: fix for SEOmatic
                 /*
                 $seomaticMeta = $context['seomaticMeta'];

src/services/IA.php

Spacing +12 added lines, -12 removed lines

@@ -267,9 +267,9 @@ 
         // Check the $_SERVER[] super-global exclusions
         if (isset($settings->serverExcludes) && is_array($settings->serverExcludes)) {
             foreach ($settings->serverExcludes as $match => $matchArray) {
-                if (isset($_SERVER[$match])) {
+                if (isset($_SERVER[ $match ])) {
                     foreach ($matchArray as $matchItem) {
-                        if (preg_match($matchItem, $_SERVER[$match])) {
+                        if (preg_match($matchItem, $_SERVER[ $match ])) {
                             if ($settings->logExcludedAnalytics) {
                                 Craft::info(
                                     "Analytics excluded for: " . $requestIp . " due to: `serverExcludes`",
@@ -351,13 +351,13 @@ 
         // We want to send just a path to GA for page views
         if (UrlHelper::isAbsoluteUrl($url)) {
             $urlParts = parse_url($url);
-            if (isset($urlParts['path'])) {
-                $url = $urlParts['path'];
+            if (isset($urlParts[ 'path' ])) {
+                $url = $urlParts[ 'path' ];
             } else {
                 $url = "/";
             }
-            if (isset($urlParts['query'])) {
-                $url = $url."?".$urlParts['query'];
+            if (isset($urlParts[ 'query' ])) {
+                $url = $url . "?" . $urlParts[ 'query' ];
             }
         }
 
@@ -471,8 +471,8 @@ 
     private function getGclid()
     {
         $gclid = "";
-        if (isset($_GET['gclid'])) {
-            $gclid = $_GET['gclid'];
+        if (isset($_GET[ 'gclid' ])) {
+            $gclid = $_GET[ 'gclid' ];
             if (!empty($gclid)) {
                 setcookie("gclid", $gclid, time() + (10 * 365 * 24 * 60 * 60), "/");
             }
@@ -489,12 +489,12 @@ 
      */
     private function gaParseCookie()
     {
-        if (isset($_COOKIE['_ga'])) {
-            $parts = preg_split('[\.]', $_COOKIE["_ga"], 4);
+        if (isset($_COOKIE[ '_ga' ])) {
+            $parts = preg_split('[\.]', $_COOKIE[ "_ga" ], 4);
             $cid = implode(array_slice($parts, 2), '.');
         } else {
-            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] != '') {
-                $cid = $_COOKIE['_ia'];
+            if (isset($_COOKIE[ '_ia' ]) && $_COOKIE[ '_ia' ] != '') {
+                $cid = $_COOKIE[ '_ia' ];
             } else {
                 $cid = $this->gaGenUUID();
             }

src/services/Commerce.php

Spacing +41 added lines, -41 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function getProductDataFromProduct($productVariant = null)
     {
-        $result = [];
+        $result = [ ];
         if ($productVariant) {
             if (is_object($productVariant) && ($productVariant->getElementType() == "Commerce_Product" || is_a($productVariant, "Commerce\\Base\\Purchasable"))) {
                 $productType = property_exists($productVariant, "typeId")
@@ -52,26 +52,26 @@ 
                     $productVariant = ArrayHelper::getFirstValue($productVariant->getVariants());
                     $product = $productVariant->getProduct();
                     if ($product) {
-                        $category = $product->getType()['name'];
+                        $category = $product->getType()[ 'name' ];
                         $name = $product->title;
                         $variant = $productVariant->title;
                     } else {
-                        $category = $productVariant->getType()['name'];
+                        $category = $productVariant->getType()[ 'name' ];
                         $name = $productVariant->title;
                         $variant = "";
                     }
                 } else {
                     if (isset($productVariant->defaultVariantId)) {
                         $productVariant = craft()->commerce_variants->getVariantById($productVariant->defaultVariantId);
-                        $category = $productVariant->getProduct()->getType()['name'];
+                        $category = $productVariant->getProduct()->getType()[ 'name' ];
                         $name = $productVariant->title;
                         $variant = "";
                     } else {
                         if (isset($productVariant->product)) {
-                            $category = $productVariant->product->getType()['name'];
+                            $category = $productVariant->product->getType()[ 'name' ];
                             $name = $productVariant->product->title;
                         } else {
-                            $category = $productVariant->getType()['name'];
+                            $category = $productVariant->getType()[ 'name' ];
                             $name = $productVariant->title;
                         }
                         $variant = $productVariant->title;
@@ -90,35 +90,35 @@ 
             ];
 
             if ($variant) {
-                $productData['variant'] = $variant;
+                $productData[ 'variant' ] = $variant;
             }
 
             $settings = craft()->plugins->getPlugin('instantanalytics')->getSettings();
             $isVariant = $productVariant->getElementType() == "Commerce_Variant";
 
-            if (isset($settings) && isset($settings['productCategoryField']) && $settings['productCategoryField'] != "") {
-                $productData['category'] = $this->_pullDataFromField(
+            if (isset($settings) && isset($settings[ 'productCategoryField' ]) && $settings[ 'productCategoryField' ] != "") {
+                $productData[ 'category' ] = $this->_pullDataFromField(
                     $productVariant,
-                    $settings['productCategoryField']
+                    $settings[ 'productCategoryField' ]
                 );
-                if (empty($productData['category']) && $isVariant) {
-                    $productData['category'] = $this->_pullDataFromField(
+                if (empty($productData[ 'category' ]) && $isVariant) {
+                    $productData[ 'category' ] = $this->_pullDataFromField(
                         $productVariant->product,
-                        $settings['productCategoryField']
+                        $settings[ 'productCategoryField' ]
                     );
                 }
             }
 
-            if (isset($settings) && isset($settings['productBrandField']) && $settings['productBrandField'] != "") {
-                $productData['brand'] = $this->_pullDataFromField(
+            if (isset($settings) && isset($settings[ 'productBrandField' ]) && $settings[ 'productBrandField' ] != "") {
+                $productData[ 'brand' ] = $this->_pullDataFromField(
                     $productVariant,
-                    $settings['productBrandField'],
+                    $settings[ 'productBrandField' ],
                     true
                 );
-                if (empty($productData['brand']) && $isVariant) {
-                    $productData['brand'] = $this->_pullDataFromField(
+                if (empty($productData[ 'brand' ]) && $isVariant) {
+                    $productData[ 'brand' ] = $this->_pullDataFromField(
                         $productVariant,
-                        $settings['productBrandField'],
+                        $settings[ 'productBrandField' ],
                         true
                     );
                 }
@@ -152,12 +152,12 @@ 
                     $analytics->setProductImpressionListName($listName, $listIndex);
                 }
                 if ($index) {
-                    $productData['position'] = $index;
+                    $productData[ 'position' ] = $index;
                 }
 
                 //Add the product to the hit to be sent
                 $analytics->addProductImpression($productData, $listIndex);
-                InstantAnalyticsPlugin::log("addCommerceProductImpression for `" . $productData['sku'] . "` - `" . $productData['name'] . "` - `" . $productData['name'] . "` - `" . $index . "`", LogLevel::Info, false);
+                InstantAnalyticsPlugin::log("addCommerceProductImpression for `" . $productData[ 'sku' ] . "` - `" . $productData[ 'name' ] . "` - `" . $productData[ 'name' ] . "` - `" . $index . "`", LogLevel::Info, false);
             }
         }
     } /* -- addCommerceProductImpression */
@@ -181,7 +181,7 @@ 
 
                 //Add the product to the hit to be sent
                 $analytics->addProduct($productData);
-                InstantAnalyticsPlugin::log("addCommerceProductDetailView for `" . $productData['sku'] . "` - `" . $productData['name'] . "` - `" . $productData['name'] . "`", LogLevel::Info, false);
+                InstantAnalyticsPlugin::log("addCommerceProductDetailView for `" . $productData[ 'sku' ] . "` - `" . $productData[ 'name' ] . "` - `" . $productData[ 'name' ] . "`", LogLevel::Info, false);
             }
         }
     } /* -- addCommerceProductDetailView */
@@ -238,33 +238,33 @@ 
                     $productVariant = $lineItem->purchasable->product;
                     if (!$lineItem->purchasable->product->type->hasVariants) {
                         //No variants (i.e. default variant)
-                        $productData['name'] = $lineItem->purchasable->title;
-                        $productData['category'] = $lineItem->purchasable->product->type['name'];
+                        $productData[ 'name' ] = $lineItem->purchasable->title;
+                        $productData[ 'category' ] = $lineItem->purchasable->product->type[ 'name' ];
                     } else {
                         // Product with variants
-                        $productData['name'] = $lineItem->purchasable->product->title;
-                        $productData['category'] = $lineItem->purchasable->product->type['name'];
-                        $productData['variant'] = $lineItem->purchasable->title;
+                        $productData[ 'name' ] = $lineItem->purchasable->product->title;
+                        $productData[ 'category' ] = $lineItem->purchasable->product->type[ 'name' ];
+                        $productData[ 'variant' ] = $lineItem->purchasable->title;
                     }
                 } else {
                     $productVariant = $lineItem->purchasable;
-                    $productData['name'] = $lineItem->purchasable->title;
-                    $productData['category'] = $lineItem->purchasable->type->name;
+                    $productData[ 'name' ] = $lineItem->purchasable->title;
+                    $productData[ 'category' ] = $lineItem->purchasable->type->name;
                 }
-                $result = $productData['name'];
+                $result = $productData[ 'name' ];
                 if ($index) {
-                    $productData['position'] = $index;
+                    $productData[ 'position' ] = $index;
                 }
                 if ($listName) {
-                    $productData['list'] = $listName;
+                    $productData[ 'list' ] = $listName;
                 }
 
                 $settings = craft()->plugins->getPlugin('instantanalytics')->getSettings();
-                if (isset($settings) && isset($settings['productCategoryField']) && $settings['productCategoryField'] != "") {
-                    $productData['category'] = $this->_pullDataFromField($productVariant, $settings['productCategoryField']);
+                if (isset($settings) && isset($settings[ 'productCategoryField' ]) && $settings[ 'productCategoryField' ] != "") {
+                    $productData[ 'category' ] = $this->_pullDataFromField($productVariant, $settings[ 'productCategoryField' ]);
                 }
-                if (isset($settings) && isset($settings['productBrandField']) && $settings['productBrandField'] != "") {
-                    $productData['brand'] = $this->_pullDataFromField($productVariant, $settings['productBrandField']);
+                if (isset($settings) && isset($settings[ 'productBrandField' ]) && $settings[ 'productBrandField' ] != "") {
+                    $productData[ 'brand' ] = $this->_pullDataFromField($productVariant, $settings[ 'productBrandField' ]);
                 }
                 //Add each product to the hit to be sent
                 $analytics->addProduct($productData);
@@ -387,9 +387,9 @@ 
         $result = "";
         if ($productVariant) {
             if ($fieldHandle) {
-                $srcField = $productVariant[$fieldHandle];
+                $srcField = $productVariant[ $fieldHandle ];
                 if ($srcField == null) {
-                    $srcField = $productVariant->product->content->attributes[$fieldHandle];
+                    $srcField = $productVariant->product->content->attributes[ $fieldHandle ];
                 }
 
                 if (isset($srcField->elementType)) {
@@ -404,7 +404,7 @@ 
                             break;
 
                         case ElementType::Category: {
-                            $cats = [];
+                            $cats = [ ];
                             if ($isBrand) {
                                 // Because we can only have one brand, we'll get
                                 // the very last category. This means if our
@@ -412,7 +412,7 @@ 
                                 // not the parent.
                                 /** @var CategoryModel $cat */
                                 foreach ($srcField as $cat) {
-                                    $cats = [$cat->getTitle()];
+                                    $cats = [ $cat->getTitle() ];
                                 }
                             } else {
                                 // For every category, show its ancestors
@@ -423,7 +423,7 @@ 
                                     while ($cat = $cat->getParent()) {
                                         $name = $cat->getTitle() . "/" . $name;
                                     }
-                                    $cats[] = $name;
+                                    $cats[ ] = $name;
                                 }
                             }
                             // Join separate categories with a pipe.

src/twigextensions/InstantAnalyticsTwigExtension.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function getGlobals()
     {
-        $globals = [];
+        $globals = [ ];
         $view = Craft::$app->getView();
         if ($view->getIsRenderingPageTemplate()) {
             $request = Craft::$app->getRequest();
@@ -66,10 +66,10 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('pageViewAnalytics', [$this, 'pageViewAnalytics']),
-            new \Twig_SimpleFilter('eventAnalytics', [$this, 'eventAnalytics']),
-            new \Twig_SimpleFilter('pageViewTrackingUrl', [$this, 'pageViewTrackingUrl']),
-            new \Twig_SimpleFilter('eventTrackingUrl', [$this, 'eventTrackingUrl']),
+            new \Twig_SimpleFilter('pageViewAnalytics', [ $this, 'pageViewAnalytics' ]),
+            new \Twig_SimpleFilter('eventAnalytics', [ $this, 'eventAnalytics' ]),
+            new \Twig_SimpleFilter('pageViewTrackingUrl', [ $this, 'pageViewTrackingUrl' ]),
+            new \Twig_SimpleFilter('eventTrackingUrl', [ $this, 'eventTrackingUrl' ]),
         ];
     }
 
@@ -79,10 +79,10 @@ 
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('pageViewAnalytics', [$this, 'pageViewAnalytics']),
-            new \Twig_SimpleFunction('eventAnalytics', [$this, 'eventAnalytics']),
-            new \Twig_SimpleFunction('pageViewTrackingUrl', [$this, 'pageViewTrackingUrl']),
-            new \Twig_SimpleFunction('eventTrackingUrl', [$this, 'eventTrackingUrl']),
+            new \Twig_SimpleFunction('pageViewAnalytics', [ $this, 'pageViewAnalytics' ]),
+            new \Twig_SimpleFunction('eventAnalytics', [ $this, 'eventAnalytics' ]),
+            new \Twig_SimpleFunction('pageViewTrackingUrl', [ $this, 'pageViewTrackingUrl' ]),
+            new \Twig_SimpleFunction('eventTrackingUrl', [ $this, 'eventTrackingUrl' ]),
         ];
     }
 

src/helpers/IAnalytics.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     {
         /** @var Settings $settings */
         $settings = InstantAnalytics::$plugin->getSettings();
-        $requestIp = $_SERVER['REMOTE_ADDR'];
+        $requestIp = $_SERVER[ 'REMOTE_ADDR' ];
         if ($this->shouldSendAnalytics) {
             try {
                 Craft::info(