nystudio107 / craft-seomatic

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

@@ -89,7 +89,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -133,7 +133,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,
@@ -141,7 +141,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/dashboard' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/dashboard'.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'dashboard';
@@ -164,11 +164,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));
@@ -179,16 +179,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);
@@ -198,17 +198,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);
@@ -256,7 +256,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,
@@ -264,11 +264,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';
@@ -276,14 +276,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) {
@@ -338,11 +338,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);
     }
 
     /**
@@ -474,7 +474,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,
@@ -482,7 +482,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/content' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/content'.$siteHandleUri),
             ],
         ];
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
@@ -523,7 +523,7 @@ 
         $siteHandle = $this->getCpSiteHandle($siteHandle);
         $siteId = $this->getSiteIdFromHandle($siteHandle);
         if (is_string($typeId)) {
-            $typeId = (int)$typeId;
+            $typeId = (int) $typeId;
         }
         if (empty($typeId)) {
             $typeId = null;
@@ -541,7 +541,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) {
@@ -573,7 +573,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,
@@ -599,7 +599,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'] = [
             [
@@ -608,10 +608,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}"),
             ],
         ];
@@ -642,13 +642,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);
     }
 
     /**
@@ -669,7 +669,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 = '';
@@ -741,7 +741,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);
@@ -759,7 +759,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,
@@ -767,11 +767,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';
@@ -779,14 +779,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;
@@ -805,7 +805,7 @@ 
         $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/site/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/site/'.$subSection, $variables);
     }
 
     /**
@@ -937,7 +937,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
@@ -945,7 +945,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) {
@@ -985,7 +985,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,
@@ -997,7 +997,7 @@ 
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/tracking/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/tracking/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'tracking';
@@ -1150,7 +1150,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 {
@@ -1187,7 +1187,7 @@ 
                 if (!empty($variables['enabledSiteIds'])) {
                     $siteId = reset($variables['enabledSiteIds']);
                 } else {
-                    $this->requirePermission('editSite:' . $siteId);
+                    $this->requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -1207,7 +1207,7 @@ 
         if ($variables['showSites']) {
             $variables['sitesMenuLabel'] = Craft::t(
                 'site',
-                $sites->getSiteById((int)$variables['currentSiteId'])->name
+                $sites->getSiteById((int) $variables['currentSiteId'])->name
             );
         } else {
             $variables['sitesMenuLabel'] = '';
@@ -1274,7 +1274,7 @@ 
                $typeId = null,
     ) {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromSource(
                 $sourceBundleType,
                 $sourceHandle,
@@ -1284,7 +1284,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;
                 }

src/services/MetaContainers.php

Spacing +17 added lines, -17 removed lines

@@ -182,7 +182,7 @@ 
         // Get the page number of this request
         $request = Craft::$app->getRequest();
         if (!$request->isConsoleRequest) {
-            $this->paginationPage = (string)$request->pageNum;
+            $this->paginationPage = (string) $request->pageNum;
         }
     }
 
@@ -251,10 +251,10 @@ 
         $dependency = $this->containerDependency;
         $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY;
         list($this->metaGlobalVars, $this->metaSiteVars) = Craft::$app->getCache()->getOrSet(
-            self::GLOBALS_CACHE_KEY . $uniqueKey,
+            self::GLOBALS_CACHE_KEY.$uniqueKey,
             function() use ($uniqueKey) {
                 Craft::info(
-                    self::GLOBALS_CACHE_KEY . ' cache miss: ' . $uniqueKey,
+                    self::GLOBALS_CACHE_KEY.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
 
@@ -380,7 +380,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -405,22 +405,22 @@ 
                 }
             }
             // Get our cache key
-            $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams() . $token;
+            $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams().$token;
             // For requests with a status code of >= 400, use one cache key
             if (!$request->isConsoleRequest) {
                 $response = Craft::$app->getResponse();
                 if ($response->statusCode >= 400) {
-                    $cacheKey = $siteId . self::INVALID_RESPONSE_CACHE_KEY . $response->statusCode;
+                    $cacheKey = $siteId.self::INVALID_RESPONSE_CACHE_KEY.$response->statusCode;
                 }
             }
             // Load the meta containers
             $dependency = new TagDependency([
                 'tags' => [
                     self::GLOBAL_METACONTAINER_CACHE_TAG,
-                    self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $uri . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $cacheKey,
-                    self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$cacheKey,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType,
                 ],
             ]);
             $this->containerDependency = $dependency;
@@ -437,10 +437,10 @@ 
             } else {
                 $cache = Craft::$app->getCache();
                 list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet(
-                    self::CACHE_KEY . $cacheKey,
+                    self::CACHE_KEY.$cacheKey,
                     function() use ($uri, $siteId) {
                         Craft::info(
-                            'Meta container cache miss: ' . $uri . '/' . $siteId,
+                            'Meta container cache miss: '.$uri.'/'.$siteId,
                             __METHOD__
                         );
                         $this->loadGlobalMetaContainers($siteId);
@@ -841,10 +841,10 @@ 
         $cache = Craft::$app->getCache();
         TagDependency::invalidate(
             $cache,
-            self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId
+            self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId
         );
         Craft::info(
-            'Meta bundle cache cleared: ' . $metaBundleSourceId . ' / ' . $metaBundleSourceType . ' / ' . $siteId,
+            'Meta bundle cache cleared: '.$metaBundleSourceId.' / '.$metaBundleSourceType.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -871,9 +871,9 @@ 
         if ($siteId === null) {
             $siteId = Craft::$app->getSites()->currentSite->id ?? 1;
         }
-        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG . $uri . $siteId);
+        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG.$uri.$siteId);
         Craft::info(
-            'Meta container cache cleared: ' . $uri . ' / ' . $siteId,
+            'Meta container cache cleared: '.$uri.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -1016,7 +1016,7 @@ 
 
                     // Handle re-creating the `mainEntityOfPage` so that the model injected into the
                     // templates has the appropriate attributes
-                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE;
+                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE;
                     $generalContainer = $this->metaContainers[$generalContainerKey];
                     if (($generalContainer !== null) && !empty($generalContainer->data['mainEntityOfPage'])) {
                         /** @var MetaJsonLd $jsonLdModel */

src/helpers/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