nystudio107 / craft-seomatic

src/helpers/Sitemap.php

Spacing +18 added lines, -18 removed lines

@@ -138,7 +138,7 @@ 
         if ($multiSite) {
             $urlsetLine .= ' xmlns:xhtml="http://www.w3.org/1999/xhtml"';
         }
-        if ((bool)$metaBundle->metaSitemapVars->newsSitemap) {
+        if ((bool) $metaBundle->metaSitemapVars->newsSitemap) {
             $urlsetLine .= ' xmlns:news="http://www.google.com/schemas/sitemap-news/0.9"';
         }
         $urlsetLine .= '>';
@@ -214,13 +214,13 @@ 
                         $paginator->getTotalPages(),
                         $paginator->getTotalResults());
                 }
-                echo $message . PHP_EOL;
+                echo $message.PHP_EOL;
             }
             /** @var Element $element */
             foreach ($elements as $element) {
                 // Output some info if this is a console app
                 if (Craft::$app instanceof ConsoleApplication) {
-                    echo "Processing element {$currentElement}/{$totalElements} - {$element->title}" . PHP_EOL;
+                    echo "Processing element {$currentElement}/{$totalElements} - {$element->title}".PHP_EOL;
                 }
 
                 $metaBundle->metaSitemapVars->setAttributes($stashedSitemapAttrs, false);
@@ -268,7 +268,7 @@ 
                         }
                         $canonicalUrl = UrlHelper::absoluteUrlWithProtocol($canonicalUrl);
                         if ($url !== $canonicalUrl) {
-                            Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - " . $metaBundle->metaGlobalVars->canonicalUrl . " - " . $element->uri);
+                            Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - ".$metaBundle->metaGlobalVars->canonicalUrl." - ".$element->uri);
                             continue;
                         }
                     }
@@ -329,12 +329,12 @@ 
                                             if ($primarySiteId === $altSourceSiteId && Seomatic::$settings->addXDefaultHrefLang) {
                                                 $lines[] = '<xhtml:link rel="alternate"'
                                                     . ' hreflang="x-default"'
-                                                    . ' href="' . self::encodeSitemapEntity($altUrl) . '"'
+                                                    . ' href="'.self::encodeSitemapEntity($altUrl).'"'
                                                     . ' />';
                                             }
                                             $lines[] = '<xhtml:link rel="alternate"'
-                                                . ' hreflang="' . $altSiteSettings['language'] . '"'
-                                                . ' href="' . self::encodeSitemapEntity($altUrl) . '"'
+                                                . ' hreflang="'.$altSiteSettings['language'].'"'
+                                                . ' href="'.self::encodeSitemapEntity($altUrl).'"'
                                                 . ' />';
                                         }
                                     }
@@ -343,7 +343,7 @@ 
                         }
                     }
                     // Handle news sitemaps https://developers.google.com/search/docs/crawling-indexing/sitemaps/news-sitemap
-                    if ((bool)$metaBundle->metaSitemapVars->newsSitemap) {
+                    if ((bool) $metaBundle->metaSitemapVars->newsSitemap) {
                         $now = new DateTime();
                         $interval = $now->diff($dateUpdated);
                         if ($interval->days <= 2) {
@@ -353,11 +353,11 @@ 
                             }
                             $lines[] = '<news:news>';
                             $lines[] = '<news:publication>';
-                            $lines[] = '<news:name>' . self::encodeSitemapEntity($metaBundle->metaSitemapVars->newsPublicationName) . '</news:name>';
-                            $lines[] = '<news:language>' . $language . '</news:language>';
+                            $lines[] = '<news:name>'.self::encodeSitemapEntity($metaBundle->metaSitemapVars->newsPublicationName).'</news:name>';
+                            $lines[] = '<news:language>'.$language.'</news:language>';
                             $lines[] = '</news:publication>';
-                            $lines[] = '<news:publication_date>' . $dateUpdated->format(DateTime::W3C) . '</news:publication_date>';
-                            $lines[] = '<news:title>' . self::encodeSitemapEntity($element->title) . '</news:title>';
+                            $lines[] = '<news:publication_date>'.$dateUpdated->format(DateTime::W3C).'</news:publication_date>';
+                            $lines[] = '<news:title>'.self::encodeSitemapEntity($element->title).'</news:title>';
                             $lines[] = '</news:news>';
                         }
                     }
@@ -630,7 +630,7 @@ 
      */
     protected static function assetSitemapItem(Asset $asset, MetaBundle $metaBundle, array &$lines)
     {
-        if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) {
+        if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) {
             switch ($asset->kind) {
                 case 'image':
                     $transform = Craft::$app->getAssetTransforms()->getTransformByHandle($metaBundle->metaSitemapVars->sitemapAssetTransform ?? '');
@@ -643,9 +643,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($fieldName) && !empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<image:' . $propName . '>';
+                            $lines[] = '<image:'.$propName.'>';
                             $lines[] = self::encodeSitemapEntity($asset[$fieldName]);
-                            $lines[] = '</image:' . $propName . '>';
+                            $lines[] = '</image:'.$propName.'>';
                         }
                     }
                     $lines[] = '</image:image>';
@@ -661,9 +661,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($fieldName) && !empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<video:' . $propName . '>';
+                            $lines[] = '<video:'.$propName.'>';
                             $lines[] = self::encodeSitemapEntity($asset[$fieldName]);
-                            $lines[] = '</video:' . $propName . '>';
+                            $lines[] = '</video:'.$propName.'>';
                         }
                     }
                     $lines[] = '</video:video>';
@@ -679,7 +679,7 @@ 
      */
     protected static function assetFilesSitemapLink(Asset $asset, MetaBundle $metaBundle, array &$lines)
     {
-        if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) {
+        if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) {
             if (in_array($asset->kind, SitemapTemplate::FILE_TYPES, false)) {
                 $dateUpdated = $asset->dateUpdated ?? $asset->dateCreated ?? new DateTime();
                 $lines[] = '<url>';

src/services/MetaContainers.php

Spacing +17 added lines, -17 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,22 +405,22 @@ 
                 }
             }
             // 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,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$cacheKey,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType,
                 ],
             ]);
             $this->containerDependency = $dependency;
@@ -437,10 +437,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);
@@ -841,10 +841,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
@@ -871,9 +871,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
@@ -1016,7 +1016,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 */