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 */

src/helpers/Container.php

Spacing +7 added lines, -7 removed lines

@@ -90,25 +90,25 @@
         }
         // 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,
+                $metaContainers::METACONTAINER_CACHE_TAG.$sourceId.$sourceBundleType.$siteId,
+                $metaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                $metaContainers::METACONTAINER_CACHE_TAG.$cacheKey,
+                $metaContainers::METACONTAINER_CACHE_TAG.$sourceId.$sourceBundleType,
             ],
         ]);
 
         $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/fields/SeoSettings.php

Spacing +7 added lines, -7 removed lines

@@ -376,7 +376,7 @@ 
         if ($element !== null && $element->uri !== null) {
             $siteId = $element->siteId;
             $uri = $element->uri;
-            $cacheKey = self::CACHE_KEY . $uri . $siteId . $this->elementDisplayPreviewType;
+            $cacheKey = self::CACHE_KEY.$uri.$siteId.$this->elementDisplayPreviewType;
             $metaBundleSourceType = Seomatic::$plugin->seoElements->getMetaBundleTypeFromElement($element);
             $seoElement = Seomatic::$plugin->seoElements->getSeoElementByMetaBundleType($metaBundleSourceType);
             $metaBundleSourceType = SeoEntry::getMetaBundleType();
@@ -387,15 +387,15 @@ 
             $dependency = new TagDependency([
                 'tags' => [
                     MetaContainers::GLOBAL_METACONTAINER_CACHE_TAG,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType,
                 ],
             ]);
             $cache = Craft::$app->getCache();
             $cacheDuration = null;
             $html = $cache->getOrSet(
-                self::CACHE_KEY . $cacheKey,
+                self::CACHE_KEY.$cacheKey,
                 function() use ($uri, $siteId, $element) {
                     Seomatic::$plugin->metaContainers->previewMetaContainers($uri, $siteId, true, true, $element);
                     $variables = [
@@ -437,7 +437,7 @@ 
         array   &$variables
     ) {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::TEXT_FIELD_CLASS_KEY,
@@ -445,7 +445,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::ASSET_FIELD_CLASS_KEY,

src/services/MetaBundles.php

Spacing +11 added lines, -11 removed lines

@@ -194,7 +194,7 @@ 
      * @param MetaBundle $metaBundle
      * @param bool $forceUpdate
      */
-    public function syncBundleWithConfig(MetaBundle &$metaBundle, bool $forceUpdate = false)
+    public function syncBundleWithConfig(MetaBundle & $metaBundle, bool $forceUpdate = false)
     {
         $prevMetaBundle = $metaBundle;
         $config = [];
@@ -275,8 +275,8 @@ 
      */
     public function updateMetaBundle(MetaBundle $metaBundle, int $siteId)
     {
-        $metaBundle->sourceName = (string)$metaBundle->sourceName;
-        $metaBundle->sourceTemplate = (string)$metaBundle->sourceTemplate;
+        $metaBundle->sourceName = (string) $metaBundle->sourceName;
+        $metaBundle->sourceTemplate = (string) $metaBundle->sourceTemplate;
         // Make sure it validates
         if ($metaBundle->validate(null, true)) {
             // Save it out to a record
@@ -286,7 +286,7 @@ 
                 'sourceSiteId' => $siteId,
             ];
             if ($metaBundle->typeId !== null) {
-                $metaBundle->typeId = (int)$metaBundle->typeId;
+                $metaBundle->typeId = (int) $metaBundle->typeId;
             }
             if (!empty($metaBundle->typeId)) {
                 $params['typeId'] = $metaBundle->typeId;
@@ -303,7 +303,7 @@ 
             // The issue was that the containers were getting saved to the db with a hard-coded setting in them, because they'd
             // been set that way by the environment, whereas to be changeable via the GUI, it needs to be set to {seomatic.meta.robots}
             /** @var RobotsTag|null $robotsTag */
-            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE]->data['robots'] ?? null;
+            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE]->data['robots'] ?? null;
             if (!empty($robotsTag)) {
                 $robotsTag->content = $robotsTag->environment['live']['content'] ?? '{seomatic.meta.robots}';
             }
@@ -384,7 +384,7 @@ 
                     $metaBundleDefaults = ArrayHelper::merge(
                         $seoElement::metaBundleConfig($sourceModel),
                         [
-                            'sourceTemplate' => (string)$siteSetting->template,
+                            'sourceTemplate' => (string) $siteSetting->template,
                             'sourceSiteId' => $siteSetting->siteId,
                             'sourceAltSiteSettings' => $siteSettingsArray,
                             'sourceDateUpdated' => $dateUpdated,
@@ -433,7 +433,7 @@ 
     public function getMetaBundleBySourceHandle(string $sourceBundleType, string $sourceHandle, int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId];
@@ -520,7 +520,7 @@ 
                             /** @var Section|CategoryGroup|ProductType $sourceModel */
                             $sourceModel = $seoElement::sourceModelFromId($sourceId);
                             if ($sourceModel !== null) {
-                                $metaBundle->sourceName = (string)$sourceModel->name;
+                                $metaBundle->sourceName = (string) $sourceModel->name;
                                 $metaBundle->sourceHandle = $sourceModel->handle;
                             }
                         }
@@ -559,7 +559,7 @@ 
     public function getMetaBundleBySourceId(string $sourceBundleType, int $sourceId, ?int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId];
@@ -753,7 +753,7 @@ 
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE])
                 ->andWhere(['typeId' => null]);
 
-            if ((int)$sourceSiteId !== 0) {
+            if ((int) $sourceSiteId !== 0) {
                 $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]);
             }
             if ($filter !== '') {
@@ -790,7 +790,7 @@ 
     public function getContentMetaBundleForElement(Element $element)
     {
         $source = $this->getMetaSourceFromElement($element);
-        $key = implode(".", $source) . '.' . $element->siteId;
+        $key = implode(".", $source).'.'.$element->siteId;
 
         if (empty($this->elementContentMetaBundles[$key])) {
             $this->elementContentMetaBundles[$key] = $this->getMetaBundleBySourceId($source[1], $source[0], $element->siteId, $source[4]);

src/Seomatic.php

Spacing +14 added lines, -14 removed lines

@@ -286,7 +286,7 @@ 
         self::$cacheDuration = self::$devMode
             ? self::DEVMODE_CACHE_DURATION
             : self::$settings->metaCacheDuration ?? null;
-        self::$cacheDuration = self::$cacheDuration === null ? null : (int)self::$cacheDuration;
+        self::$cacheDuration = self::$cacheDuration === null ? null : (int) self::$cacheDuration;
         self::$environment = EnvironmentHelper::determineEnvironment();
         MetaValueHelper::cache();
         // Version helpers
@@ -408,7 +408,7 @@ 
             $lastSegment = end($segments);
             $site = Craft::$app->getSites()->getSiteByHandle($lastSegment);
             if ($site !== null) {
-                $siteSuffix = '/' . $lastSegment;
+                $siteSuffix = '/'.$lastSegment;
             }
         }
         /** @var User $currentUser */
@@ -417,31 +417,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;
@@ -638,14 +638,14 @@ 
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '

src/models/SitemapCustomTemplate.php

Spacing +5 added lines, -5 removed lines

@@ -127,18 +127,18 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SITEMAP_CACHE_TAG,
-                self::SITEMAP_CACHE_TAG . $handle . $siteId,
+                self::SITEMAP_CACHE_TAG.$handle.$siteId,
             ],
         ]);
 
         $cacheDuration = Seomatic::$plugin->helper::isPreview() ? 1 : Seomatic::$cacheDuration;
 
-        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';
     }
 
     /**
@@ -151,7 +151,7 @@ 
 
         $cacheDuration = Seomatic::$plugin->helper::isPreview() ? 1 : Seomatic::$cacheDuration;
 
-        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/helpers/Schema.php

Spacing +16 added lines, -16 removed lines

@@ -99,7 +99,7 @@ 
             // Go from most specific type to least specific type
             foreach (self::SCHEMA_TYPES as $schemaType) {
                 if (!empty($settings[$schemaType]) && ($settings[$schemaType] !== 'none')) {
-                    $result = $settings[$schemaType] . self::SCHEMA_PATH_DELIMITER . $result;
+                    $result = $settings[$schemaType].self::SCHEMA_PATH_DELIMITER.$result;
                 }
             }
         }
@@ -125,7 +125,7 @@ 
             $description = $result['schemaTypeDescription'];
             $description = preg_replace("`\[\[([A-z]*)\]\]`", '[$1](https://schema.org/$1)', $description);
             $description = preg_replace('/\s+/', ' ', $description);
-            $description = Markdown::process((string)$description);
+            $description = Markdown::process((string) $description);
             $description = str_replace(['<p>', '</p>', '\n'], ['', '', ' '], $description);
             $result['schemaTypeDescription'] = $description;
         }
@@ -144,7 +144,7 @@ 
     {
         $result = [];
         while ($schemaType) {
-            $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
+            $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
             if (class_exists($className)) {
                 $classRef = new ReflectionClass($className);
                 $staticProps = $classRef->getStaticProperties();
@@ -243,15 +243,15 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaArray',
+                self::SCHEMA_CACHE_TAG.'schemaArray',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaArray',
+            self::CACHE_KEY.'schemaArray',
             function() use ($path) {
                 Craft::info(
-                    'schemaArray cache miss: ' . $path,
+                    'schemaArray cache miss: '.$path,
                     __METHOD__
                 );
                 $filePath = Craft::getAlias('@nystudio107/seomatic/resources/schema/tree.jsonld');
@@ -316,12 +316,12 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaTree',
+                self::SCHEMA_CACHE_TAG.'schemaTree',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaTree',
+            self::CACHE_KEY.'schemaTree',
             function() {
                 Craft::info(
                     'schemaTree cache miss',
@@ -385,11 +385,11 @@ 
         foreach ($typesArray as $key => $value) {
             $indent = html_entity_decode(str_repeat('&nbsp;', $indentLevel));
             if (is_array($value)) {
-                $result[$key] = $indent . $key;
+                $result[$key] = $indent.$key;
                 $value = self::flattenSchemaArray($value, $indentLevel + self::MENU_INDENT_STEP);
                 $result = array_merge($result, $value);
             } else {
-                $result[$key] = $indent . $value;
+                $result[$key] = $indent.$value;
             }
         }
 
@@ -483,7 +483,7 @@ 
             $children = [];
             $name = $typesArray['name'];
             // Construct a path-based $id, excluding the top-level `Thing` schema
-            $id = $name === 'Thing' ? '' : $path . self::SCHEMA_PATH_DELIMITER . $name;
+            $id = $name === 'Thing' ? '' : $path.self::SCHEMA_PATH_DELIMITER.$name;
             $id = ltrim($id, self::SCHEMA_PATH_DELIMITER);
             // Make sure we have at most 3 specifiers in the schema path
             $parts = explode(self::SCHEMA_PATH_DELIMITER, $id);
@@ -510,12 +510,12 @@ 
             $schemaPath = explode(self::SCHEMA_PATH_DELIMITER, $id);
             // Use only the specific (last) type for now, rather than the complete path of types
             $schemaPath = [end($schemaPath)];
-            if ((bool)array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
-                $name .= ' (' . Craft::t('seomatic', 'Google rich result') . ')';
+            if ((bool) array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
+                $name .= ' ('.Craft::t('seomatic', 'Google rich result').')';
             }
             // Mark it as pending, if applicable
             if (isset($typesArray['pending']) && $typesArray['pending']) {
-                $name .= ' (' . Craft::t('seomatic', 'pending') . ')';
+                $name .= ' ('.Craft::t('seomatic', 'pending').')';
             }
             $result['label'] = $name;
             $result['id'] = $id;
@@ -534,12 +534,12 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'googleRichSnippets',
+                self::SCHEMA_CACHE_TAG.'googleRichSnippets',
             ],
         ]);
         $cache = Craft::$app->getCache();
         return $cache->getOrSet(
-            self::CACHE_KEY . 'googleRichSnippets',
+            self::CACHE_KEY.'googleRichSnippets',
             function() {
                 Craft::info(
                     'googleRichSnippets cache miss',