nystudio107 / craft-seomatic

src/models/MetaJsonLdContainer.php

Spacing +4 added lines, -4 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,
-            function () use ($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/MetaScriptContainer.php

Spacing +5 added lines, -5 removed lines

@@ -55,16 +55,16 @@ 
     public function includeMetaData($dependency)
     {
         Craft::beginProfile('MetaScriptContainer::includeMetaData', __METHOD__);
-        $uniqueKey = $this->handle . $dependency->tags[3] . $this->dataLayerHash();
+        $uniqueKey = $this->handle.$dependency->tags[3].$this->dataLayerHash();
         $cache = Craft::$app->getCache();
         if ($this->clearCache) {
             TagDependency::invalidate($cache, $dependency->tags[3]);
         }
         $tagData = $cache->getOrSet(
-            self::CONTAINER_TYPE . $uniqueKey,
-            function () use ($uniqueKey) {
+            self::CONTAINER_TYPE.$uniqueKey,
+            function() use ($uniqueKey) {
                 Craft::info(
-                    self::CONTAINER_TYPE . ' cache miss: ' . $uniqueKey,
+                    self::CONTAINER_TYPE.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
 
@@ -140,7 +140,7 @@ 
                     'jQuery(window).load()',
                 ];
                 $position = $positionNames[$config['position'] - 1] ?? 'unknown';
-                $html .= "<!-- Position: {$position} -->" . PHP_EOL;
+                $html .= "<!-- Position: {$position} -->".PHP_EOL;
             }
             if ($bodyJs || !$params['renderScriptTags']) {
                 $html .= $config['js'];

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);
@@ -373,7 +373,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':
@@ -413,7 +413,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;
                             }
@@ -459,7 +459,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;
                                 }
@@ -468,7 +468,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/seoelements/SeoCampaign.php

Spacing +6 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
         Event::on(
             CampaignTypesService::class,
             CampaignTypesService::EVENT_AFTER_SAVE_CAMPAIGN_TYPE,
-            function (CampaignTypeEvent $event) {
+            function(CampaignTypeEvent $event) {
                 Craft::debug(
                     'CampaignTypesService::EVENT_AFTER_SAVE_CAMPAIGN_TYPE',
                     __METHOD__
@@ -116,7 +116,7 @@ 
         Event::on(
             CampaignTypesService::class,
             CampaignTypesService::EVENT_AFTER_DELETE_CAMPAIGN_TYPE,
-            function (CampaignTypeEvent $event) {
+            function(CampaignTypeEvent $event) {
                 Craft::debug(
                     'CampaignTypesService::EVENT_AFTER_DELETE_CAMPAIGN_TYPE',
                     __METHOD__
@@ -131,7 +131,7 @@ 
             Event::on(
                 CampaignTypesService::class,
                 CampaignTypesService::EVENT_AFTER_SAVE_CAMPAIGN_TYPE,
-                function (CampaignTypeEvent $event) {
+                function(CampaignTypeEvent $event) {
                     Craft::debug(
                         'CampaignTypesService::EVENT_AFTER_SAVE_CAMPAIGN_TYPE',
                         __METHOD__
@@ -154,7 +154,7 @@ 
             Event::on(
                 CampaignTypesService::class,
                 CampaignTypesService::EVENT_AFTER_DELETE_CAMPAIGN_TYPE,
-                function (CampaignTypeEvent $event) {
+                function(CampaignTypeEvent $event) {
                     Craft::debug(
                         'CampaignTypesService::EVENT_AFTER_DELETE_CAMPAIGN_TYPE',
                         __METHOD__
@@ -184,7 +184,7 @@ 
             Event::on(
                 CampaignElement::class,
                 CampaignElement::EVENT_DEFINE_SIDEBAR_HTML,
-                static function (DefineHtmlEvent $event) {
+                static function(DefineHtmlEvent $event) {
                     Craft::debug(
                         'CampaignElement::EVENT_DEFINE_SIDEBAR_HTML',
                         __METHOD__
@@ -387,7 +387,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/services/Sitemaps.php

Spacing +16 added lines, -16 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 = [
     ];
@@ -90,7 +90,7 @@ 
             Event::on(
                 UrlManager::class,
                 UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-                function (RegisterUrlRulesEvent $event) {
+                function(RegisterUrlRulesEvent $event) {
                     Craft::debug(
                         'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                         __METHOD__
@@ -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/helpers/UrlHelper.php

Spacing +13 added lines, -13 removed lines

@@ -44,12 +44,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, '/');
@@ -82,7 +82,7 @@ 
             }
         }
 
-        return rtrim($url, '/') . '/' . ltrim(substr($path, $overlap), '/');
+        return rtrim($url, '/').'/'.ltrim(substr($path, $overlap), '/');
     }
 
     /**
@@ -150,7 +150,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) {
             $url = rtrim($url, '/');
@@ -170,13 +170,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'];
@@ -186,15 +186,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,7 +234,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);
                 }
             }
 
@@ -260,11 +260,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/Seomatic.php

Spacing +38 added lines, -38 removed lines

@@ -274,7 +274,7 @@ 
         self::$cacheDuration = self::$devMode
             ? self::DEVMODE_CACHE_DURATION
             : self::$settings->metaCacheDuration ?? null;
-        self::$cacheDuration = self::$cacheDuration === null ? null : (int)self::$cacheDuration;
+        self::$cacheDuration = self::$cacheDuration === null ? null : (int) self::$cacheDuration;
         self::$environment = EnvironmentHelper::determineEnvironment();
         MetaValueHelper::cache();
         // Version helpers
@@ -349,7 +349,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     // Invalidate our caches after we've been installed
                     $this->clearAllCaches();
@@ -370,7 +370,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -386,7 +386,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_BEFORE_SAVE_PLUGIN_SETTINGS,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this && !Craft::$app->getDb()->getSupportsMb4()) {
                     // For all the emojis
                     $settingsModel = $this->getSettings();
@@ -439,7 +439,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Delay registering SEO Elements to give other plugins a chance to load first
                 $this->seoElements->getAllSeoElementTypes(false);
                 // Delay installing GQL handlers to give other plugins a chance to register their own first
@@ -460,7 +460,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = SeoSettingsField::class;
                 $event->types[] = Seomatic_MetaField::class;
             }
@@ -469,7 +469,7 @@ 
         Event::on(
             Element::class,
             Element::EVENT_AFTER_PROPAGATE,
-            static function (ModelEvent $event) {
+            static function(ModelEvent $event) {
                 Craft::debug(
                     'Element::EVENT_AFTER_PROPAGATE',
                     __METHOD__
@@ -489,7 +489,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_DELETE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_DELETE_ELEMENT',
                     __METHOD__
@@ -508,19 +508,19 @@ 
             Event::on(
                 Entry::class,
                 Entry::EVENT_REGISTER_PREVIEW_TARGETS,
-                function (RegisterPreviewTargetsEvent $e) {
+                function(RegisterPreviewTargetsEvent $e) {
                     /** @var Element $element */
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '