nystudio107 / craft-seomatic

src/services/Helper.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
     {
         $baseUrl = UrlHelper::hostInfo(UrlHelper::siteUrl($path));
 
-        return rtrim($baseUrl, '/') . '/' . ltrim($path, '/');
+        return rtrim($baseUrl, '/').'/'.ltrim($path, '/');
     }
 
     /**
@@ -107,7 +107,7 @@ 
 
         $metaSiteVars = Seomatic::$plugin->metaContainers->metaSiteVars;
         if ($metaSiteVars && !empty($metaSiteVars->siteLinksQueryInput)) {
-            $result = 'required name=' . $metaSiteVars->siteLinksQueryInput;
+            $result = 'required name='.$metaSiteVars->siteLinksQueryInput;
         }
 
         return $result;
@@ -568,8 +568,8 @@ 
      */
     public function isInherited(InheritableSettingsModel $settingCollection, $settingName)
     {
-        $explicitInherit = array_key_exists($settingName, (array)$settingCollection->inherited);
-        $explicitOverride = array_key_exists($settingName, (array)$settingCollection->overrides);
+        $explicitInherit = array_key_exists($settingName, (array) $settingCollection->inherited);
+        $explicitOverride = array_key_exists($settingName, (array) $settingCollection->overrides);
 
         if ($explicitInherit || $explicitOverride) {
             return $explicitInherit && !$explicitOverride;

src/services/Title.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
      */
     public function add($metaItem, string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaTitleContainer::CONTAINER_TYPE . $handle;
+        $key = MetaTitleContainer::CONTAINER_TYPE.$handle;
         Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key);
 
         /** @var MetaTitle $metaItem */
@@ -89,7 +89,7 @@ 
      */
     public function container(string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaTitleContainer::CONTAINER_TYPE . $handle;
+        $key = MetaTitleContainer::CONTAINER_TYPE.$handle;
 
         return Seomatic::$plugin->metaContainers->getMetaContainer($key);
     }

src/services/Tag.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
      */
     public function add($metaItem, string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaTagContainer::CONTAINER_TYPE . $handle;
+        $key = MetaTagContainer::CONTAINER_TYPE.$handle;
         Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key);
 
         /** @var MetaTag $metaItem */
@@ -100,7 +100,7 @@ 
      */
     public function container(string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaTagContainer::CONTAINER_TYPE . $handle;
+        $key = MetaTagContainer::CONTAINER_TYPE.$handle;
 
         return Seomatic::$plugin->metaContainers->getMetaContainer($key);
     }

src/services/Script.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
      */
     public function add($metaItem, string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaScriptContainer::CONTAINER_TYPE . $handle;
+        $key = MetaScriptContainer::CONTAINER_TYPE.$handle;
         Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key);
 
         /** @var MetaScript $metaItem */
@@ -89,7 +89,7 @@ 
      */
     public function container(string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaScriptContainer::CONTAINER_TYPE . $handle;
+        $key = MetaScriptContainer::CONTAINER_TYPE.$handle;
 
         return Seomatic::$plugin->metaContainers->getMetaContainer($key);
     }

src/services/JsonLd.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function add($metaItem, string $handle = self::GENERAL_HANDLE): MetaJsonLd
     {
-        $key = MetaJsonLdContainer::CONTAINER_TYPE . $handle;
+        $key = MetaJsonLdContainer::CONTAINER_TYPE.$handle;
         Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key);
 
         /** @var MetaJsonLd $metaItem */
@@ -96,7 +96,7 @@ 
      */
     public function container(string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaJsonLdContainer::CONTAINER_TYPE . $handle;
+        $key = MetaJsonLdContainer::CONTAINER_TYPE.$handle;
 
         return Seomatic::$plugin->metaContainers->getMetaContainer($key);
     }

src/services/Link.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
      */
     public function add($metaItem, string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaLinkContainer::CONTAINER_TYPE . $handle;
+        $key = MetaLinkContainer::CONTAINER_TYPE.$handle;
         Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key);
 
         /** @var MetaLink $metaItem */
@@ -99,7 +99,7 @@ 
      */
     public function container(string $handle = self::GENERAL_HANDLE)
     {
-        $key = MetaLinkContainer::CONTAINER_TYPE . $handle;
+        $key = MetaLinkContainer::CONTAINER_TYPE.$handle;
 
         return Seomatic::$plugin->metaContainers->getMetaContainer($key);
     }

src/console/controllers/SitemapController.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function actionGenerate()
     {
-        echo 'Generating sitemap' . PHP_EOL;
+        echo 'Generating sitemap'.PHP_EOL;
         if ($this->siteId !== null) {
             $siteIds[] = $this->siteId;
         } else {
@@ -116,7 +116,7 @@ 
                         ]);
                     }
 
-                    echo '---' . PHP_EOL;
+                    echo '---'.PHP_EOL;
                 }
             }
         }

src/models/SitemapTemplate.php

Spacing +11 added lines, -11 removed lines

@@ -148,9 +148,9 @@ 
         }
 
         $cache = Craft::$app->getCache();
-        $uniqueKey = $groupId . $type . $handle . $siteId;
-        $cacheKey = self::CACHE_KEY . $uniqueKey;
-        $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY . $uniqueKey;
+        $uniqueKey = $groupId.$type.$handle.$siteId;
+        $cacheKey = self::CACHE_KEY.$uniqueKey;
+        $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY.$uniqueKey;
         $result = $cache->get($cacheKey);
         // If the sitemap isn't cached, start a job to create it
         // Even if it is cached, if $throwException === false we should regenerate it, as it is part of
@@ -189,7 +189,7 @@ 
                 $dependency = new TagDependency([
                     'tags' => [
                         self::GLOBAL_SITEMAP_CACHE_TAG,
-                        self::CACHE_KEY . $uniqueKey,
+                        self::CACHE_KEY.$uniqueKey,
                     ],
                 ]);
                 $cache->set($queueJobCacheKey, $jobId, $cacheDuration, $dependency);
@@ -221,11 +221,11 @@ 
                 // Return an empty XML document
                 $lines[] = '<?xml version="1.0" encoding="UTF-8"?>';
                 $lines[] = '<?xml-stylesheet type="text/xsl" href="sitemap-empty.xsl"?>';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'This sitemap has not been generated yet.') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'If you are seeing this in local dev or an') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'environment with `devMode` on, caches only') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'last for 30 seconds in local dev, so it is') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'normal for the sitemap to not be cached.') . ' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'This sitemap has not been generated yet.').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'If you are seeing this in local dev or an').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'environment with `devMode` on, caches only').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'last for 30 seconds in local dev, so it is').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'normal for the sitemap to not be cached.').' -->';
                 $lines[] = '<urlset>';
                 $lines[] = '</urlset>';
             }
@@ -246,9 +246,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/models/metalink/CanonicalLink.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                 // Craft adds the `tokenParam` URL param back in via UrlHelper, strip it again
                 if (Seomatic::$plugin->metaContainers->paginationPage === '1') {
                     $token = Craft::$app->getConfig()->getGeneral()->tokenParam;
-                    $url = preg_replace('~([?&])' . $token . '=[^&]*~', '$1', $url);
+                    $url = preg_replace('~([?&])'.$token.'=[^&]*~', '$1', $url);
                     $url = rtrim($url, '?&');
                     $url = str_replace(['&&', '?&'], ['&', '?'], $url);
                     $data['href'] = $url;