nystudio107 / craft-seomatic

src/services/Sitemaps.php

Spacing +16 added lines, -16 removed lines

@@ -42,11 +42,11 @@ 
     // Constants
     // =========================================================================
 
-    const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapIndexTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAPINDEX_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapIndexTemplate::TEMPLATE_TYPE;
 
-    const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAP_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapTemplate::TEMPLATE_TYPE;
 
-    const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE . SitemapCustomTemplate::TEMPLATE_TYPE;
+    const SEOMATIC_SITEMAPCUSTOM_CONTAINER = Seomatic::SEOMATIC_HANDLE.SitemapCustomTemplate::TEMPLATE_TYPE;
 
     const SEARCH_ENGINE_SUBMISSION_URLS = [
         'google' => 'https://www.google.com/ping?sitemap=',
@@ -91,7 +91,7 @@ 
             Event::on(
                 UrlManager::class,
                 UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-                function (RegisterUrlRulesEvent $event) {
+                function(RegisterUrlRulesEvent $event) {
                     Craft::debug(
                         'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                         __METHOD__
@@ -244,19 +244,19 @@ 
                         $siteId = $groupSiteIds[0];
                         $sitemapIndexUrl = $this->sitemapIndexUrlForSiteId($siteId);
                         if (!empty($sitemapIndexUrl)) {
-                            $submissionUrl = $url . urlencode($sitemapIndexUrl);
+                            $submissionUrl = $url.urlencode($sitemapIndexUrl);
                             // create new guzzle client
                             $guzzleClient = Craft::createGuzzleClient(['timeout' => 120, 'connect_timeout' => 120]);
                             // Submit the sitemap index to each search engine
                             try {
                                 $guzzleClient->post($submissionUrl);
                                 Craft::info(
-                                    'Sitemap index submitted to: ' . $submissionUrl,
+                                    'Sitemap index submitted to: '.$submissionUrl,
                                     __METHOD__
                                 );
                             } catch (\Exception $e) {
                                 Craft::error(
-                                    'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                                    'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                                     __METHOD__
                                 );
                             }
@@ -316,19 +316,19 @@ 
             foreach ($searchEngineUrls as &$url) {
                 $sitemapUrl = $this->sitemapUrlForBundle($sourceBundleType, $sourceHandle, $sourceSiteId);
                 if (!empty($sitemapUrl)) {
-                    $submissionUrl = $url . urlencode($sitemapUrl);
+                    $submissionUrl = $url.urlencode($sitemapUrl);
                     // create new guzzle client
                     $guzzleClient = Craft::createGuzzleClient(['timeout' => 120, 'connect_timeout' => 120]);
                     // Submit the sitemap index to each search engine
                     try {
                         $guzzleClient->post($submissionUrl);
                         Craft::info(
-                            'Sitemap index submitted to: ' . $submissionUrl,
+                            'Sitemap index submitted to: '.$submissionUrl,
                             __METHOD__
                         );
                     } catch (\Exception $e) {
                         Craft::error(
-                            'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                            'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                             __METHOD__
                         );
                     }
@@ -394,19 +394,19 @@ 
             foreach ($searchEngineUrls as &$url) {
                 $sitemapUrl = $this->sitemapCustomUrlForSiteId($siteId);
                 if (!empty($sitemapUrl)) {
-                    $submissionUrl = $url . urlencode($sitemapUrl);
+                    $submissionUrl = $url.urlencode($sitemapUrl);
                     // create new guzzle client
                     $guzzleClient = Craft::createGuzzleClient(['timeout' => 120, 'connect_timeout' => 120]);
                     // Submit the sitemap index to each search engine
                     try {
                         $guzzleClient->post($submissionUrl);
                         Craft::info(
-                            'Sitemap Custom submitted to: ' . $submissionUrl,
+                            'Sitemap Custom submitted to: '.$submissionUrl,
                             __METHOD__
                         );
                     } catch (\Exception $e) {
                         Craft::error(
-                            'Error submitting sitemap index to: ' . $submissionUrl . ' - ' . $e->getMessage(),
+                            'Error submitting sitemap index to: '.$submissionUrl.' - '.$e->getMessage(),
                             __METHOD__
                         );
                     }
@@ -484,7 +484,7 @@ 
         }
 
         foreach ($sites as $site) {
-            $result .= 'sitemap: ' . $this->sitemapIndexUrlForSiteId($site->id) . PHP_EOL;
+            $result .= 'sitemap: '.$this->sitemapIndexUrlForSiteId($site->id).PHP_EOL;
         }
 
         return rtrim($result, PHP_EOL);
@@ -516,9 +516,9 @@ 
         // Since we want a stale-while-revalidate pattern, only invalidate the cache if we're asked to
         if ($invalidateCache) {
             $cache = Craft::$app->getCache();
-            TagDependency::invalidate($cache, SitemapTemplate::SITEMAP_CACHE_TAG . $handle . $siteId);
+            TagDependency::invalidate($cache, SitemapTemplate::SITEMAP_CACHE_TAG.$handle.$siteId);
             Craft::info(
-                'Sitemap cache cleared: ' . $handle,
+                'Sitemap cache cleared: '.$handle,
                 __METHOD__
             );
         }

src/models/SitemapTemplate.php

Spacing +11 added lines, -11 removed lines

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

src/models/metalink/CanonicalLink.php

Spacing +1 added lines, -1 removed lines

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

src/models/MetaScript.php

Spacing +1 added lines, -1 removed lines

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

src/helpers/PullField.php

Spacing +75 added lines, -75 removed lines

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

src/helpers/ImageTransform.php

Spacing +5 added lines, -5 removed lines

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

src/helpers/Field.php

Spacing +6 added lines, -6 removed lines

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

src/helpers/Text.php

Spacing +12 added lines, -12 removed lines

@@ -70,7 +70,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;
@@ -95,7 +95,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;
@@ -127,9 +127,9 @@ 
             $result = self::extractTextFromTags($field);
         } else {
             if (is_array($field)) {
-                $result = self::smartStripTags((string)$field[0]);
+                $result = self::smartStripTags((string) $field[0]);
             } else {
-                $result = self::smartStripTags((string)$field);
+                $result = self::smartStripTags((string) $field);
             }
         }
 
@@ -156,7 +156,7 @@ 
             $tags = $tags->all();
         }
         foreach ($tags as $tag) {
-            $result .= $tag->title . ', ';
+            $result .= $tag->title.', ';
         }
         $result = rtrim($result, ', ');
 
@@ -198,7 +198,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]).' ';
                             }
                         }
                     }
@@ -244,7 +244,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]).' ';
                             }
                         }
                     }
@@ -290,7 +290,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]).' ';
                             }
                         }
                     }
@@ -335,7 +335,7 @@ 
 
         $result = is_array($keywords)
             ? implode(', ', array_slice(array_keys($keywords), 0, $limit))
-            : (string)$keywords;
+            : (string) $keywords;
 
         return self::sanitizeUserInput($result);
     }
@@ -373,7 +373,7 @@ 
 
         $result = is_array($sentences)
             ? implode(' ', $sentences)
-            : (string)$sentences;
+            : (string) $sentences;
 
         return self::sanitizeUserInput($result);
     }
@@ -393,7 +393,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
@@ -473,7 +473,7 @@ 
             $language = 'English';
         }
 
-        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\' . ucfirst($language);
+        $className = 'PhpScience\\TextRank\\Tool\\StopWords\\'.ucfirst($language);
         if (class_exists($className)) {
             $stopWords = new $className;
         }

src/fields/SeoSettings.php

Spacing +9 added lines, -9 removed lines

@@ -160,7 +160,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getContentColumnType(): array|string
+    public function getContentColumnType(): array | string
     {
         return Schema::TYPE_TEXT;
     }
@@ -261,7 +261,7 @@ 
                 $value = StringHelper::encodeMb4($value);
             }
             if (is_array($value)) {
-                array_walk_recursive($value, function (&$arrayValue, $arrayKey) {
+                array_walk_recursive($value, function(&$arrayValue, $arrayKey) {
                     if ($arrayValue !== null && is_string($arrayValue)) {
                         $arrayValue = StringHelper::encodeMb4($arrayValue);
                     }
@@ -397,7 +397,7 @@ 
         if ($element !== null && $element->uri !== null) {
             $siteId = $element->siteId;
             $uri = $element->uri;
-            $cacheKey = self::CACHE_KEY . $uri . $siteId . $this->elementDisplayPreviewType;
+            $cacheKey = self::CACHE_KEY.$uri.$siteId.$this->elementDisplayPreviewType;
             $metaBundleSourceType = Seomatic::$plugin->seoElements->getMetaBundleTypeFromElement($element);
             $seoElement = Seomatic::$plugin->seoElements->getSeoElementByMetaBundleType($metaBundleSourceType);
             $metaBundleSourceType = SeoEntry::getMetaBundleType();
@@ -408,15 +408,15 @@ 
             $dependency = new TagDependency([
                 'tags' => [
                     MetaContainers::GLOBAL_METACONTAINER_CACHE_TAG,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
                 ],
             ]);
             $cache = Craft::$app->getCache();
             $cacheDuration = null;
             $html = $cache->getOrSet(
-                self::CACHE_KEY . $cacheKey,
-                function () use ($uri, $siteId, $element) {
+                self::CACHE_KEY.$cacheKey,
+                function() use ($uri, $siteId, $element) {
                     Seomatic::$plugin->metaContainers->previewMetaContainers($uri, $siteId, true);
                     $variables = [
                         'previewTypes' => [
@@ -458,7 +458,7 @@ 
     )
     {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::TEXT_FIELD_CLASS_KEY,
@@ -466,7 +466,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::ASSET_FIELD_CLASS_KEY,