nystudio107 / craft-seomatic

src/seomatic-config/eventmeta/JsonLdContainer.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  */
 
 return [
-    MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE => [
+    MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'JsonLd Tags',
         'handle' => JsonLdService::GENERAL_HANDLE,
-        'class' => (string)MetaJsonLdContainer::class,
+        'class' => (string) MetaJsonLdContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/base/MetaItem.php

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
                 // Add a URL to the schema.org type if this is a MetaJsonLD object
                 if ($isMetaJsonLdModel) {
                     /** @var  $this MetaJsonLd */
-                    $extraInfo = ' for http://schema.org/' . $this->type;
+                    $extraInfo = ' for http://schema.org/'.$this->type;
                 }
                 $errorMsg =
                     Craft::t('seomatic', 'Scenario: "')
@@ -169,10 +169,10 @@ 
                     . print_r($this->render(), true);
                 Craft::info($errorMsg, __METHOD__);
                 foreach ($this->errors as $param => $errors) {
-                    $errorMsg = Craft::t('seomatic', $errorLabel) . $param;
+                    $errorMsg = Craft::t('seomatic', $errorLabel).$param;
                     /** @var array $errors */
                     foreach ($errors as $error) {
-                        $errorMsg .= ' -> ' . $error;
+                        $errorMsg .= ' -> '.$error;
                         // Change the error level depending on the error message if this is a MetaJsonLD object
                         if ($isMetaJsonLdModel) {
                             if (strpos($error, 'recommended') !== false) {
@@ -185,15 +185,15 @@ 
                             }
                         }
                     }
-                    Craft::info(strtoupper($logLevel) . ' - ' . $errorMsg, __METHOD__);
+                    Craft::info(strtoupper($logLevel).' - '.$errorMsg, __METHOD__);
                     // Extra debugging info for MetaJsonLd objects
                     if ($isMetaJsonLdModel) {
                         /** @var MetaJsonLd $className */
                         $className = \get_class($this);
                         if (!empty($className::$schemaPropertyDescriptions[$param])) {
-                            $errorMsg = Craft::t('seomatic', $errorLabel) . $param;
+                            $errorMsg = Craft::t('seomatic', $errorLabel).$param;
                             /** @var $className MetaJsonLd */
-                            $errorMsg .= ' -> ' . $className::$schemaPropertyDescriptions[$param];
+                            $errorMsg .= ' -> '.$className::$schemaPropertyDescriptions[$param];
                             Craft::info($errorMsg, __METHOD__);
                         }
                     }

src/seoelements/SeoEvent.php

Spacing +8 added lines, -8 removed lines

@@ -84,7 +84,7 @@ 
         BaseEvent::on(
             CalendarsService::class,
             CalendarsService::EVENT_AFTER_SAVE,
-            function (SaveModelEvent $event) {
+            function(SaveModelEvent $event) {
                 Craft::debug(
                     'CalendarsService::EVENT_AFTER_DELETE',
                     __METHOD__
@@ -95,7 +95,7 @@ 
         BaseEvent::on(
             CalendarsService::class,
             CalendarsService::EVENT_AFTER_DELETE,
-            function (DeleteModelEvent $event) {
+            function(DeleteModelEvent $event) {
                 Craft::debug(
                     'CalendarsService::EVENT_AFTER_DELETE',
                     __METHOD__
@@ -110,7 +110,7 @@ 
             BaseEvent::on(
                 CalendarsService::class,
                 CalendarsService::EVENT_AFTER_SAVE,
-                function (SaveModelEvent $event) {
+                function(SaveModelEvent $event) {
                     Craft::debug(
                         'CalendarsService::EVENT_AFTER_SAVE',
                         __METHOD__
@@ -135,7 +135,7 @@ 
             BaseEvent::on(
                 CalendarsService::class,
                 CalendarsService::EVENT_AFTER_DELETE,
-                function (DeleteModelEvent $event) {
+                function(DeleteModelEvent $event) {
                     Craft::debug(
                         'CalendarsService::EVENT_AFTER_DELETE',
                         __METHOD__
@@ -165,7 +165,7 @@ 
         // Install only for non-console Control Panel requests
         if ($request->getIsCpRequest() && !$request->getIsConsoleRequest()) {
             // Events sidebar
-            Seomatic::$view->hook('cp.solspace.calendar.events.edit.details', function (&$context) {
+            Seomatic::$view->hook('cp.solspace.calendar.events.edit.details', function(&$context) {
                 $html = '';
                 Seomatic::$view->registerAssetBundle(SeomaticAsset::class);
                 /** @var Event $event */
@@ -238,8 +238,8 @@ 
         $query = Event::find()
             ->setCalendar($metaBundle->sourceHandle)
             ->setLoadOccurrences(false)
-            ->siteId((int)$metaBundle->sourceSiteId)
-            ->limit((int)$metaBundle->metaSitemapVars->sitemapLimit);
+            ->siteId((int) $metaBundle->sourceSiteId)
+            ->limit((int) $metaBundle->metaSitemapVars->sitemapLimit);
 
         return $query;
     }
@@ -400,7 +400,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -58,8 +58,8 @@ 
         // Constants aren't allowed in traits until PHP >= 8.2
         $majorVersion = '3';
         // Dev server container name & port are based on the major version of this plugin
-        $devPort = 3000 + (int)$majorVersion;
-        $versionName = 'v' . $majorVersion;
+        $devPort = 3000 + (int) $majorVersion;
+        $versionName = 'v'.$majorVersion;
         // Merge in the passed config, so it our config can be overridden by Plugins::pluginConfigs['vite']
         // ref: https://github.com/craftcms/cms/issues/1989
         $config = ArrayHelper::merge([
@@ -80,8 +80,8 @@ 
                     'assetClass' => SeomaticAsset::class,
                     'checkDevServer' => true,
                     'class' => VitePluginService::class,
-                    'devServerInternal' => 'http://craft-seomatic-' . $versionName . '-buildchain-dev:' . $devPort,
-                    'devServerPublic' => 'http://localhost:' . $devPort,
+                    'devServerInternal' => 'http://craft-seomatic-'.$versionName.'-buildchain-dev:'.$devPort,
+                    'devServerPublic' => 'http://localhost:'.$devPort,
                     'errorEntry' => 'src/js/seomatic.js',
                     'useDevServer' => true,
                 ],

src/helpers/Text.php

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->truncate($length, $substring);
+            $result = (string) Stringy::create($string)->truncate($length, $substring);
         }
 
         return $result;
@@ -101,7 +101,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->safeTruncate($length, $substring);
+            $result = (string) Stringy::create($string)->safeTruncate($length, $substring);
         }
 
         return $result;
@@ -135,9 +135,9 @@ 
             $result = self::smartStripTags(Doxter::$plugin->getService()->parseMarkdown($field->getRaw()));
         } else {
             if (\is_array($field)) {
-                $result = self::smartStripTags((string)$field[0]);
+                $result = self::smartStripTags((string) $field[0]);
             } else {
-                $result = self::smartStripTags((string)$field);
+                $result = self::smartStripTags((string) $field);
             }
         }
 
@@ -343,7 +343,7 @@ 
 
         $result = \is_array($keywords)
             ? implode(', ', \array_slice(array_keys($keywords), 0, $limit))
-            : (string)$keywords;
+            : (string) $keywords;
 
         return self::sanitizeUserInput($result);
     }
@@ -381,7 +381,7 @@ 
 
         $result = \is_array($sentences)
             ? implode(' ', $sentences)
-            : (string)$sentences;
+            : (string) $sentences;
 
         return self::sanitizeUserInput($result);
     }
@@ -401,7 +401,7 @@ 
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         $str = rawurldecode($str);
         // Remove any linebreaks
-        $str = (string)preg_replace("/\r|\n/", "", $str);
+        $str = (string) preg_replace("/\r|\n/", "", $str);
         $str = HtmlPurifier::process($str, ['HTML.Allowed' => '']);
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         // Remove any embedded Twig code

src/seomatic-config/globalmeta/TagContainer.php

Spacing +8 added lines, -8 removed lines

@@ -20,11 +20,11 @@ 
  */
 
 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' => [
         ],
@@ -76,11 +76,11 @@ 
             ],
         ],
     ],
-    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' => [
         ],
@@ -206,12 +206,12 @@ 
             ],
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
         'include' => true,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'data' => [
             'twitter:card' => [
                 'charset' => '',
@@ -287,11 +287,11 @@ 
             ],
         ],
     ],
-    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/helpers/Schema.php

Spacing +19 added lines, -19 removed lines

@@ -94,7 +94,7 @@ 
             // Go from most specific type to least specific type
             foreach (self::SCHEMA_TYPES as $schemaType) {
                 if (!empty($settings[$schemaType]) && ($settings[$schemaType] !== 'none')) {
-                    $result = $settings[$schemaType] . self::SCHEMA_PATH_DELIMITER . $result;
+                    $result = $settings[$schemaType].self::SCHEMA_PATH_DELIMITER.$result;
                 }
             }
         }
@@ -126,7 +126,7 @@ 
                 if (isset($result['schemaTypeDescription'])) {
                     $description = $result['schemaTypeDescription'];
                     $description = preg_replace("`\[\[([A-z]*)\]\]`", '[$1](https://schema.org/$1)', $description);
-                    $description = Markdown::process((string)$description);
+                    $description = Markdown::process((string) $description);
                     $description = str_replace(['<p>', '</p>', '\n'], ['', '', ' '], $description);
                     $result['schemaTypeDescription'] = $description;
                 }
@@ -147,7 +147,7 @@ 
     {
         $result = [];
         while ($schemaType) {
-            $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
+            $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
             if (class_exists($className)) {
                 try {
                     $classRef = new \ReflectionClass($className);
@@ -254,15 +254,15 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaArray',
+                self::SCHEMA_CACHE_TAG.'schemaArray',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaArray',
-            function () use ($path) {
+            self::CACHE_KEY.'schemaArray',
+            function() use ($path) {
                 Craft::info(
-                    'schemaArray cache miss: ' . $path,
+                    'schemaArray cache miss: '.$path,
                     __METHOD__
                 );
                 $filePath = Craft::getAlias('@nystudio107/seomatic/resources/schema/tree.jsonld');
@@ -355,13 +355,13 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaTree',
+                self::SCHEMA_CACHE_TAG.'schemaTree',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaTree',
-            function () {
+            self::CACHE_KEY.'schemaTree',
+            function() {
                 Craft::info(
                     'schemaTree cache miss',
                     __METHOD__
@@ -396,11 +396,11 @@ 
         foreach ($typesArray as $key => $value) {
             $indent = html_entity_decode(str_repeat('&nbsp;', $indentLevel));
             if (\is_array($value)) {
-                $result[$key] = $indent . $key;
+                $result[$key] = $indent.$key;
                 $value = self::flattenSchemaArray($value, $indentLevel + self::MENU_INDENT_STEP);
                 $result = array_merge($result, $value);
             } else {
-                $result[$key] = $indent . $value;
+                $result[$key] = $indent.$value;
             }
         }
 
@@ -494,7 +494,7 @@ 
             $children = [];
             $name = $typesArray['name'];
             // Construct a path-based $id, excluding the top-level `Thing` schema
-            $id = $name === 'Thing' ? '' : $path . self::SCHEMA_PATH_DELIMITER . $name;
+            $id = $name === 'Thing' ? '' : $path.self::SCHEMA_PATH_DELIMITER.$name;
             $id = ltrim($id, self::SCHEMA_PATH_DELIMITER);
             // Make sure we have at most 3 specifiers in the schema path
             $parts = explode(self::SCHEMA_PATH_DELIMITER, $id);
@@ -521,12 +521,12 @@ 
             $schemaPath = explode(self::SCHEMA_PATH_DELIMITER, $id);
             // Use only the specific (last) type for now, rather than the complete path of types
             $schemaPath = [end($schemaPath)];
-            if ((bool)array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
-                $name .= ' (' . Craft::t('seomatic', 'Google rich result') . ')';
+            if ((bool) array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
+                $name .= ' ('.Craft::t('seomatic', 'Google rich result').')';
             }
             // Mark it as pending, if applicable
             if (isset($typesArray['pending']) && $typesArray['pending']) {
-                $name .= ' (' . Craft::t('seomatic', 'pending') . ')';
+                $name .= ' ('.Craft::t('seomatic', 'pending').')';
             }
             $result['label'] = $name;
             $result['id'] = $id;
@@ -545,13 +545,13 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'googleRichSnippets',
+                self::SCHEMA_CACHE_TAG.'googleRichSnippets',
             ],
         ]);
         $cache = Craft::$app->getCache();
         return $cache->getOrSet(
-            self::CACHE_KEY . 'googleRichSnippets',
-            function () {
+            self::CACHE_KEY.'googleRichSnippets',
+            function() {
                 Craft::info(
                     'googleRichSnippets cache miss',
                     __METHOD__

src/helpers/Sitemap.php

Spacing +18 added lines, -18 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;
                             }
                         }
@@ -246,12 +246,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).'"'
                                                     . ' />';
                                             }
                                         }
@@ -351,11 +351,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);
@@ -368,10 +368,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');
@@ -484,7 +484,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>';
@@ -496,9 +496,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>';
@@ -514,9 +514,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>';
@@ -532,7 +532,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/seomatic-config/globalmeta/ScriptContainer.php

Spacing +2 added lines, -2 removed lines

@@ -20,11 +20,11 @@
  */
 
 return [
-    MetaScriptContainer::CONTAINER_TYPE . ScriptService::GENERAL_HANDLE => [
+    MetaScriptContainer::CONTAINER_TYPE.ScriptService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'Script Tags',
         'handle' => ScriptService::GENERAL_HANDLE,
-        'class' => (string)MetaScriptContainer::class,
+        'class' => (string) MetaScriptContainer::class,
         'include' => true,
         'dependencies' => [
         ],