nystudio107 / craft-seomatic

src/helpers/Sitemap.php

Spacing +24 added lines, -24 removed lines

@@ -110,7 +110,7 @@ 
 
         // Output some info if this is a console app
         if ($job && Craft::$app instanceof ConsoleApplication) {
-            echo $job->description . PHP_EOL;
+            echo $job->description.PHP_EOL;
         }
 
         $lines = [];
@@ -137,7 +137,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 .= '>';
@@ -172,8 +172,8 @@ 
         while ($currentElement < $totalElements) {
             $elements = $paginator->getPageResults();
             if (Craft::$app instanceof ConsoleApplication) {
-                echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages()
-                    . ' - elements: ' . $paginator->getTotalResults()
+                echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages()
+                    . ' - elements: '.$paginator->getTotalResults()
                     . PHP_EOL;
             }
             /** @var Element $element */
@@ -185,7 +185,7 @@ 
                 }
                 // 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);
@@ -233,7 +233,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;
                         }
                     }
@@ -294,12 +294,12 @@ 
                                             if ($primarySiteId === $altSourceSiteId && Seomatic::$settings->addXDefaultHrefLang) {
                                                 $lines[] = '<xhtml:link rel="alternate"'
                                                     . ' hreflang="x-default"'
-                                                    . ' href="' . Html::encode($altUrl) . '"'
+                                                    . ' href="'.Html::encode($altUrl).'"'
                                                     . ' />';
                                             }
                                             $lines[] = '<xhtml:link rel="alternate"'
-                                                . ' hreflang="' . $altSiteSettings['language'] . '"'
-                                                . ' href="' . Html::encode($altUrl) . '"'
+                                                . ' hreflang="'.$altSiteSettings['language'].'"'
+                                                . ' href="'.Html::encode($altUrl).'"'
                                                 . ' />';
                                         }
                                     }
@@ -308,7 +308,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) {
@@ -318,11 +318,11 @@ 
                             }
                             $lines[] = '<news:news>';
                             $lines[] = '<news:publication>';
-                            $lines[] = '<news:name>' . $metaBundle->metaSitemapVars->newsPublicationName . '</news:name>';
-                            $lines[] = '<news:language>' . $language . '</news:language>';
+                            $lines[] = '<news:name>'.$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>' . $element->title . '</news:title>';
+                            $lines[] = '<news:publication_date>'.$dateUpdated->format(DateTime::W3C).'</news:publication_date>';
+                            $lines[] = '<news:title>'.$element->title.'</news:title>';
                             $lines[] = '</news:news>';
                         }
                     }
@@ -420,11 +420,11 @@ 
         $lines[] = '</urlset>';
 
         $cache = Craft::$app->getCache();
-        $cacheKey = SitemapTemplate::CACHE_KEY . $groupId . $type . $handle . $siteId;
+        $cacheKey = SitemapTemplate::CACHE_KEY.$groupId.$type.$handle.$siteId;
         $dependency = new TagDependency([
             'tags' => [
                 SitemapTemplate::GLOBAL_SITEMAP_CACHE_TAG,
-                SitemapTemplate::SITEMAP_CACHE_TAG . $handle . $siteId,
+                SitemapTemplate::SITEMAP_CACHE_TAG.$handle.$siteId,
             ],
         ]);
         $lines = implode('', $lines);
@@ -437,10 +437,10 @@ 
         $result = $cache->set($cacheKey, $lines, $cacheDuration, $dependency);
         // Remove the queue job id from the cache too
         $cache->delete($queueJobCacheKey);
-        Craft::debug('Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey, __METHOD__);
+        Craft::debug('Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey, __METHOD__);
         // 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
         /** @var FastcgiCacheBust $plugin */
@@ -556,7 +556,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 ?? '');
@@ -569,9 +569,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($fieldName) && !empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<image:' . $propName . '>';
+                            $lines[] = '<image:'.$propName.'>';
                             $lines[] = Html::encode($asset[$fieldName]);
-                            $lines[] = '</image:' . $propName . '>';
+                            $lines[] = '</image:'.$propName.'>';
                         }
                     }
                     $lines[] = '</image:image>';
@@ -587,9 +587,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($fieldName) && !empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<video:' . $propName . '>';
+                            $lines[] = '<video:'.$propName.'>';
                             $lines[] = Html::encode($asset[$fieldName]);
-                            $lines[] = '</video:' . $propName . '>';
+                            $lines[] = '</video:'.$propName.'>';
                         }
                     }
                     $lines[] = '</video:video>';
@@ -605,7 +605,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>';