nystudio107 / craft-seomatic

src/models/SitemapTemplate.php

Spacing +14 added lines, -14 removed lines

@@ -149,10 +149,10 @@ 
         }
 
         $cache = Craft::$app->getCache();
-        $pageCacheSuffix = 's' . (int)$metaBundle->metaSitemapVars->sitemapPageSize . 'p' . $page;
+        $pageCacheSuffix = 's'.(int) $metaBundle->metaSitemapVars->sitemapPageSize.'p'.$page;
 
-        $uniqueKey = $groupId . $type . $handle . $siteId . $pageCacheSuffix;
-        $cacheKey = self::CACHE_KEY . $uniqueKey;
+        $uniqueKey = $groupId.$type.$handle.$siteId.$pageCacheSuffix;
+        $cacheKey = self::CACHE_KEY.$uniqueKey;
         $result = $cache->get($cacheKey);
 
         // If the sitemap isn't cached, start a job to create it
@@ -171,8 +171,8 @@ 
                 $dependency = new TagDependency([
                     'tags' => [
                         self::GLOBAL_SITEMAP_CACHE_TAG,
-                        self::SITEMAP_CACHE_TAG . $handle . $siteId,
-                        self::SITEMAP_CACHE_TAG . $handle . $siteId . $pageCacheSuffix,
+                        self::SITEMAP_CACHE_TAG.$handle.$siteId,
+                        self::SITEMAP_CACHE_TAG.$handle.$siteId.$pageCacheSuffix,
                     ],
                 ]);
 
@@ -184,7 +184,7 @@ 
 
                 // Output some info if this is a console app
                 if (Craft::$app instanceof ConsoleApplication) {
-                    echo 'Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey . PHP_EOL;
+                    echo 'Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey.PHP_EOL;
                 }
 
                 // If the FastCGI Cache Bust plugin is installed, clear its caches too
@@ -212,11 +212,11 @@ 
                 // Return an empty XML document
                 $lines[] = '<?xml version="1.0" encoding="UTF-8"?>';
                 $lines[] = '<?xml-stylesheet type="text/xsl" href="sitemap-empty.xsl"?>';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'This sitemap has not been generated yet.') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'If you are seeing this in local dev or an') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'environment with `devMode` on, caches only') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'last for 30 seconds in local dev, so it is') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'normal for the sitemap to not be cached.') . ' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'This sitemap has not been generated yet.').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'If you are seeing this in local dev or an').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'environment with `devMode` on, caches only').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'last for 30 seconds in local dev, so it is').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'normal for the sitemap to not be cached.').' -->';
                 $lines[] = '<urlset>';
                 $lines[] = '</urlset>';
             }
@@ -225,7 +225,7 @@ 
             return $lines;
         } else {
             if (Craft::$app instanceof ConsoleApplication) {
-                echo 'Found in cache' . PHP_EOL;
+                echo 'Found in cache'.PHP_EOL;
             }
         }
 
@@ -241,9 +241,9 @@ 
     public function invalidateCache(string $handle, int $siteId)
     {
         $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 cache cleared: ' . $handle,
+            'Sitemap cache cleared: '.$handle,
             __METHOD__
         );
     }

src/services/Sitemaps.php

Spacing +16 added lines, -16 removed lines

@@ -43,11 +43,11 @@ 
     // Constants
     // =========================================================================
 
-    public const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapIndexTemplate::TEMPLATE_TYPE;
+    public const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapIndexTemplate::TEMPLATE_TYPE;
 
-    public const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapTemplate::TEMPLATE_TYPE;
+    public const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapTemplate::TEMPLATE_TYPE;
 
-    public const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapCustomTemplate::TEMPLATE_TYPE;
+    public const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapCustomTemplate::TEMPLATE_TYPE;
 
     public const SEARCH_ENGINE_SUBMISSION_URLS = [
     ];
@@ -238,19 +238,19 @@ 
                         $siteId = $groupSiteIds[0];
                         $sitemapIndexUrl = $this->sitemapIndexUrlForSiteId($siteId);
                         if (!empty($sitemapIndexUrl)) {
-                            $submissionUrl = $url . urlencode($sitemapIndexUrl);
+                            $submissionUrl = $url.urlencode($sitemapIndexUrl);
                             // create new guzzle client
                             $guzzleClient = Craft::createGuzzleClient(['timeout' => 5, 'connect_timeout' => 5]);
                             // Submit the sitemap index to each search engine
                             try {
                                 $guzzleClient->post($submissionUrl);
                                 Craft::info(
-                                    'Sitemap index submitted to: ' . $submissionUrl,
+                                    'Sitemap index submitted to: '.$submissionUrl,
                                     __METHOD__
                                 );
                             } catch (\Exception $e) {
                                 Craft::error(
-                                    'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                                    'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                                     __METHOD__
                                 );
                             }
@@ -312,19 +312,19 @@ 
             foreach ($searchEngineUrls as &$url) {
                 $sitemapUrl = $this->sitemapUrlForBundle($sourceBundleType, $sourceHandle, $sourceSiteId);
                 if (!empty($sitemapUrl)) {
-                    $submissionUrl = $url . urlencode($sitemapUrl);
+                    $submissionUrl = $url.urlencode($sitemapUrl);
                     // create new guzzle client
                     $guzzleClient = Craft::createGuzzleClient(['timeout' => 5, 'connect_timeout' => 5]);
                     // Submit the sitemap index to each search engine
                     try {
                         $guzzleClient->post($submissionUrl);
                         Craft::info(
-                            'Sitemap index submitted to: ' . $submissionUrl,
+                            'Sitemap index submitted to: '.$submissionUrl,
                             __METHOD__
                         );
                     } catch (\Exception $e) {
                         Craft::error(
-                            'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                            'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                             __METHOD__
                         );
                     }
@@ -365,7 +365,7 @@ 
                     . '-'
                     . $metaBundle->sourceSiteId
                     . '-sitemap'
-                    . (!empty($page) ? '-p' . $page : '')
+                    . (!empty($page) ? '-p'.$page : '')
                     . '.xml',
                     null,
                     null,
@@ -394,19 +394,19 @@ 
             foreach ($searchEngineUrls as &$url) {
                 $sitemapUrl = $this->sitemapCustomUrlForSiteId($siteId);
                 if (!empty($sitemapUrl)) {
-                    $submissionUrl = $url . urlencode($sitemapUrl);
+                    $submissionUrl = $url.urlencode($sitemapUrl);
                     // create new guzzle client
                     $guzzleClient = Craft::createGuzzleClient(['timeout' => 5, 'connect_timeout' => 5]);
                     // Submit the sitemap index to each search engine
                     try {
                         $guzzleClient->post($submissionUrl);
                         Craft::info(
-                            'Sitemap Custom submitted to: ' . $submissionUrl,
+                            'Sitemap Custom submitted to: '.$submissionUrl,
                             __METHOD__
                         );
                     } catch (\Exception $e) {
                         Craft::error(
-                            'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                            'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                             __METHOD__
                         );
                     }
@@ -484,7 +484,7 @@ 
         }
 
         foreach ($sites as $site) {
-            $result .= 'sitemap: ' . $this->sitemapIndexUrlForSiteId($site->id) . PHP_EOL;
+            $result .= 'sitemap: '.$this->sitemapIndexUrlForSiteId($site->id).PHP_EOL;
         }
 
         return rtrim($result, PHP_EOL);
@@ -515,9 +515,9 @@ 
     {
         // Always just invalidate the sitemap cache now, since we're doing paginated sitemaps
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, SitemapTemplate::SITEMAP_CACHE_TAG . $handle . $siteId);
+        TagDependency::invalidate($cache, SitemapTemplate::SITEMAP_CACHE_TAG.$handle.$siteId);
         Craft::info(
-            'Sitemap cache cleared: ' . $handle,
+            'Sitemap cache cleared: '.$handle,
             __METHOD__
         );
     }

src/services/MetaContainers.php

Spacing +16 added lines, -16 removed lines

@@ -182,7 +182,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;
         }
     }
 
@@ -251,10 +251,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,
+            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__
                 );
 
@@ -380,7 +380,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -405,21 +405,21 @@ 
                 }
             }
             // Get our cache key
-            $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams() . $token;
+            $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams().$token;
             // 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;
@@ -436,10 +436,10 @@ 
             } else {
                 $cache = Craft::$app->getCache();
                 list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet(
-                    self::CACHE_KEY . $cacheKey,
+                    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);
@@ -843,10 +843,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
@@ -873,9 +873,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
@@ -1018,7 +1018,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/helpers/Container.php

Spacing +6 added lines, -6 removed lines

@@ -90,24 +90,24 @@
         }
         // Get our cache key
         $asArrayKey = $asArray ? 'true' : 'false';
-        $cacheKey = $uri . $siteId . implode($containerKeys) . $asArrayKey . Seomatic::$environment . $token;
+        $cacheKey = $uri.$siteId.implode($containerKeys).$asArrayKey.Seomatic::$environment.$token;
         // Load the meta containers
         $dependency = new TagDependency([
             'tags' => [
                 $metaContainers::GLOBAL_METACONTAINER_CACHE_TAG,
-                $metaContainers::METACONTAINER_CACHE_TAG . $sourceId . $sourceBundleType . $siteId,
-                $metaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId,
-                $metaContainers::METACONTAINER_CACHE_TAG . $cacheKey,
+                $metaContainers::METACONTAINER_CACHE_TAG.$sourceId.$sourceBundleType.$siteId,
+                $metaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                $metaContainers::METACONTAINER_CACHE_TAG.$cacheKey,
             ],
         ]);
 
         $cache = Craft::$app->getCache();
         $result = $cache->getOrSet(
-            self::CACHE_KEY . $cacheKey,
+            self::CACHE_KEY.$cacheKey,
             function() use ($uri, $siteId, $containerKeys, $asArray) {
                 $result = [];
                 Craft::info(
-                    'Meta controller container cache miss: ' . $uri . '/' . $siteId,
+                    'Meta controller container cache miss: '.$uri.'/'.$siteId,
                     __METHOD__
                 );
                 // Load the meta containers and parse our globals

src/Seomatic.php

Spacing +13 added lines, -13 removed lines

@@ -347,7 +347,7 @@ 
             $lastSegment = end($segments);
             $site = Craft::$app->getSites()->getSiteByHandle($lastSegment);
             if ($site !== null) {
-                $siteSuffix = '/' . $lastSegment;
+                $siteSuffix = '/'.$lastSegment;
             }
         }
         $currentUser = Craft::$app->getUser()->getIdentity();
@@ -355,31 +355,31 @@ 
         if ($currentUser->can('seomatic:dashboard')) {
             $subNavs['dashboard'] = [
                 'label' => Craft::t('seomatic', 'Dashboard'),
-                'url' => 'seomatic/dashboard' . $siteSuffix,
+                'url' => 'seomatic/dashboard'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:global-meta')) {
             $subNavs['global'] = [
                 'label' => Craft::t('seomatic', 'Global SEO'),
-                'url' => 'seomatic/global/general' . $siteSuffix,
+                'url' => 'seomatic/global/general'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:content-meta')) {
             $subNavs['content'] = [
                 'label' => Craft::t('seomatic', 'Content SEO'),
-                'url' => 'seomatic/content' . $siteSuffix,
+                'url' => 'seomatic/content'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:site-settings')) {
             $subNavs['site'] = [
                 'label' => Craft::t('seomatic', 'Site Settings'),
-                'url' => 'seomatic/site/identity' . $siteSuffix,
+                'url' => 'seomatic/site/identity'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:tracking-scripts')) {
             $subNavs['tracking'] = [
                 'label' => Craft::t('seomatic', 'Tracking Scripts'),
-                'url' => 'seomatic/tracking/gtag' . $siteSuffix,
+                'url' => 'seomatic/tracking/gtag'.$siteSuffix,
             ];
         }
         $editableSettings = true;
@@ -573,14 +573,14 @@ 
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '