Inspection of "Merge branch 'release/4.0.21' into v4" - nystudio107/craft-seomatic - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — v4 (2d2527)

by Andrew

created 2023-03-10 02:50 UTC

Spacing +75 added lines, -75 removed lines patch added patch discarded remove patch

@@ -65,19 +65,19 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
                 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 @@  discard block
 block discarded – undo
                                         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 @@  discard block
 block discarded – undo
                         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 @@  discard block
 block discarded – undo
                             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 @@  discard block
 block discarded – undo
                 } 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 @@  discard block
 block discarded – undo
                             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;
                     }

Please login to merge, or discard this patch.

src/helpers/ImageTransform.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -190,7 +190,7 @@  discard block
 block discarded – undo
         }
         $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 @@  discard block
 block discarded – undo
         }
         $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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
             return $asset->one();
         }
 
-        $resolvedAssetId = (int)$asset;
+        $resolvedAssetId = (int) $asset;
         $resolvedSiteId = $siteId ?? 0;
         if (isset(self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId])) {
             return self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId];

Please login to merge, or discard this patch.

src/helpers/Field.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -123,7 +123,7 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                 // 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 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
         }
         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];
             }

Please login to merge, or discard this patch.

src/fields/Seomatic_Meta.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

src/seomatic-config/categorymeta/TitleContainer.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@
 block discarded – undo
  */
 
 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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/categorymeta/JsonLdContainer.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@
 block discarded – undo
  */
 
 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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/digitalproductmeta/TitleContainer.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@
 block discarded – undo
  */
 
 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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/digitalproductmeta/JsonLdContainer.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@
 block discarded – undo
  */
 
 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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/entrymeta/TitleContainer.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@
 block discarded – undo
  */
 
 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' => [
         ],

Please login to merge, or discard this patch.

		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	}
191	191	$asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
192	192	if (($asset !== null) && ($asset instanceof Asset)) {
193		- $width = (string)$asset->getWidth($transform);
	193	+ $width = (string) $asset->getWidth($transform);
194	194	if ($width === null) {
195	195	$width = '';
196	196	}
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	}
223	223	$asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
224	224	if (($asset !== null) && ($asset instanceof Asset)) {
225		- $height = (string)$asset->getHeight($transform);
	225	+ $height = (string) $asset->getHeight($transform);
226	226	if ($height === null) {
227	227	$height = '';
228	228	}
		@@ -247,13 +247,13 @@ discard block
		block discarded – undo
247	247	if (is_array($assetIds)) {
248	248	foreach ($assetIds as $assetId) {
249	249	if (!empty($assetId)) {
250		- $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
	250	+ $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
251	251	}
252	252	}
253	253	} else {
254	254	$assetId = $assetIds;
255	255	if (!empty($assetId)) {
256		- $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
	256	+ $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
257	257	}
258	258	}
259	259	}
		@@ -290,7 +290,7 @@ discard block
		block discarded – undo
290	290	return $asset->one();
291	291	}
292	292
293		- $resolvedAssetId = (int)$asset;
	293	+ $resolvedAssetId = (int) $asset;
294	294	$resolvedSiteId = $siteId ?? 0;
295	295	if (isset(self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId])) {
296	296	return self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId];

		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$foundFields = [];
