nystudio107 / craft-seomatic

src/models/Settings.php

Spacing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
      *     'default' => 'http://example.com/',
      *     'spanish' => 'http://example.com/es/',
      * ],     */
-    public string|array $siteUrlOverride = '';
+    public string | array $siteUrlOverride = '';
 
     /**
      * @var int|null

src/helpers/Text.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->truncate($length, $substring);
+            $result = (string) Stringy::create($string)->truncate($length, $substring);
         }
 
         return $result;
@@ -100,7 +100,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->safeTruncate($length, $substring);
+            $result = (string) Stringy::create($string)->safeTruncate($length, $substring);
         }
 
         return $result;
@@ -134,9 +134,9 @@ 
             $result = self::smartStripTags(Doxter::$plugin->getService()->parseMarkdown($field->getRaw()));
         } else {
             if (self::isArrayLike($field)) {
-                $result = self::smartStripTags((string)$field[0]);
+                $result = self::smartStripTags((string) $field[0]);
             } else {
-                $result = self::smartStripTags((string)$field);
+                $result = self::smartStripTags((string) $field);
             }
         }
 
@@ -163,7 +163,7 @@ 
             $tags = $tags->all();
         }
         foreach ($tags as $tag) {
-            $result .= $tag->title . ', ';
+            $result .= $tag->title.', ';
         }
         $result = rtrim($result, ', ');
 
@@ -205,7 +205,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -247,7 +247,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -297,7 +297,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -396,7 +396,7 @@ 
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         $str = rawurldecode($str);
         // Remove any linebreaks
-        $str = (string)preg_replace("/\r|\n/", "", $str);
+        $str = (string) preg_replace("/\r|\n/", "", $str);
         $str = HtmlPurifier::process($str, ['HTML.Allowed' => '']);
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         // Remove any embedded Twig code
@@ -487,7 +487,7 @@ 
             $language = 'English';
         }
 
-        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\' . ucfirst($language);
+        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\'.ucfirst($language);
         if (class_exists($className)) {
             $stopWords = new $className();
         }

src/fields/SeoSettings.php

Spacing +8 added lines, -8 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,14 +388,14 @@ 
             $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.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
                 ],
             ]);
             $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/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/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/models/SitemapTemplate.php

Spacing +9 added lines, -9 removed lines

@@ -140,10 +140,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, render it immediately
@@ -160,8 +160,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,
                     ],
                 ]);
 
@@ -173,7 +173,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
@@ -187,7 +187,7 @@ 
             }
         } else {
             if (Craft::$app instanceof ConsoleApplication) {
-                echo 'Found in cache' . PHP_EOL;
+                echo 'Found in cache'.PHP_EOL;
             }
         }
 
@@ -203,9 +203,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/seoelements/SeoEntry.php

Spacing +3 added lines, -3 removed lines

@@ -223,7 +223,7 @@ 
             ->limit($metaBundle->metaSitemapVars->sitemapLimit);
         if ($metaBundle->sourceType === 'structure'
             && !empty($metaBundle->metaSitemapVars->structureDepth)) {
-            $query->level('<=' . $metaBundle->metaSitemapVars->structureDepth);
+            $query->level('<='.$metaBundle->metaSitemapVars->structureDepth);
         }
 
         return $query;
@@ -271,7 +271,7 @@ 
         if (!empty($typeId)) {
             $query
                 ->andWhere([
-                    'typeId' => (int)$typeId,
+                    'typeId' => (int) $typeId,
                 ]);
         }
         $element = $query->one();
@@ -398,7 +398,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
                 'sourceType' => $sourceModel->type,
             ]

src/controllers/SettingsController.php

Indentation +3 added lines, -3 removed lines

@@ -508,8 +508,8 @@ 
         string $sourceBundleType,
         string $sourceHandle,
         string $siteHandle = null,
-               $typeId = null,
-               $loadFromSiteHandle = null,
+                $typeId = null,
+                $loadFromSiteHandle = null,
     ): Response {
         $variables = [];
         // @TODO: Let people choose an entry/categorygroup/product as the preview
@@ -1222,7 +1222,7 @@ 
         string $sourceHandle,
         string $groupName,
         array  &$variables,
-               $typeId = null,
+                $typeId = null,
     ) {
         $variables['textFieldSources'] = array_merge(
             ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],

Spacing +46 added lines, -46 removed lines

@@ -88,7 +88,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -132,7 +132,7 @@ 
         $variables['pluginName'] = Seomatic::$settings->pluginName;
         $variables['title'] = $templateTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -140,7 +140,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/dashboard' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/dashboard'.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'dashboard';
@@ -163,11 +163,11 @@ 
         foreach ($variables['metaBundles'] as $metaBundle) {
             $stat = 0;
             foreach (self::SEO_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaGlobalVars[$setupField]);
+                $stat += (int) !empty($metaBundle->metaGlobalVars[$setupField]);
                 $value = $variables['contentSetupChecklist'][$setupField]['value'] ?? 0;
                 $variables['contentSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => $value + (int)!empty($metaBundle->metaGlobalVars[$setupField]),
+                    'value' => $value + (int) !empty($metaBundle->metaGlobalVars[$setupField]),
                 ];
             }
             $stat = round($numGrades - (($stat * $numGrades) / $numFields));
@@ -178,16 +178,16 @@ 
         }
         // Global SEO grades
         Seomatic::$previewingMetaContainers = true;
-        $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle((int)$siteId);
+        $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle((int) $siteId);
         Seomatic::$previewingMetaContainers = false;
         if ($metaBundle !== null) {
             $stat = 0;
             $variables['globalSetupChecklist'] = [];
             foreach (self::SEO_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaGlobalVars[$setupField]);
+                $stat += (int) !empty($metaBundle->metaGlobalVars[$setupField]);
                 $variables['globalSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaGlobalVars[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaGlobalVars[$setupField]),
                 ];
             }
             $stat = round(($stat / $numFields) * 100);
@@ -197,17 +197,17 @@ 
             $stat = 0;
             $variables['siteSetupChecklist'] = [];
             foreach (self::SITE_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaSiteVars[$setupField]);
+                $stat += (int) !empty($metaBundle->metaSiteVars[$setupField]);
                 $variables['siteSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaSiteVars[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaSiteVars[$setupField]),
                 ];
             }
             foreach (self::IDENTITY_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaSiteVars->identity[$setupField]);
+                $stat += (int) !empty($metaBundle->metaSiteVars->identity[$setupField]);
                 $variables['siteSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaSiteVars->identity[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaSiteVars->identity[$setupField]),
                 ];
             }
             $stat = round(($stat / $numFields) * 100);
@@ -255,7 +255,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -263,11 +263,11 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/global/general' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/global/general'.$siteHandleUri),
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/global/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/global/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'global';
@@ -275,14 +275,14 @@ 
         $this->setGlobalFieldSourceVariables($variables);
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'global' . '/' . $subSection;
+        $variables['controllerHandle'] = 'global'.'/'.$subSection;
         $variables['currentSubSection'] = $subSection;
         // Meta bundle settings
         Seomatic::$previewingMetaContainers = true;
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         if ($editedMetaBundle) {
@@ -336,11 +336,11 @@ 
         // Preview the meta containers
         Seomatic::$plugin->metaContainers->previewMetaContainers(
             MetaBundles::GLOBAL_META_BUNDLE,
-            (int)$variables['currentSiteId']
+            (int) $variables['currentSiteId']
         );
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/global/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/global/'.$subSection, $variables);
     }
 
     /**
@@ -472,7 +472,7 @@ 
         $variables['pluginName'] = Seomatic::$settings->pluginName;
         $variables['title'] = $templateTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -480,7 +480,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/content' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/content'.$siteHandleUri),
             ],
         ];
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
@@ -521,7 +521,7 @@ 
         $siteHandle = $this->getCpSiteHandle($siteHandle);
         $siteId = $this->getSiteIdFromHandle($siteHandle);
         if (is_string($typeId)) {
-            $typeId = (int)$typeId;
+            $typeId = (int) $typeId;
         }
         if (empty($typeId)) {
             $typeId = null;
@@ -539,7 +539,7 @@ 
             $currentType = reset($typeMenu);
             $variables['currentType'] = $typeMenu[$typeId] ?? $currentType;
             $variables['currentTypeId'] = $typeId ?? key($typeMenu);
-            $typeId = (int)$variables['currentTypeId'];
+            $typeId = (int) $variables['currentTypeId'];
         }
         // If there's only one EntryType, don't bother displaying the menu
         if (count($typeMenu) === 1) {
@@ -571,7 +571,7 @@ 
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getMetaBundleBySourceHandle(
             $sourceBundleType,
@@ -597,7 +597,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - Content SEO - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['siteHandleUri'] = $siteHandleUri;
         $variables['crumbs'] = [
             [
@@ -606,10 +606,10 @@ 
             ],
             [
                 'label' => 'Content SEO',
-                'url' => UrlHelper::cpUrl('seomatic/content' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/content'.$siteHandleUri),
             ],
             [
-                'label' => $metaBundle->sourceName . ' · ' . $subSectionTitle,
+                'label' => $metaBundle->sourceName.' · '.$subSectionTitle,
                 'url' => UrlHelper::cpUrl("seomatic/edit-content/${subSection}/${sourceBundleType}/${sourceHandle}"),
             ],
         ];
@@ -639,13 +639,13 @@ 
         // Preview the meta containers
         Seomatic::$plugin->metaContainers->previewMetaContainers(
             $uri,
-            (int)$variables['currentSiteId'],
+            (int) $variables['currentSiteId'],
             false,
             false
         );
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/content/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/content/'.$subSection, $variables);
     }
 
     /**
@@ -666,7 +666,7 @@ 
         $bundleSettings = $request->getParam('metaBundleSettings');
         $sitemapSettings = $request->getParam('metaSitemapVars');
         if (is_string($typeId)) {
-            $typeId = (int)$typeId;
+            $typeId = (int) $typeId;
         }
         // Set the element type in the template
         $elementName = '';
@@ -738,7 +738,7 @@ 
         if ($subSection === 'social') {
             $subSectionSuffix = ' Media';
         }
-        $subSectionTitle = Craft::t('seomatic', ucfirst($subSection) . $subSectionSuffix);
+        $subSectionTitle = Craft::t('seomatic', ucfirst($subSection).$subSectionSuffix);
         // Asset bundle
         try {
             Seomatic::$view->registerAssetBundle(SeomaticAsset::class);
@@ -756,7 +756,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -764,11 +764,11 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/site/identity' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/site/identity'.$siteHandleUri),
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/site/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/site/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'site';
@@ -776,14 +776,14 @@ 
 
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'site' . '/' . $subSection;
+        $variables['controllerHandle'] = 'site'.'/'.$subSection;
 
         // The site settings for the appropriate meta bundle
         Seomatic::$previewingMetaContainers = true;
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         Seomatic::$previewingMetaContainers = false;
@@ -801,7 +801,7 @@ 
         $variables['elementType'] = Asset::class;
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/site/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/site/'.$subSection, $variables);
     }
 
     /**
@@ -933,7 +933,7 @@ 
         $siteId = $this->getSiteIdFromHandle($siteHandle);
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'tracking' . '/' . $subSection;
+        $variables['controllerHandle'] = 'tracking'.'/'.$subSection;
         $variables['currentSubSection'] = $subSection;
 
         // The script meta containers for the global meta bundle
@@ -941,7 +941,7 @@ 
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         if ($editedMetaBundle) {
@@ -981,7 +981,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -993,7 +993,7 @@ 
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/tracking/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/tracking/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'tracking';
@@ -1146,7 +1146,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
             }
             $siteId = $site->id;
         } else {
@@ -1183,7 +1183,7 @@ 
                 if (!empty($variables['enabledSiteIds'])) {
                     $siteId = reset($variables['enabledSiteIds']);
                 } else {
-                    $this->requirePermission('editSite:' . $siteId);
+                    $this->requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -1203,7 +1203,7 @@ 
         if ($variables['showSites']) {
             $variables['sitesMenuLabel'] = Craft::t(
                 'site',
-                $sites->getSiteById((int)$variables['currentSiteId'])->name
+                $sites->getSiteById((int) $variables['currentSiteId'])->name
             );
         } else {
             $variables['sitesMenuLabel'] = '';
@@ -1270,7 +1270,7 @@ 
                $typeId = null,
     ) {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromSource(
                 $sourceBundleType,
                 $sourceHandle,
@@ -1280,7 +1280,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromSource(
                 $sourceBundleType,
                 $sourceHandle,

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;
                             }
                         }
@@ -561,7 +561,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 @@ 
                 ->from(['{{%seomatic_metabundles}}'])
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE]);
 
-            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]);
@@ -812,10 +812,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(
@@ -843,7 +843,7 @@ 
 
 
             // Handle the mainEntityOfPage
-            if (!in_array('mainEntityOfPage', (array)$seoSettingsField->generalEnabledFields, false)) {
+            if (!in_array('mainEntityOfPage', (array) $seoSettingsField->generalEnabledFields, false)) {
                 $metaBundle->metaGlobalVars->mainEntityOfPage = '';
             }
             // metaSiteVars