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/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/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/console/controllers/SitemapController.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * @var    bool|array
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -64,7 +64,7 @@ 
      */
     public function actionGenerate()
     {
-        echo 'This CLI command is no longer needed because of the paginated sitemap generation' . PHP_EOL;
+        echo 'This CLI command is no longer needed because of the paginated sitemap generation'.PHP_EOL;
     }
 
     // Protected Methods

src/helpers/UrlHelper.php

Spacing +17 added lines, -17 removed lines

@@ -46,12 +46,12 @@ 
             $siteUrl = MetaValue::parseString($siteUrl);
             // Extract out just the path part
             $parts = self::decomposeUrl($path);
-            $path = $parts['path'] . $parts['suffix'];
+            $path = $parts['path'].$parts['suffix'];
             $url = self::mergeUrlWithPath($siteUrl, $path);
             // Handle trailing slashes properly for generated URLs
             $generalConfig = Craft::$app->getConfig()->getGeneral();
             if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
-                $url = rtrim($url, '/') . '/';
+                $url = rtrim($url, '/').'/';
             }
             if (!$generalConfig->addTrailingSlashesToUrls) {
                 $url = rtrim($url, '/');
@@ -73,8 +73,8 @@ 
     public static function mergeUrlWithPath(string $url, string $path): string
     {
         $overlap = 0;
-        $url = rtrim($url, '/') . '/';
-        $path = '/' . ltrim($path, '/');
+        $url = rtrim($url, '/').'/';
+        $path = '/'.ltrim($path, '/');
         $urlOffset = strlen($url);
         $pathLength = strlen($path);
         $pathOffset = 0;
@@ -86,7 +86,7 @@ 
             }
         }
 
-        return rtrim($url, '/') . '/' . ltrim(substr($path, $overlap), '/');
+        return rtrim($url, '/').'/'.ltrim(substr($path, $overlap), '/');
     }
 
     /**
@@ -158,7 +158,7 @@ 
         // Handle trailing slashes properly for generated URLs
         $generalConfig = Craft::$app->getConfig()->getGeneral();
         if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
-            $url = rtrim($url, '/') . '/';
+            $url = rtrim($url, '/').'/';
         }
         if (!$generalConfig->addTrailingSlashesToUrls && (!$preserveTrailingSlash || self::urlIsSiteIndex($url))) {
             $url = rtrim($url, '/');
@@ -178,13 +178,13 @@ 
         $urlParts = parse_url($url);
         $encodedUrl = "";
         if (isset($urlParts['scheme'])) {
-            $encodedUrl .= $urlParts['scheme'] . '://';
+            $encodedUrl .= $urlParts['scheme'].'://';
         }
         if (isset($urlParts['host'])) {
             $encodedUrl .= $urlParts['host'];
         }
         if (isset($urlParts['port'])) {
-            $encodedUrl .= ':' . $urlParts['port'];
+            $encodedUrl .= ':'.$urlParts['port'];
         }
         if (isset($urlParts['path'])) {
             $encodedUrl .= $urlParts['path'];
@@ -194,15 +194,15 @@ 
             foreach ($query as $j => $value) {
                 $value = explode('=', $value, 2);
                 if (count($value) === 2) {
-                    $query[$j] = urlencode($value[0]) . '=' . urlencode($value[1]);
+                    $query[$j] = urlencode($value[0]).'='.urlencode($value[1]);
                 } else {
                     $query[$j] = urlencode($value[0]);
                 }
             }
-            $encodedUrl .= '?' . implode('&', $query);
+            $encodedUrl .= '?'.implode('&', $query);
         }
         if (isset($urlParts['fragment'])) {
-            $encodedUrl .= '#' . $urlParts['fragment'];
+            $encodedUrl .= '#'.$urlParts['fragment'];
         }
 
         return $encodedUrl;
@@ -234,10 +234,10 @@ 
             $sitePath = parse_url(self::siteUrl('/', null, null, $site->id), PHP_URL_PATH);
             if (!empty($sitePath)) {
                 // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-                $sitePath = '/' . preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
+                $sitePath = '/'.preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
             }
             // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-            $url = '/' . preg_replace('/\/\/+/', '/', trim($url, '/'));
+            $url = '/'.preg_replace('/\/\/+/', '/', trim($url, '/'));
             // See if this url ends with a site prefix, and thus is a site index
             if (str_ends_with($url, $sitePath)) {
                 $result = true;
@@ -270,7 +270,7 @@ 
             if ($siteId !== null) {
                 $site = $sites->getSiteById($siteId, true);
                 if (!$site) {
-                    throw new Exception('Invalid site ID: ' . $siteId);
+                    throw new Exception('Invalid site ID: '.$siteId);
                 }
             }
 
@@ -315,11 +315,11 @@ 
 
         if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) {
             $url_parts = parse_url($pathOrUrl);
-            $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host'];
+            $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host'];
             $result['path'] = $url_parts['path'] ?? '';
             $result['suffix'] = '';
-            $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query'];
-            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment'];
+            $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query'];
+            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment'];
         } else {
             $result['prefix'] = '';
             $result['path'] = $pathOrUrl;

src/helpers/DynamicMeta.php

Spacing +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
     {
         if ($pageInfo !== null && $pageInfo->currentPage !== null) {
             // Let the meta containers know that this page is paginated
-            Seomatic::$plugin->metaContainers->paginationPage = (string)$pageInfo->currentPage;
+            Seomatic::$plugin->metaContainers->paginationPage = (string) $pageInfo->currentPage;
             // See if we should strip the query params
             $stripQueryParams = true;
             $pageTrigger = Craft::$app->getConfig()->getGeneral()->pageTrigger;
@@ -170,7 +170,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -190,12 +190,12 @@ 
                         $headerValue = '';
                         foreach ($href as $hrefVal) {
                             $hrefVal = UrlHelper::encodeUrl($hrefVal);
-                            $headerValue .= ('<' . $hrefVal . '>' . ',');
+                            $headerValue .= ('<'.$hrefVal.'>'.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
                         $href = UrlHelper::encodeUrl($href);
-                        $headerValue = '<' . $href . '>';
+                        $headerValue = '<'.$href.'>';
                     }
                     $headerValue .= "; rel='canonical'";
                     $response->headers->add('Link', $headerValue);
@@ -211,7 +211,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -625,7 +625,7 @@ 
                         }
                     }
                     // Never include the URL if the element isn't enabled for the site
-                    if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) {
+                    if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) {
                         $includeUrl = false;
                     }
                 } else {
@@ -833,7 +833,7 @@ 
                 if (isset($value[$day][$time])
                     && ($date = DateTimeHelper::toDateTime($value[$day][$time])) !== false
                 ) {
-                    $normalized[$day][$time] = (array)($date);
+                    $normalized[$day][$time] = (array) ($date);
                 } else {
                     $normalized[$day][$time] = null;
                 }