nystudio107 / craft-seomatic

src/fields/SeoSettings.php

Spacing +10 added lines, -10 removed lines

@@ -160,7 +160,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getContentColumnType(): array|string
+    public function getContentColumnType(): array | string
     {
         return Schema::TYPE_TEXT;
     }
@@ -231,7 +231,7 @@ 
             }
             // Handle the mainEntityOfPage
             $mainEntity = '';
-            if (in_array('mainEntityOfPage', (array)$this->generalEnabledFields, false) &&
+            if (in_array('mainEntityOfPage', (array) $this->generalEnabledFields, false) &&
                 !empty($config['metaBundleSettings'])) {
                 $mainEntity = SchemaHelper::getSpecificEntityType($config['metaBundleSettings'], true);
             }
@@ -261,7 +261,7 @@ 
                 $value = StringHelper::encodeMb4($value);
             }
             if (is_array($value)) {
-                array_walk_recursive($value, function (&$arrayValue, $arrayKey) {
+                array_walk_recursive($value, function(&$arrayValue, $arrayKey) {
                     if ($arrayValue !== null && is_string($arrayValue)) {
                         $arrayValue = StringHelper::encodeMb4($arrayValue);
                     }
@@ -397,7 +397,7 @@ 
         if ($element !== null && $element->uri !== null) {
             $siteId = $element->siteId;
             $uri = $element->uri;
-            $cacheKey = self::CACHE_KEY . $uri . $siteId . $this->elementDisplayPreviewType;
+            $cacheKey = self::CACHE_KEY.$uri.$siteId.$this->elementDisplayPreviewType;
             $metaBundleSourceType = Seomatic::$plugin->seoElements->getMetaBundleTypeFromElement($element);
             $seoElement = Seomatic::$plugin->seoElements->getSeoElementByMetaBundleType($metaBundleSourceType);
             $metaBundleSourceType = SeoEntry::getMetaBundleType();
@@ -408,15 +408,15 @@ 
             $dependency = new TagDependency([
                 'tags' => [
                     MetaContainers::GLOBAL_METACONTAINER_CACHE_TAG,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
                 ],
             ]);
             $cache = Craft::$app->getCache();
             $cacheDuration = null;
             $html = $cache->getOrSet(
-                self::CACHE_KEY . $cacheKey,
-                function () use ($uri, $siteId, $element) {
+                self::CACHE_KEY.$cacheKey,
+                function() use ($uri, $siteId, $element) {
                     Seomatic::$plugin->metaContainers->previewMetaContainers($uri, $siteId, true);
                     $variables = [
                         'previewTypes' => [
@@ -458,7 +458,7 @@ 
     )
     {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::TEXT_FIELD_CLASS_KEY,
@@ -466,7 +466,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::ASSET_FIELD_CLASS_KEY,

src/helpers/Sitemap.php

Spacing +19 added lines, -19 removed lines

@@ -79,7 +79,7 @@ 
 
         // Output some info if this is a console app
         if ($job && Craft::$app instanceof ConsoleApplication) {
-            echo $job->description . PHP_EOL;
+            echo $job->description.PHP_EOL;
         }
 
         $lines = [];
@@ -139,8 +139,8 @@ 
             while ($currentElement < $totalElements) {
                 $elements = $paginator->getPageResults();
                 if (Craft::$app instanceof ConsoleApplication) {
-                    echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages()
-                        . ' - elements: ' . $paginator->getTotalResults()
+                    echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages()
+                        . ' - elements: '.$paginator->getTotalResults()
                         . PHP_EOL;
                 }
                 /** @var ElementInterface $element */
@@ -152,7 +152,7 @@ 
                     }
                     // 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);
@@ -189,7 +189,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;
                             }
                         }
@@ -241,12 +241,12 @@ 
                                                 if ($primarySiteId === $altSourceSiteId && Seomatic::$settings->addXDefaultHrefLang) {
                                                     $lines[] = '<xhtml:link rel="alternate"'
                                                         . ' hreflang="x-default"'
-                                                        . ' href="' . Html::encode($altUrl) . '"'
+                                                        . ' href="'.Html::encode($altUrl).'"'
                                                         . ' />';
                                                 }
                                                 $lines[] = '<xhtml:link rel="alternate"'
-                                                    . ' hreflang="' . $altSiteSettings['language'] . '"'
-                                                    . ' href="' . Html::encode($altUrl) . '"'
+                                                    . ' hreflang="'.$altSiteSettings['language'].'"'
+                                                    . ' href="'.Html::encode($altUrl).'"'
                                                     . ' />';
                                             }
                                         }
@@ -346,11 +346,11 @@ 
         }
 
         $cache = Craft::$app->getCache();
-        $cacheKey = SitemapTemplate::CACHE_KEY . $groupId . $type . $handle . $siteId;
+        $cacheKey = SitemapTemplate::CACHE_KEY.$groupId.$type.$handle.$siteId;
         $dependency = new TagDependency([
             'tags' => [
                 SitemapTemplate::GLOBAL_SITEMAP_CACHE_TAG,
-                SitemapTemplate::SITEMAP_CACHE_TAG . $handle . $siteId,
+                SitemapTemplate::SITEMAP_CACHE_TAG.$handle.$siteId,
             ],
         ]);
         $lines = implode('', $lines);
@@ -363,10 +363,10 @@ 
         $result = $cache->set($cacheKey, $lines, $cacheDuration, $dependency);
         // Remove the queue job id from the cache too
         $cache->delete($queueJobCacheKey);
-        Craft::debug('Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey, __METHOD__);
+        Craft::debug('Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey, __METHOD__);
         // 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
         $plugin = Craft::$app->getPlugins()->getPlugin('fastcgi-cache-bust');
@@ -446,7 +446,7 @@ 
 
                         $attributes = \array_intersect_key(
                             $attributes,
-                            array_flip((array)$seoSettingsField->sitemapEnabledFields)
+                            array_flip((array) $seoSettingsField->sitemapEnabledFields)
                         );
                         $attributes = array_filter(
                             $attributes,
@@ -478,7 +478,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':
                     $lines[] = '<image:image>';
@@ -490,9 +490,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<image:' . $propName . '>';
+                            $lines[] = '<image:'.$propName.'>';
                             $lines[] = Html::encode($asset[$fieldName]);
-                            $lines[] = '</image:' . $propName . '>';
+                            $lines[] = '</image:'.$propName.'>';
                         }
                     }
                     $lines[] = '</image:image>';
@@ -508,9 +508,9 @@ 
                         $fieldName = $row['field'] ?? '';
                         $propName = $row['property'] ?? '';
                         if (!empty($asset[$fieldName]) && !empty($propName)) {
-                            $lines[] = '<video:' . $propName . '>';
+                            $lines[] = '<video:'.$propName.'>';
                             $lines[] = Html::encode($asset[$fieldName]);
-                            $lines[] = '</video:' . $propName . '>';
+                            $lines[] = '</video:'.$propName.'>';
                         }
                     }
                     $lines[] = '</video:video>';
@@ -526,7 +526,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/DynamicMeta.php

Spacing +9 added lines, -9 removed lines

@@ -84,7 +84,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;
@@ -157,7 +157,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -176,11 +176,11 @@ 
                     if (is_array($href)) {
                         $headerValue = '';
                         foreach ($href as $hrefVal) {
-                            $headerValue .= ('<' . $hrefVal . '>' . ',');
+                            $headerValue .= ('<'.$hrefVal.'>'.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
-                        $headerValue = '<' . $href . '>';
+                        $headerValue = '<'.$href.'>';
                     }
                     $headerValue .= "; rel='canonical'";
                     $response->headers->add('Link', $headerValue);
@@ -196,7 +196,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -382,7 +382,7 @@ 
         if ($lastElement && $element) {
             if ($lastElement->uri !== '__home__' && $element->uri) {
                 $path = $lastElement->uri;
-                $segments = array_values(array_filter(explode('/', $path), function ($segment) {
+                $segments = array_values(array_filter(explode('/', $path), function($segment) {
                     return $segment !== '';
                 }));
             }
@@ -542,7 +542,7 @@ 
                     $element = $elements->getElementByUri($url, $site->id, false);
                 }
                 if ($element !== null) {
-                    if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) {
+                    if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) {
                         $includeUrl = false;
                     }
                     /** @var MetaBundle $metaBundle */
@@ -576,7 +576,7 @@ 
                             $seoSettingsField = Craft::$app->getFields()->getFieldByHandle($fieldHandle);
                             if ($fieldMetaBundle !== null && $seoSettingsField !== null && $seoSettingsField->sitemapTabEnabled) {
                                 // If sitemaps are off for this entry, don't include the URL
-                                if (in_array('sitemapUrls', (array)$seoSettingsField->sitemapEnabledFields, false)
+                                if (in_array('sitemapUrls', (array) $seoSettingsField->sitemapEnabledFields, false)
                                     && !$fieldMetaBundle->metaSitemapVars->sitemapUrls
                                     && !Seomatic::$plugin->helper->isInherited($fieldMetaBundle->metaSitemapVars, 'sitemapUrls')
                                 ) {
@@ -795,7 +795,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/seoelements/SeoEntry.php

Spacing +7 added lines, -7 removed lines

@@ -108,7 +108,7 @@ 
         Event::on(
             Sections::class,
             Sections::EVENT_AFTER_SAVE_SECTION,
-            function (SectionEvent $event) {
+            function(SectionEvent $event) {
                 Craft::debug(
                     'Sections::EVENT_AFTER_SAVE_SECTION',
                     __METHOD__
@@ -119,7 +119,7 @@ 
         Event::on(
             Sections::class,
             Sections::EVENT_AFTER_DELETE_SECTION,
-            function (SectionEvent $event) {
+            function(SectionEvent $event) {
                 Craft::debug(
                     'Sections::EVENT_AFTER_DELETE_SECTION',
                     __METHOD__
@@ -134,7 +134,7 @@ 
             Event::on(
                 Sections::class,
                 Sections::EVENT_AFTER_SAVE_SECTION,
-                function (SectionEvent $event) {
+                function(SectionEvent $event) {
                     Craft::debug(
                         'Sections::EVENT_AFTER_SAVE_SECTION',
                         __METHOD__
@@ -157,7 +157,7 @@ 
             Event::on(
                 Sections::class,
                 Sections::EVENT_AFTER_DELETE_SECTION,
-                function (SectionEvent $event) {
+                function(SectionEvent $event) {
                     Craft::debug(
                         'Sections::EVENT_AFTER_DELETE_SECTION',
                         __METHOD__
@@ -186,7 +186,7 @@ 
         Event::on(
             Entry::class,
             Entry::EVENT_DEFINE_SIDEBAR_HTML,
-            static function (DefineHtmlEvent $event) {
+            static function(DefineHtmlEvent $event) {
                 Craft::debug(
                     'Entry::EVENT_DEFINE_SIDEBAR_HTML',
                     __METHOD__
@@ -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;
@@ -395,7 +395,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
                 'sourceType' => $sourceModel->type,
             ]

src/seoelements/SeoCategory.php

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
         Event::on(
             Categories::class,
             Categories::EVENT_AFTER_SAVE_GROUP,
-            function (CategoryGroupEvent $event) {
+            function(CategoryGroupEvent $event) {
                 Craft::debug(
                     'Categories::EVENT_AFTER_SAVE_GROUP',
                     __METHOD__
@@ -117,7 +117,7 @@ 
         Event::on(
             Categories::class,
             Categories::EVENT_AFTER_DELETE_GROUP,
-            function (CategoryGroupEvent $event) {
+            function(CategoryGroupEvent $event) {
                 Craft::debug(
                     'Categories::EVENT_AFTER_DELETE_GROUP',
                     __METHOD__
@@ -132,7 +132,7 @@ 
             Event::on(
                 Categories::class,
                 Categories::EVENT_AFTER_SAVE_GROUP,
-                function (CategoryGroupEvent $event) {
+                function(CategoryGroupEvent $event) {
                     Craft::debug(
                         'Categories::EVENT_AFTER_SAVE_GROUP',
                         __METHOD__
@@ -155,7 +155,7 @@ 
             Event::on(
                 Categories::class,
                 Categories::EVENT_AFTER_DELETE_GROUP,
-                function (CategoryGroupEvent $event) {
+                function(CategoryGroupEvent $event) {
                     Craft::debug(
                         'Categories::EVENT_AFTER_DELETE_GROUP',
                         __METHOD__
@@ -184,7 +184,7 @@ 
         Event::on(
             Category::class,
             Category::EVENT_DEFINE_SIDEBAR_HTML,
-            static function (DefineHtmlEvent $event) {
+            static function(DefineHtmlEvent $event) {
                 Craft::debug(
                     'Category::EVENT_DEFINE_SIDEBAR_HTML',
                     __METHOD__
@@ -224,7 +224,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;
@@ -381,7 +381,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/Seomatic.php

Spacing +38 added lines, -38 removed lines

@@ -341,7 +341,7 @@ 
             $lastSegment = end($segments);
             $site = Craft::$app->getSites()->getSiteByHandle($lastSegment);
             if ($site !== null) {
-                $siteSuffix = '/' . $lastSegment;
+                $siteSuffix = '/'.$lastSegment;
             }
         }
         $currentUser = Craft::$app->getUser()->getIdentity();
@@ -349,31 +349,31 @@ 
         if ($currentUser->can('seomatic:dashboard')) {
             $subNavs['dashboard'] = [
                 'label' => Craft::t('seomatic', 'Dashboard'),
-                'url' => 'seomatic/dashboard' . $siteSuffix,
+                'url' => 'seomatic/dashboard'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:global-meta')) {
             $subNavs['global'] = [
                 'label' => Craft::t('seomatic', 'Global SEO'),
-                'url' => 'seomatic/global/general' . $siteSuffix,
+                'url' => 'seomatic/global/general'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:content-meta')) {
             $subNavs['content'] = [
                 'label' => Craft::t('seomatic', 'Content SEO'),
-                'url' => 'seomatic/content' . $siteSuffix,
+                'url' => 'seomatic/content'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:site-settings')) {
             $subNavs['site'] = [
                 'label' => Craft::t('seomatic', 'Site Settings'),
-                'url' => 'seomatic/site/identity' . $siteSuffix,
+                'url' => 'seomatic/site/identity'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:tracking-scripts')) {
             $subNavs['tracking'] = [
                 'label' => Craft::t('seomatic', 'Tracking Scripts'),
-                'url' => 'seomatic/tracking/gtag' . $siteSuffix,
+                'url' => 'seomatic/tracking/gtag'.$siteSuffix,
             ];
         }
         $editableSettings = true;
@@ -418,7 +418,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();
@@ -439,7 +439,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -455,7 +455,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();
@@ -485,7 +485,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
@@ -506,7 +506,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            static function (RegisterComponentTypesEvent $event) {
+            static function(RegisterComponentTypesEvent $event) {
                 $event->types[] = SeoSettingsField::class;
                 $event->types[] = Seomatic_MetaField::class;
             }
@@ -515,7 +515,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -535,7 +535,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_DELETE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_DELETE_ELEMENT',
                     __METHOD__
@@ -554,19 +554,19 @@ 
             Event::on(
                 Entry::class,
                 Element::EVENT_REGISTER_PREVIEW_TARGETS,
-                static function (RegisterPreviewTargetsEvent $e) {
+                static function(RegisterPreviewTargetsEvent $e) {
                     /** @var Element $element */
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '