nystudio107 / craft-seomatic

src/controllers/SitemapController.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'sitemap-index',
         'sitemap-index-redirect',
         'sitemap',

src/controllers/MetaContainerController.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'all-meta-containers',
         'meta-title-container',
         'meta-tag-container',

src/controllers/FrontendTemplateController.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'humans',
         'robots',
         'ads',

src/controllers/ContentSeoController.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
     /**
      * @var    bool|array
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -100,7 +100,7 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $currentSiteHandle = '';
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $site = Craft::$app->getSites()->getSiteById($siteId);
             if ($site !== null) {
                 $currentSiteHandle = $site->handle;
@@ -155,11 +155,11 @@ 
                     $numGrades = \count(SettingsController::SETUP_GRADES);
                     $numFields = \count(SettingsController::SEO_SETUP_FIELDS);
                     foreach (SettingsController::SEO_SETUP_FIELDS as $setupField => $setupLabel) {
-                        $stat += (int)!empty($metaBundle->metaGlobalVars[$setupField]);
+                        $stat += (int) !empty($metaBundle->metaGlobalVars[$setupField]);
                         $value = $variables['contentSetupChecklist'][$setupField]['value'] ?? 0;
                         $variables['contentSetupChecklist'][$setupField] = [
                             'label' => $setupLabel,
-                            'value' => $value + (int)!empty($metaBundle->metaGlobalVars[$setupField]),
+                            'value' => $value + (int) !empty($metaBundle->metaGlobalVars[$setupField]),
                         ];
                     }
                     $stat = round($numGrades - (($stat * $numGrades) / $numFields));

src/controllers/JsonLdController.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'get-type',
         'get-decomposed-type',
         'get-type-array',

src/controllers/PreviewController.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'social-media',
     ];
 
@@ -53,7 +53,7 @@ 
         $html = '';
 
         // Don't allow the preview to be accessed publicly
-        $this->requireAuthorization(Seomatic::SEOMATIC_PREVIEW_AUTHORIZATION_KEY . $elementId);
+        $this->requireAuthorization(Seomatic::SEOMATIC_PREVIEW_AUTHORIZATION_KEY.$elementId);
 
         /** @var Element $element */
         $element = Craft::$app->getElements()->getElementById($elementId, null, $siteId);

src/controllers/FileController.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'seo-file-link',
     ];
 
@@ -83,7 +83,7 @@ 
             }
             // Add the Link header
             if (!empty($canonical)) {
-                $headerValue = '<' . $canonical . '>; rel="canonical"';
+                $headerValue = '<'.$canonical.'>; rel="canonical"';
                 $response->headers->add('Link', $headerValue);
             }
             // Ensure the file type is allowed

src/services/MetaBundles.php

Spacing +11 added lines, -11 removed lines

@@ -178,7 +178,7 @@ 
      * @param MetaBundle $metaBundle
      * @param bool $forceUpdate
      */
-    public function syncBundleWithConfig(MetaBundle &$metaBundle, bool $forceUpdate = false)
+    public function syncBundleWithConfig(MetaBundle & $metaBundle, bool $forceUpdate = false)
     {
         $prevMetaBundle = $metaBundle;
         $config = [];
@@ -259,8 +259,8 @@ 
      */
     public function updateMetaBundle(MetaBundle $metaBundle, int $siteId)
     {
-        $metaBundle->sourceName = (string)$metaBundle->sourceName;
-        $metaBundle->sourceTemplate = (string)$metaBundle->sourceTemplate;
+        $metaBundle->sourceName = (string) $metaBundle->sourceName;
+        $metaBundle->sourceTemplate = (string) $metaBundle->sourceTemplate;
         // Make sure it validates
         if ($metaBundle->validate(null, true)) {
             // Save it out to a record
@@ -270,7 +270,7 @@ 
                 'sourceSiteId' => $siteId,
             ];
             if ($metaBundle->typeId !== null) {
-                $metaBundle->typeId = (int)$metaBundle->typeId;
+                $metaBundle->typeId = (int) $metaBundle->typeId;
             }
             if (!empty($metaBundle->typeId)) {
                 $params['typeId'] = $metaBundle->typeId;
@@ -286,7 +286,7 @@ 
             // @TODO remove this hack that doesn't allow environment-transformed settings to be saved in a meta bundle with a proper system to address it
             // The issue was that the containers were getting saved to the db with a hard-coded setting in them, because they'd
             // been set that way by the environment, whereas to be changeable via the GUI, it needs to be set to {seomatic.meta.robots}
-            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE]->data['robots'] ?? null;
+            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE]->data['robots'] ?? null;
             if (!empty($robotsTag)) {
                 $robotsTag->content = $robotsTag->environment['live']['content'] ?? '{{ seomatic.meta.robots }}';
             }
@@ -368,7 +368,7 @@ 
                 $metaBundleDefaults = ArrayHelper::merge(
                     $seoElement::metaBundleConfig($sourceModel),
                     [
-                        'sourceTemplate' => (string)$siteSetting->template,
+                        'sourceTemplate' => (string) $siteSetting->template,
                         'sourceSiteId' => $siteSetting->siteId,
                         'sourceAltSiteSettings' => $siteSettingsArray,
                         'sourceDateUpdated' => $dateUpdated,
@@ -416,7 +416,7 @@ 
     public function getMetaBundleBySourceHandle(string $sourceBundleType, string $sourceHandle, int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId];
@@ -503,7 +503,7 @@ 
                             /** @var Section|CategoryGroup|ProductType $sourceModel */
                             $sourceModel = $seoElement::sourceModelFromId($sourceId);
                             if ($sourceModel !== null) {
-                                $metaBundle->sourceName = (string)$sourceModel->name;
+                                $metaBundle->sourceName = (string) $sourceModel->name;
                                 $metaBundle->sourceHandle = $sourceModel->handle;
                             }
                         }
@@ -544,7 +544,7 @@ 
     public function getMetaBundleBySourceId(string $sourceBundleType, int $sourceId, int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId];
@@ -739,7 +739,7 @@ 
                 ->from(['{{%seomatic_metabundles}}'])
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE]);
 
-            if ((int)$sourceSiteId !== 0) {
+            if ((int) $sourceSiteId !== 0) {
                 $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]);
             }
             if ($filter !== '') {
@@ -776,7 +776,7 @@ 
     public function getContentMetaBundleForElement(Element $element)
     {
         $source = $this->getMetaSourceFromElement($element);
-        $key = implode(".", $source) . '.' . $element->siteId;
+        $key = implode(".", $source).'.'.$element->siteId;
 
         if (empty($this->elementContentMetaBundles[$key])) {
             $this->elementContentMetaBundles[$key] = $this->getMetaBundleBySourceId($source[1], $source[0], $element->siteId, $source[4]);

src/services/MetaContainers.php

Spacing +22 added lines, -22 removed lines

@@ -160,7 +160,7 @@ 
         // Get the page number of this request
         $request = Craft::$app->getRequest();
         if (!$request->isConsoleRequest) {
-            $this->paginationPage = (string)$request->pageNum;
+            $this->paginationPage = (string) $request->pageNum;
         }
     }
 
@@ -176,10 +176,10 @@ 
         $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY;
         $uniqueKey .= $bodyPosition;
         $scriptData = Craft::$app->getCache()->getOrSet(
-            self::GLOBALS_CACHE_KEY . $uniqueKey,
-            function () use ($uniqueKey, $bodyPosition) {
+            self::GLOBALS_CACHE_KEY.$uniqueKey,
+            function() use ($uniqueKey, $bodyPosition) {
                 Craft::info(
-                    self::SCRIPTS_CACHE_KEY . ' cache miss: ' . $uniqueKey,
+                    self::SCRIPTS_CACHE_KEY.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
                 $scriptData = [];
@@ -191,7 +191,7 @@ 
                             foreach ($scriptContainer->data as $metaScript) {
                                 /** @var MetaScript $metaScript */
                                 if (!empty($metaScript->bodyTemplatePath)
-                                    && ((int)$metaScript->bodyPosition === $bodyPosition)) {
+                                    && ((int) $metaScript->bodyPosition === $bodyPosition)) {
                                     $scriptData[] = $metaScript->renderBodyHtml();
                                 }
                             }
@@ -271,10 +271,10 @@ 
         $dependency = $this->containerDependency;
         $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY;
         list($this->metaGlobalVars, $this->metaSiteVars) = Craft::$app->getCache()->getOrSet(
-            self::GLOBALS_CACHE_KEY . $uniqueKey,
-            function () use ($uniqueKey) {
+            self::GLOBALS_CACHE_KEY.$uniqueKey,
+            function() use ($uniqueKey) {
                 Craft::info(
-                    self::GLOBALS_CACHE_KEY . ' cache miss: ' . $uniqueKey,
+                    self::GLOBALS_CACHE_KEY.' cache miss: '.$uniqueKey,
                     __METHOD__
                 );
 
@@ -395,7 +395,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -411,21 +411,21 @@ 
                 }
             }
             // Get our cache key
-            $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams();
+            $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams();
             // For requests with a status code of >= 400, use one cache key
             if (!$request->isConsoleRequest) {
                 $response = Craft::$app->getResponse();
                 if ($response->statusCode >= 400) {
-                    $cacheKey = $siteId . self::INVALID_RESPONSE_CACHE_KEY . $response->statusCode;
+                    $cacheKey = $siteId.self::INVALID_RESPONSE_CACHE_KEY.$response->statusCode;
                 }
             }
             // Load the meta containers
             $dependency = new TagDependency([
                 'tags' => [
                     self::GLOBAL_METACONTAINER_CACHE_TAG,
-                    self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $uri . $siteId,
-                    self::METACONTAINER_CACHE_TAG . $cacheKey,
+                    self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$uri.$siteId,
+                    self::METACONTAINER_CACHE_TAG.$cacheKey,
                 ],
             ]);
             $this->containerDependency = $dependency;
@@ -441,10 +441,10 @@ 
             } else {
                 $cache = Craft::$app->getCache();
                 list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet(
-                    self::CACHE_KEY . $cacheKey,
-                    function () use ($uri, $siteId) {
+                    self::CACHE_KEY.$cacheKey,
+                    function() use ($uri, $siteId) {
                         Craft::info(
-                            'Meta container cache miss: ' . $uri . '/' . $siteId,
+                            'Meta container cache miss: '.$uri.'/'.$siteId,
                             __METHOD__
                         );
                         $this->loadGlobalMetaContainers($siteId);
@@ -839,10 +839,10 @@ 
         $cache = Craft::$app->getCache();
         TagDependency::invalidate(
             $cache,
-            self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId
+            self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId
         );
         Craft::info(
-            'Meta bundle cache cleared: ' . $metaBundleSourceId . ' / ' . $metaBundleSourceType . ' / ' . $siteId,
+            'Meta bundle cache cleared: '.$metaBundleSourceId.' / '.$metaBundleSourceType.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -869,9 +869,9 @@ 
         if ($siteId === null) {
             $siteId = Craft::$app->getSites()->currentSite->id ?? 1;
         }
-        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG . $uri . $siteId);
+        TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG.$uri.$siteId);
         Craft::info(
-            'Meta container cache cleared: ' . $uri . ' / ' . $siteId,
+            'Meta container cache cleared: '.$uri.' / '.$siteId,
             __METHOD__
         );
         // Trigger an event to let other plugins/modules know we've cleared our caches
@@ -988,7 +988,7 @@ 
 
                     // Handle re-creating the `mainEntityOfPage` so that the model injected into the
                     // templates has the appropriate attributes
-                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE;
+                    $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE;
                     $generalContainer = $this->metaContainers[$generalContainerKey];
                     if (($generalContainer !== null) && !empty($generalContainer->data['mainEntityOfPage'])) {
                         /** @var MetaJsonLd $jsonLdModel */