nystudio107 / craft-seomatic

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/services/Sitemaps.php

Spacing +16 added lines, -16 removed lines

@@ -43,11 +43,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 = [
     ];
@@ -247,19 +247,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' => 5, 'connect_timeout' => 5]);
                             // 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__
                                 );
                             }
@@ -321,19 +321,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' => 5, 'connect_timeout' => 5]);
                     // 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__
                         );
                     }
@@ -374,7 +374,7 @@ 
                     . '-'
                     . $metaBundle->sourceSiteId
                     . '-sitemap'
-                    . (!empty($page) ? '-p' . $page : '')
+                    . (!empty($page) ? '-p'.$page : '')
                     . '.xml',
                     null,
                     null,
@@ -403,19 +403,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' => 5, 'connect_timeout' => 5]);
                     // 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__
                         );
                     }
@@ -493,7 +493,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);
@@ -524,9 +524,9 @@ 
     {
         // Always just invalidate the sitemap cache now, since we're doing paginated sitemaps
         $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 +9 added lines, -9 removed lines

@@ -140,10 +140,10 @@ 
         }
 
         $cache = Craft::$app->getCache();
-        $pageCacheSuffix = 's' . (int)$metaBundle->metaSitemapVars->sitemapPageSize . 'p' . $page;
+        $pageCacheSuffix = 's'.(int) $metaBundle->metaSitemapVars->sitemapPageSize.'p'.$page;
 
-        $uniqueKey = $groupId . $type . $handle . $siteId . $pageCacheSuffix;
-        $cacheKey = self::CACHE_KEY . $uniqueKey;
+        $uniqueKey = $groupId.$type.$handle.$siteId.$pageCacheSuffix;
+        $cacheKey = self::CACHE_KEY.$uniqueKey;
         $result = $cache->get($cacheKey);
 
         // If the sitemap isn't cached, render it immediately
@@ -160,8 +160,8 @@ 
                 $dependency = new TagDependency([
                     'tags' => [
                         self::GLOBAL_SITEMAP_CACHE_TAG,
-                        self::SITEMAP_CACHE_TAG . $handle . $siteId,
-                        self::SITEMAP_CACHE_TAG . $handle . $siteId . $pageCacheSuffix,
+                        self::SITEMAP_CACHE_TAG.$handle.$siteId,
+                        self::SITEMAP_CACHE_TAG.$handle.$siteId.$pageCacheSuffix,
                     ],
                 ]);
 
@@ -173,7 +173,7 @@ 
 
                 // Output some info if this is a console app
                 if (Craft::$app instanceof ConsoleApplication) {
-                    echo 'Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey . PHP_EOL;
+                    echo 'Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey.PHP_EOL;
                 }
 
                 // If the FastCGI Cache Bust plugin is installed, clear its caches too
@@ -187,7 +187,7 @@ 
             }
         } else {
             if (Craft::$app instanceof ConsoleApplication) {
-                echo 'Found in cache' . PHP_EOL;
+                echo 'Found in cache'.PHP_EOL;
             }
         }
 
@@ -203,9 +203,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/seoelements/SeoEntry.php

Spacing +3 added lines, -3 removed lines

@@ -222,7 +222,7 @@ 
             ->limit($metaBundle->metaSitemapVars->sitemapLimit);
         if ($metaBundle->sourceType === 'structure'
             && !empty($metaBundle->metaSitemapVars->structureDepth)) {
-            $query->level($metaBundle->metaSitemapVars->structureDepth . '<=');
+            $query->level($metaBundle->metaSitemapVars->structureDepth.'<=');
         }
 
         return $query;
@@ -270,7 +270,7 @@ 
         if (!empty($typeId)) {
             $query
                 ->andWhere([
-                    'typeId' => (int)$typeId,
+                    'typeId' => (int) $typeId,
                 ]);
         }
         $element = $query->one();
@@ -397,7 +397,7 @@ 
             ConfigHelper::getConfigFromFile(self::configFilePath()),
             [
                 'sourceId' => $sourceModel->id,
-                'sourceName' => (string)$sourceModel->name,
+                'sourceName' => (string) $sourceModel->name,
                 'sourceHandle' => $sourceModel->handle,
                 'sourceType' => $sourceModel->type,
             ]

src/console/controllers/SitemapController.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function actionGenerate()
     {
-        echo 'This CLI command is no longer needed because of the paginated sitemap generation' . PHP_EOL;
+        echo 'This CLI command is no longer needed because of the paginated sitemap generation'.PHP_EOL;
     }
 
     // Protected Methods

src/helpers/UrlHelper.php

Spacing +17 added lines, -17 removed lines

@@ -46,12 +46,12 @@ 
             $siteUrl = MetaValue::parseString($siteUrl);
             // Extract out just the path part
             $parts = self::decomposeUrl($path);
-            $path = $parts['path'] . $parts['suffix'];
+            $path = $parts['path'].$parts['suffix'];
             $url = self::mergeUrlWithPath($siteUrl, $path);
             // Handle trailing slashes properly for generated URLs
             $generalConfig = Craft::$app->getConfig()->getGeneral();
             if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
-                $url = rtrim($url, '/') . '/';
+                $url = rtrim($url, '/').'/';
             }
             if (!$generalConfig->addTrailingSlashesToUrls) {
                 $url = rtrim($url, '/');
@@ -73,8 +73,8 @@ 
     public static function mergeUrlWithPath(string $url, string $path): string
     {
         $overlap = 0;
-        $url = rtrim($url, '/') . '/';
-        $path = '/' . ltrim($path, '/');
+        $url = rtrim($url, '/').'/';
+        $path = '/'.ltrim($path, '/');
         $urlOffset = strlen($url);
         $pathLength = strlen($path);
         $pathOffset = 0;
@@ -86,7 +86,7 @@ 
             }
         }
 
-        return rtrim($url, '/') . '/' . ltrim(substr($path, $overlap), '/');
+        return rtrim($url, '/').'/'.ltrim(substr($path, $overlap), '/');
     }
 
     /**
@@ -158,7 +158,7 @@ 
         // Handle trailing slashes properly for generated URLs
         $generalConfig = Craft::$app->getConfig()->getGeneral();
         if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
-            $url = rtrim($url, '/') . '/';
+            $url = rtrim($url, '/').'/';
         }
         if (!$generalConfig->addTrailingSlashesToUrls && (!$preserveTrailingSlash || self::urlIsSiteIndex($url))) {
             $url = rtrim($url, '/');
@@ -178,13 +178,13 @@ 
         $urlParts = parse_url($url);
         $encodedUrl = "";
         if (isset($urlParts['scheme'])) {
-            $encodedUrl .= $urlParts['scheme'] . '://';
+            $encodedUrl .= $urlParts['scheme'].'://';
         }
         if (isset($urlParts['host'])) {
             $encodedUrl .= $urlParts['host'];
         }
         if (isset($urlParts['port'])) {
-            $encodedUrl .= ':' . $urlParts['port'];
+            $encodedUrl .= ':'.$urlParts['port'];
         }
         if (isset($urlParts['path'])) {
             $encodedUrl .= $urlParts['path'];
@@ -194,15 +194,15 @@ 
             foreach ($query as $j => $value) {
                 $value = explode('=', $value, 2);
                 if (count($value) === 2) {
-                    $query[$j] = urlencode($value[0]) . '=' . urlencode($value[1]);
+                    $query[$j] = urlencode($value[0]).'='.urlencode($value[1]);
                 } else {
                     $query[$j] = urlencode($value[0]);
                 }
             }
-            $encodedUrl .= '?' . implode('&', $query);
+            $encodedUrl .= '?'.implode('&', $query);
         }
         if (isset($urlParts['fragment'])) {
-            $encodedUrl .= '#' . $urlParts['fragment'];
+            $encodedUrl .= '#'.$urlParts['fragment'];
         }
 
         return $encodedUrl;
@@ -234,10 +234,10 @@ 
             $sitePath = parse_url(self::siteUrl('/', null, null, $site->id), PHP_URL_PATH);
             if (!empty($sitePath)) {
                 // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-                $sitePath = '/' . preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
+                $sitePath = '/'.preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
             }
             // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-            $url = '/' . preg_replace('/\/\/+/', '/', trim($url, '/'));
+            $url = '/'.preg_replace('/\/\/+/', '/', trim($url, '/'));
             // See if this url ends with a site prefix, and thus is a site index
             if (str_ends_with($url, $sitePath)) {
                 $result = true;
@@ -270,7 +270,7 @@ 
             if ($siteId !== null) {
                 $site = $sites->getSiteById($siteId, true);
                 if (!$site) {
-                    throw new Exception('Invalid site ID: ' . $siteId);
+                    throw new Exception('Invalid site ID: '.$siteId);
                 }
             }
 
@@ -315,11 +315,11 @@ 
 
         if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) {
             $url_parts = parse_url($pathOrUrl);
-            $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host'];
+            $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host'];
             $result['path'] = $url_parts['path'] ?? '';
             $result['suffix'] = '';
-            $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query'];
-            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment'];
+            $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query'];
+            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment'];
         } else {
             $result['prefix'] = '';
             $result['path'] = $pathOrUrl;

src/helpers/DynamicMeta.php

Spacing +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
     {
         if ($pageInfo !== null && $pageInfo->currentPage !== null) {
             // Let the meta containers know that this page is paginated
-            Seomatic::$plugin->metaContainers->paginationPage = (string)$pageInfo->currentPage;
+            Seomatic::$plugin->metaContainers->paginationPage = (string) $pageInfo->currentPage;
             // See if we should strip the query params
             $stripQueryParams = true;
             $pageTrigger = Craft::$app->getConfig()->getGeneral()->pageTrigger;
@@ -170,7 +170,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -190,12 +190,12 @@ 
                         $headerValue = '';
                         foreach ($href as $hrefVal) {
                             $hrefVal = UrlHelper::encodeUrl($hrefVal);
-                            $headerValue .= ('<' . $hrefVal . '>' . ',');
+                            $headerValue .= ('<'.$hrefVal.'>'.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
                         $href = UrlHelper::encodeUrl($href);
-                        $headerValue = '<' . $href . '>';
+                        $headerValue = '<'.$href.'>';
                     }
                     $headerValue .= "; rel='canonical'";
                     $response->headers->add('Link', $headerValue);
@@ -211,7 +211,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -625,7 +625,7 @@ 
                         }
                     }
                     // Never include the URL if the element isn't enabled for the site
-                    if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) {
+                    if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) {
                         $includeUrl = false;
                     }
                 } else {
@@ -833,7 +833,7 @@ 
                 if (isset($value[$day][$time])
                     && ($date = DateTimeHelper::toDateTime($value[$day][$time])) !== false
                 ) {
-                    $normalized[$day][$time] = (array)($date);
+                    $normalized[$day][$time] = (array) ($date);
                 } else {
                     $normalized[$day][$time] = null;
                 }