nystudio107 / craft-seomatic

src/debug/views/seomatic/render-tag.php

Braces +5 added lines, -2 removed lines

@@ -75,8 +75,11 @@
                     </ul><?php endif; ?><?php endforeach; ?><?php endif; ?></div>
         </details>
     </td>
-<?php else: ?>
+<?php else {
+    : ?>
     <td>
         <div class="callout callout-secondary seomatic-callout">not included</div>
     </td>
-<?php endif; ?>
+<?php endif;
+}
+?>

src/debug/views/seomatic/render-value.php

Braces +5 added lines, -2 removed lines

@@ -45,7 +45,10 @@
             </div>
         </details>
     </td>
-<?php else: ?>
+<?php else {
+    : ?>
     <td><?= htmlspecialchars(VarDumper::dumpAsString($value), ENT_QUOTES | ENT_SUBSTITUTE,
             Yii::$app->charset, true) ?></td>
-<?php endif; ?>
+<?php endif;
+}
+?>

src/seoelements/SeoEvent.php

Spacing +3 added lines, -3 removed lines

@@ -241,8 +241,8 @@ 
         $query
             ->setCalendar($metaBundle->sourceHandle)
             ->setLoadOccurrences(false)
-            ->siteId((int)$metaBundle->sourceSiteId)
-            ->limit((int)$metaBundle->metaSitemapVars->sitemapLimit);
+            ->siteId((int) $metaBundle->sourceSiteId)
+            ->limit((int) $metaBundle->metaSitemapVars->sitemapLimit);
 
         return $query;
     }
@@ -405,7 +405,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
             ]
         );

src/base/FluentModel.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         // Set the property
         $value = $args[0];
         if (is_object($value) && $value instanceof Markup) {
-            $value = (string)$value;
+            $value = (string) $value;
         }
         $property->setValue($this, $value);
 

src/base/MetaItem.php

Spacing +6 added lines, -6 removed lines

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

src/models/MetaSiteVars.php

Spacing +2 added lines, -2 removed lines

@@ -238,10 +238,10 @@
         }
         // Make sure these are strings
         if (!empty($this->facebookProfileId)) {
-            $this->facebookProfileId = (string)$this->facebookProfileId;
+            $this->facebookProfileId = (string) $this->facebookProfileId;
         }
         if (!empty($this->facebookAppId)) {
-            $this->facebookAppId = (string)$this->facebookAppId;
+            $this->facebookAppId = (string) $this->facebookAppId;
         }
         // Identity
         if (is_array($this->identity)) {

src/helpers/PullField.php

Spacing +75 added lines, -75 removed lines

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

src/models/Settings.php

Spacing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
      *     'default' => 'http://example.com/',
      *     'spanish' => 'http://example.com/es/',
      * ],     */
-    public string|array $siteUrlOverride = '';
+    public string | array $siteUrlOverride = '';
 
     /**
      * @var int|null

src/helpers/Text.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->truncate($length, $substring);
+            $result = (string) Stringy::create($string)->truncate($length, $substring);
         }
 
         return $result;
@@ -100,7 +100,7 @@ 
         if (!empty($string)) {
             $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']);
             $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-            $result = (string)Stringy::create($string)->safeTruncate($length, $substring);
+            $result = (string) Stringy::create($string)->safeTruncate($length, $substring);
         }
 
         return $result;
@@ -134,9 +134,9 @@ 
             $result = self::smartStripTags(Doxter::$plugin->getService()->parseMarkdown($field->getRaw()));
         } else {
             if (self::isArrayLike($field)) {
-                $result = self::smartStripTags((string)$field[0]);
+                $result = self::smartStripTags((string) $field[0]);
             } else {
-                $result = self::smartStripTags((string)$field);
+                $result = self::smartStripTags((string) $field);
             }
         }
 
@@ -163,7 +163,7 @@ 
             $tags = $tags->all();
         }
         foreach ($tags as $tag) {
-            $result .= $tag->title . ', ';
+            $result .= $tag->title.', ';
         }
         $result = rtrim($result, ', ');
 
@@ -205,7 +205,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -247,7 +247,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -297,7 +297,7 @@ 
                     foreach ($fieldClasses as $fieldClassKey) {
                         if ($field instanceof $fieldClassKey) {
                             if ($field->handle === $fieldHandle || empty($fieldHandle)) {
-                                $result .= self::extractTextFromField($block[$field->handle]) . ' ';
+                                $result .= self::extractTextFromField($block[$field->handle]).' ';
                             }
                         }
                     }
@@ -396,7 +396,7 @@ 
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         $str = rawurldecode($str);
         // Remove any linebreaks
-        $str = (string)preg_replace("/\r|\n/", "", $str);
+        $str = (string) preg_replace("/\r|\n/", "", $str);
         $str = HtmlPurifier::process($str, ['HTML.Allowed' => '']);
         $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
         // Remove any embedded Twig code
@@ -487,7 +487,7 @@ 
             $language = 'English';
         }
 
-        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\' . ucfirst($language);
+        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\'.ucfirst($language);
         if (class_exists($className)) {
             $stopWords = new $className();
         }