nystudio107 / craft-seomatic

src/services/MetaContainers.php

Spacing +22 added lines, -22 removed lines

@@ -160,7 +160,7 @@ 
         // Get the page number of this request
         $request = Craft::$app->getRequest();
         if (!$request->isConsoleRequest) {
-            $this->paginationPage = (string)$request->pageNum;
+            $this->paginationPage = (string) $request->pageNum;
         }
     }
 
@@ -176,10 +176,10 @@ 
         $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY;
         $uniqueKey .= $bodyPosition;
         $scriptData = Craft::$app->getCache()->getOrSet(
-            self::GLOBALS_CACHE_KEY . $uniqueKey,
-            function () use ($uniqueKey, $bodyPosition) {
+            self::GLOBALS_CACHE_KEY.$uniqueKey,
+            function() use ($uniqueKey, $bodyPosition) {
                 Craft::info(
-                    self::SCRIPTS_CACHE_KEY . ' cache miss: ' . $uniqueKey,
+                    self::SCRIPTS_CACHE_KEY.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
                 $scriptData = [];
@@ -191,7 +191,7 @@ 
                             foreach ($scriptContainer->data as $metaScript) {
                                 /** @var MetaScript $metaScript */
                                 if (!empty($metaScript->bodyTemplatePath)
-                                    && ((int)$metaScript->bodyPosition === $bodyPosition)) {
+                                    && ((int) $metaScript->bodyPosition === $bodyPosition)) {
                                     $scriptData[] = $metaScript->renderBodyHtml();
                                 }
                             }
@@ -271,10 +271,10 @@ 
         $dependency = $this->containerDependency;
         $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY;
         list($this->metaGlobalVars, $this->metaSiteVars) = Craft::$app->getCache()->getOrSet(
-            self::GLOBALS_CACHE_KEY . $uniqueKey,
-            function () use ($uniqueKey) {
+            self::GLOBALS_CACHE_KEY.$uniqueKey,
+            function() use ($uniqueKey) {
                 Craft::info(
-                    self::GLOBALS_CACHE_KEY . ' cache miss: ' . $uniqueKey,
+                    self::GLOBALS_CACHE_KEY.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
 
@@ -395,7 +395,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -411,21 +411,21 @@ 
                 }
             }
             // Get our cache key
-            $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams();
+            $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams();
             // For requests with a status code of >= 400, use one cache key
             if (!$request->isConsoleRequest) {
                 $response = Craft::$app->getResponse();
                 if ($response->statusCode >= 400) {
-                    $cacheKey = $siteId . self::INVALID_RESPONSE_CACHE_KEY . $response->statusCode;
+                    $cacheKey = $siteId.self::INVALID_RESPONSE_CACHE_KEY.$response->statusCode;
                 }
             }
             // Load the meta containers
             $dependency = new TagDependency([
                 'tags' => [
                     self::GLOBAL_METACONTAINER_CACHE_TAG,
-                    self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $uri . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $cacheKey,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$cacheKey,
                 ],
             ]);
             $this->containerDependency = $dependency;
@@ -441,10 +441,10 @@ 
             } else {
                 $cache = Craft::$app->getCache();
                 list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet(
-                    self::CACHE_KEY . $cacheKey,
-                    function () use ($uri, $siteId) {
+                    self::CACHE_KEY.$cacheKey,
+                    function() use ($uri, $siteId) {
                         Craft::info(
-                            'Meta container cache miss: ' . $uri . '/' . $siteId,
+                            'Meta container cache miss: '.$uri.'/'.$siteId,
                             __METHOD__
                         );
                         $this->loadGlobalMetaContainers($siteId);
@@ -839,10 +839,10 @@ 
         $cache = Craft::$app->getCache();
         TagDependency::invalidate(
             $cache,
-            self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId
+            self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId
         );
         Craft::info(
-            'Meta bundle cache cleared: ' . $metaBundleSourceId . ' / ' . $metaBundleSourceType . ' / ' . $siteId,
+            'Meta bundle cache cleared: '.$metaBundleSourceId.' / '.$metaBundleSourceType.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -869,9 +869,9 @@ 
         if ($siteId === null) {
             $siteId = Craft::$app->getSites()->currentSite->id ?? 1;
         }
-        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG . $uri . $siteId);
+        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG.$uri.$siteId);
         Craft::info(
-            'Meta container cache cleared: ' . $uri . ' / ' . $siteId,
+            'Meta container cache cleared: '.$uri.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -988,7 +988,7 @@ 
 
                     // Handle re-creating the `mainEntityOfPage` so that the model injected into the
                     // templates has the appropriate attributes
-                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE;
+                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE;
                     $generalContainer = $this->metaContainers[$generalContainerKey];
                     if (($generalContainer !== null) && !empty($generalContainer->data['mainEntityOfPage'])) {
                         /** @var MetaJsonLd $jsonLdModel */

src/seoelements/SeoDigitalProduct.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
         Event::on(
             ProductTypes::class,
             ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE,
-            function (ProductTypeEvent $event) {
+            function(ProductTypeEvent $event) {
                 Craft::debug(
                     'ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE',
                     __METHOD__
@@ -121,7 +121,7 @@ 
                 ProductTypes::class,
                 ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE,
                 /** @var ProductTypeEvent $event */
-                static function ($event) {
+                static function($event) {
                     Craft::debug(
                         'ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE',
                         __METHOD__
@@ -177,7 +177,7 @@ 
         Event::on(
             Product::class,
             Product::EVENT_DEFINE_SIDEBAR_HTML,
-            static function (DefineHtmlEvent $event) {
+            static function(DefineHtmlEvent $event) {
                 Craft::debug(
                     'Product::EVENT_DEFINE_SIDEBAR_HTML',
                     __METHOD__
@@ -386,7 +386,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/seoelements/SeoProduct.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
         Event::on(
             ProductTypes::class,
             ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE,
-            function (ProductTypeEvent $event) {
+            function(ProductTypeEvent $event) {
                 Craft::debug(
                     'ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE',
                     __METHOD__
@@ -121,7 +121,7 @@ 
             Event::on(
                 ProductTypes::class,
                 ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE,
-                static function (ProductTypeEvent $event) {
+                static function(ProductTypeEvent $event) {
                     Craft::debug(
                         'ProductTypes::EVENT_AFTER_SAVE_PRODUCTTYPE',
                         __METHOD__
@@ -176,7 +176,7 @@ 
         Event::on(
             Product::class,
             Product::EVENT_DEFINE_SIDEBAR_HTML,
-            static function (DefineHtmlEvent $event) {
+            static function(DefineHtmlEvent $event) {
                 Craft::debug(
                     'Product::EVENT_DEFINE_SIDEBAR_HTML',
                     __METHOD__
@@ -385,7 +385,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/console/controllers/SitemapController.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
     /**
      * @var    bool|array
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -74,7 +74,7 @@ 
      */
     public function actionGenerate()
     {
-        echo 'Generating sitemap' . PHP_EOL;
+        echo 'Generating sitemap'.PHP_EOL;
         if ($this->siteId !== null) {
             $siteIds[] = $this->siteId;
         } else {
@@ -116,7 +116,7 @@ 
                         ]);
                     }
 
-                    echo '---' . PHP_EOL;
+                    echo '---'.PHP_EOL;
                 }
             }
         }

src/base/MetaItem.php

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
                 // Add a URL to the schema.org type if this is a MetaJsonLD object
                 if ($isMetaJsonLdModel) {
                     /** @var  $this MetaJsonLd */
-                    $extraInfo = ' for http://schema.org/' . $this->type;
+                    $extraInfo = ' for http://schema.org/'.$this->type;
                 }
                 $errorMsg =
                     Craft::t('seomatic', 'Scenario: "')
@@ -169,10 +169,10 @@ 
                     . print_r($this->render(), true);
                 Craft::info($errorMsg, __METHOD__);
                 foreach ($this->errors as $param => $errors) {
-                    $errorMsg = Craft::t('seomatic', $errorLabel) . $param;
+                    $errorMsg = Craft::t('seomatic', $errorLabel).$param;
                     /** @var array $errors */
                     foreach ($errors as $error) {
-                        $errorMsg .= ' -> ' . $error;
+                        $errorMsg .= ' -> '.$error;
                         // Change the error level depending on the error message if this is a MetaJsonLD object
                         if ($isMetaJsonLdModel) {
                             if (strpos($error, 'recommended') !== false) {
@@ -185,15 +185,15 @@ 
                             }
                         }
                     }
-                    Craft::info(strtoupper($logLevel) . ' - ' . $errorMsg, __METHOD__);
+                    Craft::info(strtoupper($logLevel).' - '.$errorMsg, __METHOD__);
                     // Extra debugging info for MetaJsonLd objects
                     if ($isMetaJsonLdModel) {
                         /** @var MetaJsonLd $className */
                         $className = \get_class($this);
                         if (!empty($className::$schemaPropertyDescriptions[$param])) {
-                            $errorMsg = Craft::t('seomatic', $errorLabel) . $param;
+                            $errorMsg = Craft::t('seomatic', $errorLabel).$param;
                             /** @var $className MetaJsonLd */
-                            $errorMsg .= ' -> ' . $className::$schemaPropertyDescriptions[$param];
+                            $errorMsg .= ' -> '.$className::$schemaPropertyDescriptions[$param];
                             Craft::info($errorMsg, __METHOD__);
                         }
                     }

src/models/SitemapCustomTemplate.php

Spacing +5 added lines, -5 removed lines

@@ -127,16 +127,16 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SITEMAP_CACHE_TAG,
-                self::SITEMAP_CACHE_TAG . $handle . $siteId,
+                self::SITEMAP_CACHE_TAG.$handle.$siteId,
             ],
         ]);
 
-        return $cache->getOrSet(self::CACHE_KEY . $groupId . self::CUSTOM_SCOPE . $handle . $siteId, function () use (
+        return $cache->getOrSet(self::CACHE_KEY.$groupId.self::CUSTOM_SCOPE.$handle.$siteId, function() use (
             $handle,
             $siteId
         ) {
             Craft::info(
-                'Sitemap Custom cache miss: ' . $handle . '/' . $siteId,
+                'Sitemap Custom cache miss: '.$handle.'/'.$siteId,
                 __METHOD__
             );
             $lines = [];
@@ -211,9 +211,9 @@ 
     {
         $handle = self::CUSTOM_HANDLE;
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG . $handle . $siteId);
+        TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG.$handle.$siteId);
         Craft::info(
-            'Sitemap Custom cache cleared: ' . $handle,
+            'Sitemap Custom cache cleared: '.$handle,
             __METHOD__
         );
     }

src/models/SitemapIndexTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
      */
     public function getFilename(int $groupId): string
     {
-        return 'sitemaps-' . $groupId . '-sitemap.xml';
+        return 'sitemaps-'.$groupId.'-sitemap.xml';
     }
 
     /**
@@ -150,7 +150,7 @@ 
             ],
         ]);
 
-        return $cache->getOrSet(self::CACHE_KEY . $groupId . '.' . $siteId, function () use ($groupSiteIds, $siteId) {
+        return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function() use ($groupSiteIds, $siteId) {
             Craft::info(
                 'Sitemap index cache miss',
                 __METHOD__

src/models/MetaSiteVars.php

Spacing +2 added lines, -2 removed lines

@@ -225,10 +225,10 @@
         }
         // Make sure these are strings
         if (!empty($this->facebookProfileId)) {
-            $this->facebookProfileId = (string)$this->facebookProfileId;
+            $this->facebookProfileId = (string) $this->facebookProfileId;
         }
         if (!empty($this->facebookAppId)) {
-            $this->facebookAppId = (string)$this->facebookAppId;
+            $this->facebookAppId = (string) $this->facebookAppId;
         }
         // Identity
         if ($this->identity !== null && is_array($this->identity)) {

src/models/MetaTag.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $className = MetaTag::class;
         if ($tagType) {
             // Potentially load a sub-type of MetaTag
-            $tagClassName = 'nystudio107\\seomatic\\models\\metatag\\' . ucfirst($tagType) . 'Tag';
+            $tagClassName = 'nystudio107\\seomatic\\models\\metatag\\'.ucfirst($tagType).'Tag';
             /** @var $model MetaTag */
             if (class_exists($tagClassName)) {
                 $className = $tagClassName;
@@ -155,10 +155,10 @@ 
                 if (Seomatic::$devMode) {
                     $error = Craft::t(
                         'seomatic',
-                        '{tagtype} tag `{key}` did not render because it is missing attributes. ' . print_r($data, true),
+                        '{tagtype} tag `{key}` did not render because it is missing attributes. '.print_r($data, true),
                         ['tagtype' => 'Meta', 'key' => $this->key]
                     );
-                    Craft::info('WARNING - ' . $error, __METHOD__);
+                    Craft::info('WARNING - '.$error, __METHOD__);
                 }
                 $shouldRender = false;
             }