nystudio107 / craft-seomatic

src/services/Sitemaps.php

Spacing +15 added lines, -15 removed lines

@@ -42,11 +42,11 @@ 
     // Constants
     // =========================================================================
 
-    const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapIndexTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapIndexTemplate::TEMPLATE_TYPE;
 
-    const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapTemplate::TEMPLATE_TYPE;
 
-    const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapCustomTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapCustomTemplate::TEMPLATE_TYPE;
 
     const SEARCH_ENGINE_SUBMISSION_URLS = [
     ];
@@ -243,19 +243,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__
                                 );
                             }
@@ -315,19 +315,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__
                         );
                     }
@@ -393,19 +393,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__
                         );
                     }
@@ -483,7 +483,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 @@ 
         // Since we want a stale-while-revalidate pattern, only invalidate the cache if we're asked to
         if ($invalidateCache) {
             $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/seoelements/SeoDigitalProduct.php

Spacing +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/models/SitemapCustomTemplate.php

Spacing +5 added lines, -5 removed lines

@@ -128,16 +128,16 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SITEMAP_CACHE_TAG,
-                self::SITEMAP_CACHE_TAG . $handle . $siteId,
+                self::SITEMAP_CACHE_TAG.$handle.$siteId,
             ],
         ]);
 
-        return $cache->getOrSet(self::CACHE_KEY . $groupId . self::CUSTOM_SCOPE . $handle . $siteId, function() use (
+        return $cache->getOrSet(self::CACHE_KEY.$groupId.self::CUSTOM_SCOPE.$handle.$siteId, function() use (
             $handle,
             $siteId
         ) {
             Craft::info(
-                'Sitemap Custom cache miss: ' . $handle . '/' . $siteId,
+                'Sitemap Custom cache miss: '.$handle.'/'.$siteId,
                 __METHOD__
             );
             $lines = [];
@@ -212,9 +212,9 @@ 
     {
         $handle = self::CUSTOM_HANDLE;
         $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 Custom cache cleared: ' . $handle,
+            'Sitemap Custom cache cleared: '.$handle,
             __METHOD__
         );
     }

src/models/MetaJsonLdContainer.php

Spacing +3 added lines, -3 removed lines

@@ -51,16 +51,16 @@
     public function includeMetaData($dependency)
     {
         Craft::beginProfile('MetaJsonLdContainer::includeMetaData', __METHOD__);
-        $uniqueKey = $this->handle . $dependency->tags[3] . '-v2';
+        $uniqueKey = $this->handle.$dependency->tags[3].'-v2';
         $cache = Craft::$app->getCache();
         if ($this->clearCache) {
             TagDependency::invalidate($cache, $dependency->tags[3]);
         }
         [$jsonLd, $attrs] = $cache->getOrSet(
-            self::CONTAINER_TYPE . $uniqueKey,
+            self::CONTAINER_TYPE.$uniqueKey,
             function() use ($uniqueKey) {
                 Craft::info(
-                    self::CONTAINER_TYPE . ' cache miss: ' . $uniqueKey,
+                    self::CONTAINER_TYPE.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
                 

src/models/SitemapIndexTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      */
     public function getFilename(int $groupId): string
     {
-        return 'sitemaps-' . $groupId . '-sitemap.xml';
+        return 'sitemaps-'.$groupId.'-sitemap.xml';
     }
 
     /**
@@ -149,7 +149,7 @@ 
             ],
         ]);
 
-        return $cache->getOrSet(self::CACHE_KEY . $groupId . '.' . $siteId, function() use ($groupSiteIds, $siteId) {
+        return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function() use ($groupSiteIds, $siteId) {
             Craft::info(
                 'Sitemap index cache miss',
                 __METHOD__

src/models/MetaTagContainer.php

Spacing +3 added lines, -3 removed lines

@@ -49,16 +49,16 @@
     public function includeMetaData($dependency)
     {
         Craft::beginProfile('MetaTagContainer::includeMetaData', __METHOD__);
-        $uniqueKey = $this->handle . $dependency->tags[3];
+        $uniqueKey = $this->handle.$dependency->tags[3];
         $cache = Craft::$app->getCache();
         if ($this->clearCache) {
             TagDependency::invalidate($cache, $dependency->tags[3]);
         }
         $tagData = $cache->getOrSet(
-            self::CONTAINER_TYPE . $uniqueKey,
+            self::CONTAINER_TYPE.$uniqueKey,
             function() use ($uniqueKey) {
                 Craft::info(
-                    self::CONTAINER_TYPE . ' cache miss: ' . $uniqueKey,
+                    self::CONTAINER_TYPE.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
                 $tagData = [];

src/models/MetaJsonLd.php

Spacing +5 added lines, -5 removed lines

@@ -114,7 +114,7 @@ 
     {
         $model = null;
 
-        $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
+        $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
         /** @var $model MetaJsonLd */
         if (class_exists($className)) {
             self::cleanProperties($className, $config);
@@ -371,7 +371,7 @@ 
             foreach ($dataToValidate as $key => $data) {
                 /** @var array $expectedTypes */
                 foreach ($expectedTypes as $expectedType) {
-                    $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $expectedType;
+                    $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$expectedType;
                     switch ($expectedType) {
                         // Text always validates
                         case 'Text':
@@ -411,7 +411,7 @@ 
                         case 'Date':
                             $validator = new DateValidator();
                             $validator->type = DateValidator::TYPE_DATE;
-                            $validator->format = 'php:' . DateTime::ATOM;
+                            $validator->format = 'php:'.DateTime::ATOM;
                             if ($validator->validate($data, $error)) {
                                 $validated = true;
                             }
@@ -457,7 +457,7 @@ 
                                 $validated = true;
                             }
                             if (is_string($data)) {
-                                $targetClass = 'nystudio107\\seomatic\\models\\jsonld\\' . $data;
+                                $targetClass = 'nystudio107\\seomatic\\models\\jsonld\\'.$data;
                                 if (class_exists($targetClass)) {
                                     $validated = true;
                                 }
@@ -466,7 +466,7 @@ 
                     }
                 }
                 if (!$validated) {
-                    $this->addError($attribute, 'Must be one of these types: ' . implode(', ', $expectedTypes));
+                    $this->addError($attribute, 'Must be one of these types: '.implode(', ', $expectedTypes));
                 }
             }
         }

src/models/MetaTitle.php

Spacing +5 added lines, -5 removed lines

@@ -148,10 +148,10 @@ 
                     break;
             }
             // Handle the case of empty titles
-            if ($prefix === (' ' . $separator . ' ')) {
+            if ($prefix === (' '.$separator.' ')) {
                 $prefix = '';
             }
-            if ($suffix === (' ' . $separator)) {
+            if ($suffix === (' '.$separator)) {
                 $suffix = '';
             }
             // Remove potential double spaces
@@ -159,7 +159,7 @@ 
             ;
             $suffix = preg_replace('/\s+/', ' ', $suffix);
             ;
-            $lengthAdjust = mb_strlen($prefix . $suffix);
+            $lengthAdjust = mb_strlen($prefix.$suffix);
             // Parse the data
             $scenario = $this->scenario;
             $this->setScenario('render');
@@ -178,7 +178,7 @@ 
                         '…'
                     );
                 }
-                $data = $prefix . $data . $suffix;
+                $data = $prefix.$data.$suffix;
             } else {
                 // If no title is provided, just use the site name
                 $data = MetaValueHelper::parseString($this->siteName);
@@ -187,7 +187,7 @@ 
             $data = trim($data);
             // devMode
             if (Seomatic::$devMode) {
-                $data = Seomatic::$settings->devModeTitlePrefix . $data;
+                $data = Seomatic::$settings->devModeTitlePrefix.$data;
             }
         }
 

src/models/MetaTitleContainer.php

Spacing +3 added lines, -3 removed lines

@@ -48,16 +48,16 @@
     public function includeMetaData($dependency)
     {
         Craft::beginProfile('MetaTitleContainer::includeMetaData', __METHOD__);
-        $uniqueKey = $this->handle . $dependency->tags[3];
+        $uniqueKey = $this->handle.$dependency->tags[3];
         $cache = Craft::$app->getCache();
         if ($this->clearCache) {
             TagDependency::invalidate($cache, $dependency->tags[3]);
         }
         $tagData = $cache->getOrSet(
-            self::CONTAINER_TYPE . $uniqueKey,
+            self::CONTAINER_TYPE.$uniqueKey,
             function() use ($uniqueKey) {
                 Craft::info(
-                    self::CONTAINER_TYPE . ' cache miss: ' . $uniqueKey,
+                    self::CONTAINER_TYPE.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
                 $tagData = '';