nystudio107 / craft-seomatic

src/seomatic-config/entrymeta/TagContainer.php

Spacing +8 added lines, -8 removed lines

@@ -19,44 +19,44 @@
  */
 
 return [
-    MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'General Meta Tags',
         'handle' => TagService::GENERAL_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [
         'name' => 'Facebook',
         'description' => 'Facebook OpenGraph Meta Tags',
         'handle' => TagService::FACEBOOK_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [
         'name' => 'Miscellaneous',
         'description' => 'Miscellaneous Meta Tags',
         'handle' => TagService::MISC_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/seomatic-config/digitalproductmeta/TagContainer.php

Spacing +8 added lines, -8 removed lines

@@ -19,44 +19,44 @@
  */
 
 return [
-    MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'General Meta Tags',
         'handle' => TagService::GENERAL_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [
         'name' => 'Facebook',
         'description' => 'Facebook OpenGraph Meta Tags',
         'handle' => TagService::FACEBOOK_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [
         'name' => 'Miscellaneous',
         'description' => 'Miscellaneous Meta Tags',
         'handle' => TagService::MISC_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/services/MetaContainers.php

Spacing +16 added lines, -16 removed lines

@@ -177,7 +177,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;
         }
     }
 
@@ -253,10 +253,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__
                 );
 
@@ -376,7 +376,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -392,21 +392,21 @@ 
                 }
             }
             // Get our cache key
-            $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams();
+            $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams();
             // 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.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$cacheKey,
                 ],
             ]);
             $this->containerDependency = $dependency;
@@ -423,10 +423,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);
@@ -829,10 +829,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
@@ -859,9 +859,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
@@ -1002,7 +1002,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/services/FrontendTemplates.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
     // Constants
     // =========================================================================
 
-    public const FRONTENDTEMPLATES_CONTAINER = Seomatic::SEOMATIC_HANDLE . EditableTemplate::TEMPLATE_TYPE;
+    public const FRONTENDTEMPLATES_CONTAINER = Seomatic::SEOMATIC_HANDLE.EditableTemplate::TEMPLATE_TYPE;
 
     public const HUMANS_TXT_HANDLE = 'humans';
     public const ROBOTS_TXT_HANDLE = 'robots';
@@ -171,16 +171,16 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_FRONTENDTEMPLATE_CACHE_TAG,
-                self::FRONTENDTEMPLATE_CACHE_TAG . $template,
-                self::FRONTENDTEMPLATE_CACHE_TAG . $template . $siteId,
+                self::FRONTENDTEMPLATE_CACHE_TAG.$template,
+                self::FRONTENDTEMPLATE_CACHE_TAG.$template.$siteId,
             ],
         ]);
         $cache = Craft::$app->getCache();
         $html = $cache->getOrSet(
-            self::CACHE_KEY . $template . $siteId,
+            self::CACHE_KEY.$template.$siteId,
             function() use ($template, $params) {
                 Craft::info(
-                    'Frontend template cache miss: ' . $template,
+                    'Frontend template cache miss: '.$template,
                     __METHOD__
                 );
                 $html = '';
@@ -251,9 +251,9 @@ 
     public function invalidateFrontendTemplateCache(string $template)
     {
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, self::FRONTENDTEMPLATE_CACHE_TAG . $template);
+        TagDependency::invalidate($cache, self::FRONTENDTEMPLATE_CACHE_TAG.$template);
         Craft::info(
-            'Frontend template cache cleared: ' . $template,
+            'Frontend template cache cleared: '.$template,
             __METHOD__
         );
     }

src/services/Sitemaps.php

Spacing +15 added lines, -15 removed lines

@@ -42,11 +42,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 = [
     ];
@@ -235,19 +235,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__
                                 );
                             }
@@ -307,19 +307,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__
                         );
                     }
@@ -385,19 +385,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__
                         );
                     }
@@ -475,7 +475,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);
@@ -507,9 +507,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/SeoCategory.php

Spacing +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
             ->siteId($metaBundle->sourceSiteId)
             ->limit($metaBundle->metaSitemapVars->sitemapLimit);
         if (!empty($metaBundle->metaSitemapVars->structureDepth)) {
-            $query->level('<=' . $metaBundle->metaSitemapVars->structureDepth);
+            $query->level('<='.$metaBundle->metaSitemapVars->structureDepth);
         }
 
         return $query;
@@ -379,7 +379,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/seoelements/SeoEntry.php

Spacing +2 added lines, -2 removed lines

@@ -227,7 +227,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;
@@ -394,7 +394,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
                 'sourceType' => $sourceModel->type,
             ]

src/seoelements/SeoProduct.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/seoelements/SeoCampaign.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,
             ]
         );