124	124	if (!empty(self::FIELD_CLASSES[$fieldClassKey])) {
125	125	// Cache me if you can
126		- $memoKey = $fieldClassKey . $layout->id . ($keysOnly ? 'keys' : 'nokeys');
	126	+ $memoKey = $fieldClassKey.$layout->id.($keysOnly ? 'keys' : 'nokeys');
127	127	if (!empty(self::$fieldsOfTypeFromLayoutCache[$memoKey])) {
128	128	return self::$fieldsOfTypeFromLayoutCache[$memoKey];
129	129	}
		@@ -240,8 +240,8 @@ discard block
		block discarded – undo
240	240	// Prefix the keys with the global set name
241	241	$prefix = $global->handle;
242	242	$fields = array_combine(
243		- array_map(function ($key) use ($prefix) {
244		- return $prefix . '.' . $key;
	243	+ array_map(function($key) use ($prefix) {
	244	+ return $prefix.'.'.$key;
245	245	}, array_keys($fields)),
246	246	$fields
247	247	);
		@@ -316,7 +316,7 @@ discard block
		block discarded – undo
316	316	}
317	317	if ($matrixBlockTypeModel) {
318	318	// Cache me if you can
319		- $memoKey = $fieldType . $matrixBlock->id . ($keysOnly ? 'keys' : 'nokeys');
	319	+ $memoKey = $fieldType.$matrixBlock->id.($keysOnly ? 'keys' : 'nokeys');
320	320	if (!empty(self::$matrixFieldsOfTypeCache[$memoKey])) {
321	321	return self::$matrixFieldsOfTypeCache[$memoKey];
322	322	}
		@@ -359,7 +359,7 @@ discard block
		block discarded – undo
359	359	}
360	360	if ($neoBlockTypeModel) {
361	361	// Cache me if you can
362		- $memoKey = $fieldType . $neoBlock->id . ($keysOnly ? 'keys' : 'nokeys');
	362	+ $memoKey = $fieldType.$neoBlock->id.($keysOnly ? 'keys' : 'nokeys');
363	363	if (!empty(self::$neoFieldsOfTypeCache[$memoKey])) {
364	364	return self::$neoFieldsOfTypeCache[$memoKey];
365	365	}
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	}
402	402	if ($superTableBlockTypeModel) {
403	403	// Cache me if you can
404		- $memoKey = $fieldType . $superTableBlock->id . ($keysOnly ? 'keys' : 'nokeys');
	404	+ $memoKey = $fieldType.$superTableBlock->id.($keysOnly ? 'keys' : 'nokeys');
405	405	if (!empty(self::$superTableFieldsOfTypeCache[$memoKey])) {
406	406	return self::$superTableFieldsOfTypeCache[$memoKey];
407	407	}

		@@ -65,19 +65,19 @@ discard block
		block discarded – undo
65	65	}
66	66	foreach (self::PULL_TEXT_FIELDS as $fields) {
67	67	$fieldName = $fields['fieldName'];
68		- $source = $bundleSettings[$fieldName . 'Source'] ?? '';
69		- $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
	68	+ $source = $bundleSettings[$fieldName.'Source'] ?? '';
	69	+ $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
70	70	if (!empty($source)) {
71	71	$seoField = $fields['seoField'];
72	72	switch ($source) {
73	73	case 'sameAsSeo':
74	74	$globalsSettings[$fieldName] =
75		- '{{ seomatic.meta.' . $seoField . ' }}';
	75	+ '{{ seomatic.meta.'.$seoField.' }}';
76	76	break;
77	77
78	78	case 'sameAsSiteTwitter':
79	79	$globalsSettings[$fieldName] =
80		- '{{ seomatic.site.' . $seoField . ' }}';
	80	+ '{{ seomatic.site.'.$seoField.' }}';
81	81	break;
82	82
83	83	case 'sameAsGlobal':
		@@ -88,28 +88,28 @@ discard block
		block discarded – undo
88	88	case 'fromField':
89	89	$globalsSettings[$fieldName] =
90	90	'{{ seomatic.helper.extractTextFromField('
91		- . $objectPrefix . $elementName . $sourceField
	91	+ . $objectPrefix.$elementName.$sourceField
92	92	. ') }}';
93	93	break;
94	94
95	95	case 'fromUserField':
96	96	$globalsSettings[$fieldName] =
97	97	'{{ seomatic.helper.extractTextFromField('
98		- . $objectPrefix . $elementName . 'author.' . $sourceField
	98	+ . $objectPrefix.$elementName.'author.'.$sourceField
99	99	. ') }}';
100	100	break;
101	101
102	102	case 'summaryFromField':
103	103	$globalsSettings[$fieldName] =
104	104	'{{ seomatic.helper.extractSummary(seomatic.helper.extractTextFromField('
105		- . $objectPrefix . $elementName . $sourceField
	105	+ . $objectPrefix.$elementName.$sourceField
106	106	. ')) }}';
107	107	break;
108	108
109	109	case 'keywordsFromField':
110	110	$globalsSettings[$fieldName] =
111	111	'{{ seomatic.helper.extractKeywords(seomatic.helper.extractTextFromField('
112		- . $objectPrefix . $elementName . $sourceField
	112	+ . $objectPrefix.$elementName.$sourceField
113	113	. ')) }}';
114	114	break;
115	115
		@@ -140,25 +140,25 @@ discard block
		block discarded – undo
140	140	}
141	141	foreach (self::PULL_ASSET_FIELDS as $fields) {
142	142	$fieldName = $fields['fieldName'];
143		- $fieldNameWidth = $fields['fieldName'] . 'Width';
144		- $fieldNameHeight = $fields['fieldName'] . 'Height';
145		- $source = $bundleSettings[$fieldName . 'Source'] ?? '';
146		- $ids = $bundleSettings[$fieldName . 'Ids'] ?? [];
147		- $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
	143	+ $fieldNameWidth = $fields['fieldName'].'Width';
	144	+ $fieldNameHeight = $fields['fieldName'].'Height';
	145	+ $source = $bundleSettings[$fieldName.'Source'] ?? '';
	146	+ $ids = $bundleSettings[$fieldName.'Ids'] ?? [];
	147	+ $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
148	148	if (!empty($source)) {
149		- $transformImage = $bundleSettings[$fieldName . 'Transform'] ?? true;
	149	+ $transformImage = $bundleSettings[$fieldName.'Transform'] ?? true;
150	150	$seoField = $fields['seoField'];
151	151	$tranformModeField = $fields['transformModeField'];
152	152	$transformMode = $bundleSettings[$tranformModeField] ?? 'crop';
153	153	if (empty($transformMode)) {
154	154	$transformMode = 'crop';
155	155	}
156		- $seoFieldWidth = $fields['seoField'] . 'Width';
157		- $seoFieldHeight = $fields['seoField'] . 'Height';
	156	+ $seoFieldWidth = $fields['seoField'].'Width';
	157	+ $seoFieldHeight = $fields['seoField'].'Height';
158	158	$transformName = $fields['transformName'] ?? 'base';
159	159	// Quote all the things here for clarity
160		- $transformName = '"' . $transformName . '"';
161		- $transformMode = '"' . $transformMode . '"';
	160	+ $transformName = '"'.$transformName.'"';
	161	+ $transformMode = '"'.$transformMode.'"';
162	162	// Special-case Twitter transforms
163	163	if ($fieldName === 'twitterImage') {
164	164	$transformName = 'seomatic.helper.twitterTransform()';
		@@ -173,30 +173,30 @@ discard block
		block discarded – undo
173	173	if ($transformImage) {
174	174	switch ($source) {
175	175	case 'sameAsSeo':
176		- $seoSource = $bundleSettings[$seoField . 'Source'] ?? '';
177		- $seoIds = $bundleSettings[$seoField . 'Ids'] ?? [];
178		- $seoSourceField = $bundleSettings[$seoField . 'Field'] ?? '';
	176	+ $seoSource = $bundleSettings[$seoField.'Source'] ?? '';
	177	+ $seoIds = $bundleSettings[$seoField.'Ids'] ?? [];
	178	+ $seoSourceField = $bundleSettings[$seoField.'Field'] ?? '';
179	179	if (!empty($seoSource)) {
180	180	switch ($seoSource) {
181	181	case 'fromField':
182	182	if (!empty($seoSourceField)) {
183	183	$globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
184		- . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
185		- . ', ' . $transformName
186		- . ', ' . $siteId
187		- . ', ' . $transformMode
	184	+ . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
	185	+ . ', '.$transformName
	186	+ . ', '.$siteId
	187	+ . ', '.$transformMode
188	188	. ') }}';
189	189	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
190		- . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
191		- . ', ' . $transformName
192		- . ', ' . $siteId
193		- . ', ' . $transformMode
	190	+ . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
	191	+ . ', '.$transformName
	192	+ . ', '.$siteId
	193	+ . ', '.$transformMode
194	194	. ') }}';
195	195	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
196		- . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]'
197		- . ', ' . $transformName
198		- . ', ' . $siteId
199		- . ', ' . $transformMode
	196	+ . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]'
	197	+ . ', '.$transformName
	198	+ . ', '.$siteId
	199	+ . ', '.$transformMode
200	200	. ') }}';
201	201	}
202	202	break;
		@@ -204,28 +204,28 @@ discard block
		block discarded – undo
204	204	if (!empty($seoIds)) {
205	205	$globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
206	206	. $seoIds[0]
207		- . ', ' . $transformName
208		- . ', ' . $siteId
209		- . ', ' . $transformMode
	207	+ . ', '.$transformName
	208	+ . ', '.$siteId
	209	+ . ', '.$transformMode
210	210	. ') }}';
211	211	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
212	212	. $seoIds[0]
213		- . ', ' . $transformName
214		- . ', ' . $siteId
215		- . ', ' . $transformMode
	213	+ . ', '.$transformName
	214	+ . ', '.$siteId
	215	+ . ', '.$transformMode
216	216	. ') }}';
217	217	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
218	218	. $seoIds[0]
219		- . ', ' . $transformName
220		- . ', ' . $siteId
221		- . ', ' . $transformMode
	219	+ . ', '.$transformName
	220	+ . ', '.$siteId
	221	+ . ', '.$transformMode
222	222	. ') }}';
223	223	}
224	224	break;
225	225	default:
226		- $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
227		- $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
228		- $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
	226	+ $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
	227	+ $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
	228	+ $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
229	229	break;
230	230	}
231	231	}
		@@ -233,22 +233,22 @@ discard block
		block discarded – undo
233	233	case 'fromField':
234	234	if (!empty($sourceField)) {
235	235	$globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
236		- . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
237		- . ', ' . $transformName
238		- . ', ' . $siteId
239		- . ', ' . $transformMode
	236	+ . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
	237	+ . ', '.$transformName
	238	+ . ', '.$siteId
	239	+ . ', '.$transformMode
240	240	. ') }}';
241	241	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
242		- . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
243		- . ', ' . $transformName
244		- . ', ' . $siteId
245		- . ', ' . $transformMode
	242	+ . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
	243	+ . ', '.$transformName
	244	+ . ', '.$siteId
	245	+ . ', '.$transformMode
246	246	. ') }}';
247	247	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
248		- . $objectPrefix . $elementName . $sourceField . '.collect()[0]'
249		- . ', ' . $transformName
250		- . ', ' . $siteId
251		- . ', ' . $transformMode
	248	+ . $objectPrefix.$elementName.$sourceField.'.collect()[0]'
	249	+ . ', '.$transformName
	250	+ . ', '.$siteId
	251	+ . ', '.$transformMode
252	252	. ') }}';
253	253	}
254	254	break;
		@@ -256,21 +256,21 @@ discard block
		block discarded – undo
256	256	if (!empty($ids)) {
257	257	$globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
258	258	. $ids[0]
259		- . ', ' . $transformName
260		- . ', ' . $siteId
261		- . ', ' . $transformMode
	259	+ . ', '.$transformName
	260	+ . ', '.$siteId
	261	+ . ', '.$transformMode
262	262	. ') }}';
263	263	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
264	264	. $ids[0]
265		- . ', ' . $transformName
266		- . ', ' . $siteId
267		- . ', ' . $transformMode
	265	+ . ', '.$transformName
	266	+ . ', '.$siteId
	267	+ . ', '.$transformMode
268	268	. ') }}';
269	269	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
270	270	. $ids[0]
271		- . ', ' . $transformName
272		- . ', ' . $siteId
273		- . ', ' . $transformMode
	271	+ . ', '.$transformName
	272	+ . ', '.$siteId
	273	+ . ', '.$transformMode
274	274	. ') }}';
275	275	}
276	276	break;
		@@ -278,20 +278,20 @@ discard block
		block discarded – undo
278	278	} else {
279	279	switch ($source) {
280	280	case 'sameAsSeo':
281		- $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
282		- $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
283		- $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
	281	+ $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
	282	+ $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
	283	+ $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
284	284	break;
285	285	case 'fromField':
286	286	if (!empty($sourceField)) {
287	287	$globalsSettings[$fieldName] = '{{ '
288		- . $elementName . $sourceField . '.collect()[0].url'
	288	+ . $elementName.$sourceField.'.collect()[0].url'
289	289	. ' }}';
290	290	$globalsSettings[$fieldNameWidth] = '{{ '
291		- . $elementName . $sourceField . '.collect()[0].width'
	291	+ . $elementName.$sourceField.'.collect()[0].width'
292	292	. ' }}';
293	293	$globalsSettings[$fieldNameHeight] = '{{ '
294		- . $elementName . $sourceField . '.collect()[0].height'
	294	+ . $elementName.$sourceField.'.collect()[0].height'
295	295	. ' }}';
296	296	}
297	297	break;
		@@ -299,13 +299,13 @@ discard block
		block discarded – undo
299	299	if (!empty($ids)) {
300	300	$globalsSettings[$fieldName] = '{{ craft.app.assets.assetById('
301	301	. $ids[0]
302		- . ', ' . $siteId . ').url }}';
	302	+ . ', '.$siteId.').url }}';
303	303	$globalsSettings[$fieldNameWidth] = '{{ craft.app.assets.assetById('
304	304	. $ids[0]
305		- . ', ' . $siteId . ').width }}';
	305	+ . ', '.$siteId.').width }}';
306	306	$globalsSettings[$fieldNameHeight] = '{{ craft.app.assets.assetById('
307	307	. $ids[0]
308		- . ', ' . $siteId . ').height }}';
	308	+ . ', '.$siteId.').height }}';
309	309	}
310	310	break;
311	311	}

		@@ -97,7 +97,7 @@
		block discarded – undo
97	97	/**
98	98	* @inheritdoc
99	99	*/
100		- public function getContentColumnType(): array\|string
	100	+ public function getContentColumnType(): array \| string
101	101	{
102	102	return Schema::TYPE_TEXT;
103	103	}

		@@ -19,11 +19,11 @@
		block discarded – undo
19	19	*/
20	20
21	21	return [
22		- MetaTitleContainer::CONTAINER_TYPE . TitleService::GENERAL_HANDLE => [
	22	+ MetaTitleContainer::CONTAINER_TYPE.TitleService::GENERAL_HANDLE => [
23	23	'name' => 'General',
24	24	'description' => 'Meta Title Tag',
25	25	'handle' => TitleService::GENERAL_HANDLE,
26		- 'class' => (string)MetaTitleContainer::class,
	26	+ 'class' => (string) MetaTitleContainer::class,
27	27	'include' => true,
28	28	'dependencies' => [
29	29	],

nystudio107 / craft-seomatic

Branch — v4 (2d2527)

Category

Spacing +75 added lines, -75 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch