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

Passed

Push — v3 ( 7f2a90...c48bde )

by Andrew

created 2024-11-20 18:25 UTC

Status

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

@@ -19,44 +19,44 @@
 block discarded – undo
  */
 
 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' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/productmeta/TagContainer.php 1 patch

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

@@ -19,44 +19,44 @@
 block discarded – undo
  */
 
 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' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],

Please login to merge, or discard this patch.

src/seomatic-config/eventmeta/TagContainer.php 1 patch

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

@@ -19,44 +19,44 @@
 block discarded – undo
  */
 
 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' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],

Please login to merge, or discard this patch.

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

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

@@ -19,44 +19,44 @@
 block discarded – undo
  */
 
 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' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],

Please login to merge, or discard this patch.

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

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

@@ -19,44 +19,44 @@
 block discarded – undo
  */
 
 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' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],
         'data' => [
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
         'data' => [
         ],
     ],
-    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' => [
         ],

Please login to merge, or discard this patch.

src/seoelements/SeoProduct.php 1 patch

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

@@ -388,7 +388,7 @@
 block discarded – undo
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

Please login to merge, or discard this patch.

src/seoelements/SeoCampaign.php 1 patch

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

@@ -388,7 +388,7 @@
 block discarded – undo
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

Please login to merge, or discard this patch.

src/helpers/Schema.php 1 patch

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

@@ -99,7 +99,7 @@  discard block
 block discarded – undo
             // 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;
                 }
             }
         }
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
         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;
         }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
     {
         $result = [];
         while ($schemaType) {
-            $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
+            $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
             if (class_exists($className)) {
                 $classRef = new ReflectionClass($className);
                 $staticProps = $classRef->getStaticProperties();
@@ -242,15 +242,15 @@  discard block
 block discarded – undo
         $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',
+            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');
@@ -315,12 +315,12 @@  discard block
 block discarded – undo
         $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',
+            self::CACHE_KEY.'schemaTree',
             function() {
                 Craft::info(
                     'schemaTree cache miss',
@@ -384,11 +384,11 @@  discard block
 block discarded – undo
         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;
             }
         }
 
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
             $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);
@@ -509,12 +509,12 @@  discard block
 block discarded – undo
             $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;
@@ -533,12 +533,12 @@  discard block
 block discarded – undo
         $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',
+            self::CACHE_KEY.'googleRichSnippets',
             function() {
                 Craft::info(
                     'googleRichSnippets cache miss',

Please login to merge, or discard this patch.

src/helpers/PullField.php 1 patch

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'];
                 // 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
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                                . $objectPrefix . $elementName . $seoSourceField
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                                . $objectPrefix . $elementName . $seoSourceField
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$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
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                    . $objectPrefix . $elementName . $sourceField
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                    . $objectPrefix . $elementName . $sourceField
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$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 . '[0].url'
+                                    . $elementName.$sourceField.'[0].url'
                                     . ' }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ '
-                                    . $elementName . $sourceField . '[0].width'
+                                    . $elementName.$sourceField.'[0].width'
                                     . ' }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ '
-                                    . $elementName . $sourceField . '[0].height'
+                                    . $elementName.$sourceField.'[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.

		@@ -388,7 +388,7 @@
		block discarded – undo
388	388	ConfigHelper::getConfigFromFile(self::configFilePath()),
389	389	[
390	390	'sourceId' => $sourceModel->id,
391		- 'sourceName' => (string)$sourceModel->name,
	391	+ 'sourceName' => (string) $sourceModel->name,
392	392	'sourceHandle' => $sourceModel->handle,
393	393	]
394	394	);

		@@ -388,7 +388,7 @@
		block discarded – undo
388	388	ConfigHelper::getConfigFromFile(self::configFilePath()),
389	389	[
390	390	'sourceId' => $sourceModel->id,
391		- 'sourceName' => (string)$sourceModel->name,
	391	+ 'sourceName' => (string) $sourceModel->name,
392	392	'sourceHandle' => $sourceModel->handle,
393	393	]
394	394	);

		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99	// Go from most specific type to least specific type
100	100	foreach (self::SCHEMA_TYPES as $schemaType) {
101	101	if (!empty($settings[$schemaType]) && ($settings[$schemaType] !== 'none')) {
102		- $result = $settings[$schemaType] . self::SCHEMA_PATH_DELIMITER . $result;
	102	+ $result = $settings[$schemaType].self::SCHEMA_PATH_DELIMITER.$result;
103	103	}
104	104	}
105	105	}
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	if (isset($result['schemaTypeDescription'])) {
125	125	$description = $result['schemaTypeDescription'];
126	126	$description = preg_replace("`\[\[([A-z]*)\]\]`", '[$1](https://schema.org/$1)', $description);
127		- $description = Markdown::process((string)$description);
	127	+ $description = Markdown::process((string) $description);
128	128	$description = str_replace(['<p>', '</p>', '\n'], ['', '', ' '], $description);
129	129	$result['schemaTypeDescription'] = $description;
130	130	}
		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143	{
144	144	$result = [];
145	145	while ($schemaType) {
146		- $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
	146	+ $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
147	147	if (class_exists($className)) {
148	148	$classRef = new ReflectionClass($className);
149	149	$staticProps = $classRef->getStaticProperties();
		@@ -242,15 +242,15 @@ discard block
		block discarded – undo
242	242	$dependency = new TagDependency([
243	243	'tags' => [
244	244	self::GLOBAL_SCHEMA_CACHE_TAG,
245		- self::SCHEMA_CACHE_TAG . 'schemaArray',
	245	+ self::SCHEMA_CACHE_TAG.'schemaArray',
246	246	],
247	247	]);
248	248	$cache = Craft::$app->getCache();
249	249	$typesArray = $cache->getOrSet(
250		- self::CACHE_KEY . 'schemaArray',
	250	+ self::CACHE_KEY.'schemaArray',
251	251	function() use ($path) {
252	252	Craft::info(
253		- 'schemaArray cache miss: ' . $path,
	253	+ 'schemaArray cache miss: '.$path,
254	254	__METHOD__
255	255	);
256	256	$filePath = Craft::getAlias('@nystudio107/seomatic/resources/schema/tree.jsonld');
		@@ -315,12 +315,12 @@ discard block
		block discarded – undo
315	315	$dependency = new TagDependency([
316	316	'tags' => [
317	317	self::GLOBAL_SCHEMA_CACHE_TAG,
318		- self::SCHEMA_CACHE_TAG . 'schemaTree',
	318	+ self::SCHEMA_CACHE_TAG.'schemaTree',
319	319	],
320	320	]);
321	321	$cache = Craft::$app->getCache();
322	322	$typesArray = $cache->getOrSet(
323		- self::CACHE_KEY . 'schemaTree',
	323	+ self::CACHE_KEY.'schemaTree',
324	324	function() {
325	325	Craft::info(
326	326	'schemaTree cache miss',
		@@ -384,11 +384,11 @@ discard block
		block discarded – undo
384	384	foreach ($typesArray as $key => $value) {
385	385	$indent = html_entity_decode(str_repeat(' ', $indentLevel));
386	386	if (is_array($value)) {
387		- $result[$key] = $indent . $key;
	387	+ $result[$key] = $indent.$key;
388	388	$value = self::flattenSchemaArray($value, $indentLevel + self::MENU_INDENT_STEP);
389	389	$result = array_merge($result, $value);
390	390	} else {
391		- $result[$key] = $indent . $value;
	391	+ $result[$key] = $indent.$value;
392	392	}
393	393	}
394	394
		@@ -482,7 +482,7 @@ discard block
		block discarded – undo
482	482	$children = [];
483	483	$name = $typesArray['name'];
484	484	// Construct a path-based $id, excluding the top-level `Thing` schema
485		- $id = $name === 'Thing' ? '' : $path . self::SCHEMA_PATH_DELIMITER . $name;
	485	+ $id = $name === 'Thing' ? '' : $path.self::SCHEMA_PATH_DELIMITER.$name;
486	486	$id = ltrim($id, self::SCHEMA_PATH_DELIMITER);
487	487	// Make sure we have at most 3 specifiers in the schema path
488	488	$parts = explode(self::SCHEMA_PATH_DELIMITER, $id);
		@@ -509,12 +509,12 @@ discard block
		block discarded – undo
509	509	$schemaPath = explode(self::SCHEMA_PATH_DELIMITER, $id);
510	510	// Use only the specific (last) type for now, rather than the complete path of types
511	511	$schemaPath = [end($schemaPath)];
512		- if ((bool)array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
513		- $name .= ' (' . Craft::t('seomatic', 'Google rich result') . ')';
	512	+ if ((bool) array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
	513	+ $name .= ' ('.Craft::t('seomatic', 'Google rich result').')';
514	514	}
515	515	// Mark it as pending, if applicable
516	516	if (isset($typesArray['pending']) && $typesArray['pending']) {
517		- $name .= ' (' . Craft::t('seomatic', 'pending') . ')';
	517	+ $name .= ' ('.Craft::t('seomatic', 'pending').')';
518	518	}
519	519	$result['label'] = $name;
520	520	$result['id'] = $id;
		@@ -533,12 +533,12 @@ discard block
		block discarded – undo
533	533	$dependency = new TagDependency([
534	534	'tags' => [
535	535	self::GLOBAL_SCHEMA_CACHE_TAG,
536		- self::SCHEMA_CACHE_TAG . 'googleRichSnippets',
	536	+ self::SCHEMA_CACHE_TAG.'googleRichSnippets',
537	537	],
538	538	]);
539	539	$cache = Craft::$app->getCache();
540	540	return $cache->getOrSet(
541		- self::CACHE_KEY . 'googleRichSnippets',
	541	+ self::CACHE_KEY.'googleRichSnippets',
542	542	function() {
543	543	Craft::info(
544	544	'googleRichSnippets cache miss',

		@@ -19,44 +19,44 @@
		block discarded – undo
19	19	*/
20	20
21	21	return [
22		- MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [
	22	+ MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [
23	23	'name' => 'General',
24	24	'description' => 'General Meta Tags',
25	25	'handle' => TagService::GENERAL_HANDLE,
26		- 'class' => (string)MetaTagContainer::class,
	26	+ 'class' => (string) MetaTagContainer::class,
27	27	'include' => true,
28	28	'dependencies' => [
29	29	],
30	30	'data' => [
31	31	],
32	32	],
33		- MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [
	33	+ MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [
34	34	'name' => 'Facebook',
35	35	'description' => 'Facebook OpenGraph Meta Tags',
36	36	'handle' => TagService::FACEBOOK_HANDLE,
37		- 'class' => (string)MetaTagContainer::class,
	37	+ 'class' => (string) MetaTagContainer::class,
38	38	'include' => true,
39	39	'dependencies' => [
40	40	],
41	41	'data' => [
42	42	],
43	43	],
44		- MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
	44	+ MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
45	45	'name' => 'Twitter',
46	46	'description' => 'Twitter Card Meta Tags',
47	47	'handle' => TagService::TWITTER_HANDLE,
48		- 'class' => (string)MetaTagContainer::class,
	48	+ 'class' => (string) MetaTagContainer::class,
49	49	'include' => true,
50	50	'dependencies' => [
51	51	],
52	52	'data' => [
53	53	],
54	54	],
55		- MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [
	55	+ MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [
56	56	'name' => 'Miscellaneous',
57	57	'description' => 'Miscellaneous Meta Tags',
58	58	'handle' => TagService::MISC_HANDLE,
59		- 'class' => (string)MetaTagContainer::class,
	59	+ 'class' => (string) MetaTagContainer::class,
60	60	'include' => true,
61	61	'dependencies' => [
62	62	],

		@@ -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'];
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
185		- . ', ' . $transformName
186		- . ', ' . $siteId
187		- . ', ' . $transformMode
	184	+ . $objectPrefix.$elementName.$seoSourceField
	185	+ . ', '.$transformName
	186	+ . ', '.$siteId
	187	+ . ', '.$transformMode
188	188	. ') }}';
189	189	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
190		- . $objectPrefix . $elementName . $seoSourceField
191		- . ', ' . $transformName
192		- . ', ' . $siteId
193		- . ', ' . $transformMode
	190	+ . $objectPrefix.$elementName.$seoSourceField
	191	+ . ', '.$transformName
	192	+ . ', '.$siteId
	193	+ . ', '.$transformMode
194	194	. ') }}';
195	195	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
196		- . $objectPrefix . $elementName . $seoSourceField
197		- . ', ' . $transformName
198		- . ', ' . $siteId
199		- . ', ' . $transformMode
	196	+ . $objectPrefix.$elementName.$seoSourceField
	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
237		- . ', ' . $transformName
238		- . ', ' . $siteId
239		- . ', ' . $transformMode
	236	+ . $objectPrefix.$elementName.$sourceField
	237	+ . ', '.$transformName
	238	+ . ', '.$siteId
	239	+ . ', '.$transformMode
240	240	. ') }}';
241	241	$globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
242		- . $objectPrefix . $elementName . $sourceField
243		- . ', ' . $transformName
244		- . ', ' . $siteId
245		- . ', ' . $transformMode
	242	+ . $objectPrefix.$elementName.$sourceField
	243	+ . ', '.$transformName
	244	+ . ', '.$siteId
	245	+ . ', '.$transformMode
246	246	. ') }}';
247	247	$globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
248		- . $objectPrefix . $elementName . $sourceField
249		- . ', ' . $transformName
250		- . ', ' . $siteId
251		- . ', ' . $transformMode
	248	+ . $objectPrefix.$elementName.$sourceField
	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 . '[0].url'
	288	+ . $elementName.$sourceField.'[0].url'
289	289	. ' }}';
290	290	$globalsSettings[$fieldNameWidth] = '{{ '
291		- . $elementName . $sourceField . '[0].width'
	291	+ . $elementName.$sourceField.'[0].width'
292	292	. ' }}';
293	293	$globalsSettings[$fieldNameHeight] = '{{ '
294		- . $elementName . $sourceField . '[0].height'
	294	+ . $elementName.$sourceField.'[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	}

nystudio107 / craft-seomatic

Push — v3 ( 7f2a90...c48bde )

Status

Category

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

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

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

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

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

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

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

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

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