nystudio107 / craft-seomatic

src/helpers/Sitemap.php

Spacing +19 added lines, -19 removed 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 .= '>';
@@ -213,13 +213,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);
@@ -264,7 +264,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;
                         }
                     }
@@ -322,12 +322,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).'"'
                                                 . ' />';
                                         }
                                     }
@@ -336,7 +336,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) {
@@ -346,11 +346,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>';
                         }
                     }
@@ -571,7 +571,7 @@ 
 
                         $attributes = array_intersect_key(
                             $attributes,
-                            array_flip((array)$seoSettingsField->sitemapEnabledFields)
+                            array_flip((array) $seoSettingsField->sitemapEnabledFields)
                         );
                         $attributes = array_filter(
                             $attributes,
@@ -603,7 +603,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->getImageTransforms()->getTransformByHandle($metaBundle->metaSitemapVars->sitemapAssetTransform ?? '');
@@ -616,9 +616,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>';
@@ -634,9 +634,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>';
@@ -652,7 +652,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/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 +9 added lines, -9 removed lines

@@ -159,7 +159,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getContentColumnType(): array|string
+    public function getContentColumnType(): array | string
     {
         return Schema::TYPE_TEXT;
     }
@@ -223,7 +223,7 @@ 
             }
             // Handle the mainEntityOfPage
             $mainEntity = '';
-            if (in_array('mainEntityOfPage', (array)$this->generalEnabledFields, false) &&
+            if (in_array('mainEntityOfPage', (array) $this->generalEnabledFields, false) &&
                 !empty($config['metaBundleSettings'])) {
                 $mainEntity = SchemaHelper::getSpecificEntityType($config['metaBundleSettings'], true);
             }
@@ -377,7 +377,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();
@@ -388,15 +388,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 = [
@@ -438,7 +438,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,
@@ -446,7 +446,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 +16 added lines, -16 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];
@@ -751,7 +751,7 @@ 
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE])
                 ->andWhere(['typeId' => null]);
 
-            if ((int)$sourceSiteId !== 0) {
+            if ((int) $sourceSiteId !== 0) {
                 $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]);
             }
             if ($filter !== '') {
@@ -788,7 +788,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]);
@@ -810,10 +810,10 @@ 
         $seoSettingsField = Craft::$app->getFields()->getFieldByHandle($fieldHandle);
         if ($seoSettingsField) {
             $seoSettingsEnabledFields = array_flip(array_merge(
-                (array)$seoSettingsField->generalEnabledFields,
-                (array)$seoSettingsField->twitterEnabledFields,
-                (array)$seoSettingsField->facebookEnabledFields,
-                (array)$seoSettingsField->sitemapEnabledFields
+                (array) $seoSettingsField->generalEnabledFields,
+                (array) $seoSettingsField->twitterEnabledFields,
+                (array) $seoSettingsField->facebookEnabledFields,
+                (array) $seoSettingsField->sitemapEnabledFields
             ));
             // Always include some fields, as they are calculated even if not explicitly included
             $seoSettingsEnabledFields = array_merge(
@@ -841,7 +841,7 @@ 
 
 
             // Handle the mainEntityOfPage
-            if (!in_array('mainEntityOfPage', (array)$seoSettingsField->generalEnabledFields, false)) {
+            if (!in_array('mainEntityOfPage', (array) $seoSettingsField->generalEnabledFields, false)) {
                 $metaBundle->metaGlobalVars->mainEntityOfPage = '';
             }
             // metaSiteVars

src/Seomatic.php

Spacing +13 added lines, -13 removed lines

@@ -357,7 +357,7 @@ 
             $lastSegment = end($segments);
             $site = Craft::$app->getSites()->getSiteByHandle($lastSegment);
             if ($site !== null) {
-                $siteSuffix = '/' . $lastSegment;
+                $siteSuffix = '/'.$lastSegment;
             }
         }
         $currentUser = Craft::$app->getUser()->getIdentity();
@@ -365,31 +365,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;
@@ -585,14 +585,14 @@ 
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '