nystudio107 / craft-seomatic

src/models/SitemapTemplate.php

Spacing +11 added lines, -11 removed lines

@@ -148,9 +148,9 @@ 
         }
 
         $cache = Craft::$app->getCache();
-        $uniqueKey = $groupId . $type . $handle . $siteId;
-        $cacheKey = self::CACHE_KEY . $uniqueKey;
-        $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY . $uniqueKey;
+        $uniqueKey = $groupId.$type.$handle.$siteId;
+        $cacheKey = self::CACHE_KEY.$uniqueKey;
+        $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY.$uniqueKey;
         $result = $cache->get($cacheKey);
         // If the sitemap isn't cached, start a job to create it
         // Even if it is cached, if $throwException === false we should regenerate it, as it is part of
@@ -189,7 +189,7 @@ 
                 $dependency = new TagDependency([
                     'tags' => [
                         self::GLOBAL_SITEMAP_CACHE_TAG,
-                        self::CACHE_KEY . $uniqueKey,
+                        self::CACHE_KEY.$uniqueKey,
                     ],
                 ]);
                 $cache->set($queueJobCacheKey, $jobId, $cacheDuration, $dependency);
@@ -221,11 +221,11 @@ 
                 // Return an empty XML document
                 $lines[] = '<?xml version="1.0" encoding="UTF-8"?>';
                 $lines[] = '<?xml-stylesheet type="text/xsl" href="sitemap-empty.xsl"?>';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'This sitemap has not been generated yet.') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'If you are seeing this in local dev or an') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'environment with `devMode` on, caches only') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'last for 30 seconds in local dev, so it is') . ' -->';
-                $lines[] = '<!-- ' . Craft::t('seomatic', 'normal for the sitemap to not be cached.') . ' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'This sitemap has not been generated yet.').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'If you are seeing this in local dev or an').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'environment with `devMode` on, caches only').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'last for 30 seconds in local dev, so it is').' -->';
+                $lines[] = '<!-- '.Craft::t('seomatic', 'normal for the sitemap to not be cached.').' -->';
                 $lines[] = '<urlset>';
                 $lines[] = '</urlset>';
             }
@@ -246,9 +246,9 @@ 
     public function invalidateCache(string $handle, int $siteId)
     {
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG . $handle . $siteId);
+        TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG.$handle.$siteId);
         Craft::info(
-            'Sitemap cache cleared: ' . $handle,
+            'Sitemap cache cleared: '.$handle,
             __METHOD__
         );
     }

src/models/metalink/CanonicalLink.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                 // Craft adds the `tokenParam` URL param back in via UrlHelper, strip it again
                 if (Seomatic::$plugin->metaContainers->paginationPage === '1') {
                     $token = Craft::$app->getConfig()->getGeneral()->tokenParam;
-                    $url = preg_replace('~([?&])' . $token . '=[^&]*~', '$1', $url);
+                    $url = preg_replace('~([?&])'.$token.'=[^&]*~', '$1', $url);
                     $url = rtrim($url, '?&');
                     $url = str_replace(['&&', '?&'], ['&', '?'], $url);
                     $data['href'] = $url;

src/models/MetaScript.php

Spacing +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
         }
 
         if (empty($html) && !empty($this->templatePath)) {
-            $html = '/* ' . $this->name . Craft::t('seomatic', ' script did not render') . ' */' . PHP_EOL;
+            $html = '/* '.$this->name.Craft::t('seomatic', ' script did not render').' */'.PHP_EOL;
         }
 
         return $html;

src/helpers/PullField.php

Spacing +75 added lines, -75 removed lines

@@ -65,19 +65,19 @@ 
         }
         foreach (self::PULL_TEXT_FIELDS as $fields) {
             $fieldName = $fields['fieldName'];
-            $source = $bundleSettings[$fieldName . 'Source'] ?? '';
-            $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
+            $source = $bundleSettings[$fieldName.'Source'] ?? '';
+            $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
             if (!empty($source)) {
                 $seoField = $fields['seoField'];
                 switch ($source) {
                     case 'sameAsSeo':
                         $globalsSettings[$fieldName] =
-                            '{{ seomatic.meta.' . $seoField . ' }}';
+                            '{{ seomatic.meta.'.$seoField.' }}';
                         break;
 
                     case 'sameAsSiteTwitter':
                         $globalsSettings[$fieldName] =
-                            '{{ seomatic.site.' . $seoField . ' }}';
+                            '{{ seomatic.site.'.$seoField.' }}';
                         break;
 
                     case 'sameAsGlobal':
@@ -88,28 +88,28 @@ 
                     case 'fromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ') }}';
                         break;
 
                     case 'fromUserField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . 'author.' . $sourceField
+                            . $objectPrefix.$elementName.'author.'.$sourceField
                             . ') }}';
                         break;
 
                     case 'summaryFromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractSummary(seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ')) }}';
                         break;
 
                     case 'keywordsFromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractKeywords(seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ')) }}';
                         break;
 
@@ -140,25 +140,25 @@ 
         }
         foreach (self::PULL_ASSET_FIELDS as $fields) {
             $fieldName = $fields['fieldName'];
-            $fieldNameWidth = $fields['fieldName'] . 'Width';
-            $fieldNameHeight = $fields['fieldName'] . 'Height';
-            $source = $bundleSettings[$fieldName . 'Source'] ?? '';
-            $ids = $bundleSettings[$fieldName . 'Ids'] ?? [];
-            $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
+            $fieldNameWidth = $fields['fieldName'].'Width';
+            $fieldNameHeight = $fields['fieldName'].'Height';
+            $source = $bundleSettings[$fieldName.'Source'] ?? '';
+            $ids = $bundleSettings[$fieldName.'Ids'] ?? [];
+            $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
             if (!empty($source)) {
-                $transformImage = $bundleSettings[$fieldName . 'Transform'] ?? true;
+                $transformImage = $bundleSettings[$fieldName.'Transform'] ?? true;
                 $seoField = $fields['seoField'];
                 $tranformModeField = $fields['transformModeField'];
                 $transformMode = $bundleSettings[$tranformModeField] ?? 'crop';
                 if (empty($transformMode)) {
                     $transformMode = 'crop';
                 }
-                $seoFieldWidth = $fields['seoField'] . 'Width';
-                $seoFieldHeight = $fields['seoField'] . 'Height';
+                $seoFieldWidth = $fields['seoField'].'Width';
+                $seoFieldHeight = $fields['seoField'].'Height';
                 $transformName = $fields['transformName'] ?? 'base';
                 // Quote all the things here for clarity
-                $transformName = '"' . $transformName . '"';
-                $transformMode = '"' . $transformMode . '"';
+                $transformName = '"'.$transformName.'"';
+                $transformMode = '"'.$transformMode.'"';
                 // Special-case Twitter transforms
                 if ($fieldName === 'twitterImage') {
                     $transformName = 'seomatic.helper.twitterTransform()';
@@ -173,30 +173,30 @@ 
                 if ($transformImage) {
                     switch ($source) {
                         case 'sameAsSeo':
-                            $seoSource = $bundleSettings[$seoField . 'Source'] ?? '';
-                            $seoIds = $bundleSettings[$seoField . 'Ids'] ?? [];
-                            $seoSourceField = $bundleSettings[$seoField . 'Field'] ?? '';
+                            $seoSource = $bundleSettings[$seoField.'Source'] ?? '';
+                            $seoIds = $bundleSettings[$seoField.'Ids'] ?? [];
+                            $seoSourceField = $bundleSettings[$seoField.'Field'] ?? '';
                             if (!empty($seoSource)) {
                                 switch ($seoSource) {
                                     case 'fromField':
                                         if (!empty($seoSourceField)) {
                                             $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
-                                                . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                                . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                                . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                         }
                                         break;
@@ -204,28 +204,28 @@ 
                                         if (!empty($seoIds)) {
                                             $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                         }
                                         break;
                                     default:
-                                        $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
-                                        $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
-                                        $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
+                                        $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
+                                        $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
+                                        $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
                                         break;
                                 }
                             }
@@ -233,22 +233,22 @@ 
                         case 'fromField':
                             if (!empty($sourceField)) {
                                 $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
-                                    . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                    . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                    . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                             }
                             break;
@@ -256,21 +256,21 @@ 
                             if (!empty($ids)) {
                                 $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                             }
                             break;
@@ -278,20 +278,20 @@ 
                 } else {
                     switch ($source) {
                         case 'sameAsSeo':
-                            $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
-                            $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
-                            $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
+                            $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
+                            $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
+                            $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
                             break;
                         case 'fromField':
                             if (!empty($sourceField)) {
                                 $globalsSettings[$fieldName] = '{{ '
-                                    . $elementName . $sourceField . '.collect()[0].url'
+                                    . $elementName.$sourceField.'.collect()[0].url'
                                     . ' }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ '
-                                    . $elementName . $sourceField . '.collect()[0].width'
+                                    . $elementName.$sourceField.'.collect()[0].width'
                                     . ' }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ '
-                                    . $elementName . $sourceField . '.collect()[0].height'
+                                    . $elementName.$sourceField.'.collect()[0].height'
                                     . ' }}';
                             }
                             break;
@@ -299,13 +299,13 @@ 
                             if (!empty($ids)) {
                                 $globalsSettings[$fieldName] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').url }}';
+                                    . ', '.$siteId.').url }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').width }}';
+                                    . ', '.$siteId.').width }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').height }}';
+                                    . ', '.$siteId.').height }}';
                             }
                             break;
                     }

src/helpers/ImageTransform.php

Spacing +5 added lines, -5 removed lines

@@ -190,7 +190,7 @@ 
         }
         $asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
         if (($asset !== null) && ($asset instanceof Asset)) {
-            $width = (string)$asset->getWidth($transform);
+            $width = (string) $asset->getWidth($transform);
             if ($width === null) {
                 $width = '';
             }
@@ -222,7 +222,7 @@ 
         }
         $asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
         if (($asset !== null) && ($asset instanceof Asset)) {
-            $height = (string)$asset->getHeight($transform);
+            $height = (string) $asset->getHeight($transform);
             if ($height === null) {
                 $height = '';
             }
@@ -247,13 +247,13 @@ 
             if (is_array($assetIds)) {
                 foreach ($assetIds as $assetId) {
                     if (!empty($assetId)) {
-                        $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
+                        $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
                     }
                 }
             } else {
                 $assetId = $assetIds;
                 if (!empty($assetId)) {
-                    $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
+                    $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
                 }
             }
         }
@@ -290,7 +290,7 @@ 
             return $asset->one();
         }
 
-        $resolvedAssetId = (int)$asset;
+        $resolvedAssetId = (int) $asset;
         $resolvedSiteId = $siteId ?? 0;
         if (isset(self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId])) {
             return self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId];

src/helpers/Field.php

Spacing +6 added lines, -6 removed lines

@@ -123,7 +123,7 @@ 
         $foundFields = [];
         if (!empty(self::FIELD_CLASSES[$fieldClassKey])) {
             // Cache me if you can
-            $memoKey = $fieldClassKey . $layout->id . ($keysOnly ? 'keys' : 'nokeys');
+            $memoKey = $fieldClassKey.$layout->id.($keysOnly ? 'keys' : 'nokeys');
             if (!empty(self::$fieldsOfTypeFromLayoutCache[$memoKey])) {
                 return self::$fieldsOfTypeFromLayoutCache[$memoKey];
             }
@@ -240,8 +240,8 @@ 
                 // Prefix the keys with the global set name
                 $prefix = $global->handle;
                 $fields = array_combine(
-                    array_map(function ($key) use ($prefix) {
-                        return $prefix . '.' . $key;
+                    array_map(function($key) use ($prefix) {
+                        return $prefix.'.'.$key;
                     }, array_keys($fields)),
                     $fields
                 );
@@ -316,7 +316,7 @@ 
         }
         if ($matrixBlockTypeModel) {
             // Cache me if you can
-            $memoKey = $fieldType . $matrixBlock->id . ($keysOnly ? 'keys' : 'nokeys');
+            $memoKey = $fieldType.$matrixBlock->id.($keysOnly ? 'keys' : 'nokeys');
             if (!empty(self::$matrixFieldsOfTypeCache[$memoKey])) {
                 return self::$matrixFieldsOfTypeCache[$memoKey];
             }
@@ -359,7 +359,7 @@ 
         }
         if ($neoBlockTypeModel) {
             // Cache me if you can
-            $memoKey = $fieldType . $neoBlock->id . ($keysOnly ? 'keys' : 'nokeys');
+            $memoKey = $fieldType.$neoBlock->id.($keysOnly ? 'keys' : 'nokeys');
             if (!empty(self::$neoFieldsOfTypeCache[$memoKey])) {
                 return self::$neoFieldsOfTypeCache[$memoKey];
             }
@@ -401,7 +401,7 @@ 
         }
         if ($superTableBlockTypeModel) {
             // Cache me if you can
-            $memoKey = $fieldType . $superTableBlock->id . ($keysOnly ? 'keys' : 'nokeys');
+            $memoKey = $fieldType.$superTableBlock->id.($keysOnly ? 'keys' : 'nokeys');
             if (!empty(self::$superTableFieldsOfTypeCache[$memoKey])) {
                 return self::$superTableFieldsOfTypeCache[$memoKey];
             }

src/fields/Seomatic_Meta.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
     /**
      * @inheritdoc
      */
-    public function getContentColumnType(): array|string
+    public function getContentColumnType(): array | string
     {
         return Schema::TYPE_TEXT;
     }

src/seomatic-config/categorymeta/TitleContainer.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  */
 
 return [
-    MetaTitleContainer::CONTAINER_TYPE . TitleService::GENERAL_HANDLE => [
+    MetaTitleContainer::CONTAINER_TYPE.TitleService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'Meta Title Tag',
         'handle' => TitleService::GENERAL_HANDLE,
-        'class' => (string)MetaTitleContainer::class,
+        'class' => (string) MetaTitleContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/seomatic-config/categorymeta/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' => [
         ],