nystudio107 / craft-seomatic

src/controllers/SettingsController.php

Indentation +2 added lines, -2 removed lines

@@ -599,8 +599,8 @@
         string $sourceBundleType,
         string $sourceHandle,
         string $siteHandle = null,
-               $typeId = null,
-               $loadFromSiteHandle = null
+                $typeId = null,
+                $loadFromSiteHandle = null
     ): Response
     {
         $variables = [];

Spacing +44 added lines, -44 removed lines

@@ -132,7 +132,7 @@ 
         $variables['pluginName'] = Seomatic::$settings->pluginName;
         $variables['title'] = $templateTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -140,7 +140,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/dashboard' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/dashboard'.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'dashboard';
@@ -163,11 +163,11 @@ 
         foreach ($variables['metaBundles'] as $metaBundle) {
             $stat = 0;
             foreach (self::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));
@@ -178,16 +178,16 @@ 
         }
         // Global SEO grades
         Seomatic::$previewingMetaContainers = true;
-        $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle((int)$siteId);
+        $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle((int) $siteId);
         Seomatic::$previewingMetaContainers = false;
         if ($metaBundle !== null) {
             $stat = 0;
             $variables['globalSetupChecklist'] = [];
             foreach (self::SEO_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaGlobalVars[$setupField]);
+                $stat += (int) !empty($metaBundle->metaGlobalVars[$setupField]);
                 $variables['globalSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaGlobalVars[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaGlobalVars[$setupField]),
                 ];
             }
             $stat = round(($stat / $numFields) * 100);
@@ -197,17 +197,17 @@ 
             $stat = 0;
             $variables['siteSetupChecklist'] = [];
             foreach (self::SITE_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaSiteVars[$setupField]);
+                $stat += (int) !empty($metaBundle->metaSiteVars[$setupField]);
                 $variables['siteSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaSiteVars[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaSiteVars[$setupField]),
                 ];
             }
             foreach (self::IDENTITY_SETUP_FIELDS as $setupField => $setupLabel) {
-                $stat += (int)!empty($metaBundle->metaSiteVars->identity[$setupField]);
+                $stat += (int) !empty($metaBundle->metaSiteVars->identity[$setupField]);
                 $variables['siteSetupChecklist'][$setupField] = [
                     'label' => $setupLabel,
-                    'value' => (int)!empty($metaBundle->metaSiteVars->identity[$setupField]),
+                    'value' => (int) !empty($metaBundle->metaSiteVars->identity[$setupField]),
                 ];
             }
             $stat = round(($stat / $numFields) * 100);
@@ -232,7 +232,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
             }
             $siteId = $site->id;
         } else {
@@ -269,7 +269,7 @@ 
                 if (!empty($variables['enabledSiteIds'])) {
                     $siteId = reset($variables['enabledSiteIds']);
                 } else {
-                    $this->requirePermission('editSite:' . $siteId);
+                    $this->requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -289,7 +289,7 @@ 
         if ($variables['showSites']) {
             $variables['sitesMenuLabel'] = Craft::t(
                 'site',
-                $sites->getSiteById((int)$variables['currentSiteId'])->name
+                $sites->getSiteById((int) $variables['currentSiteId'])->name
             );
         } else {
             $variables['sitesMenuLabel'] = '';
@@ -332,7 +332,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -340,11 +340,11 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/global/general' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/global/general'.$siteHandleUri),
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/global/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/global/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'global';
@@ -352,14 +352,14 @@ 
         $this->setGlobalFieldSourceVariables($variables);
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'global' . '/' . $subSection;
+        $variables['controllerHandle'] = 'global'.'/'.$subSection;
         $variables['currentSubSection'] = $subSection;
         // Meta bundle settings
         Seomatic::$previewingMetaContainers = true;
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         if ($editedMetaBundle) {
@@ -413,11 +413,11 @@ 
         // Preview the meta containers
         Seomatic::$plugin->metaContainers->previewMetaContainers(
             MetaBundles::GLOBAL_META_BUNDLE,
-            (int)$variables['currentSiteId']
+            (int) $variables['currentSiteId']
         );
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/global/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/global/'.$subSection, $variables);
     }
 
     /**
@@ -559,7 +559,7 @@ 
         $variables['pluginName'] = Seomatic::$settings->pluginName;
         $variables['title'] = $templateTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -567,7 +567,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/content' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/content'.$siteHandleUri),
             ],
         ];
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
@@ -608,7 +608,7 @@ 
         // Get the site to edit
         $siteId = $this->getSiteIdFromHandle($siteHandle);
         if ($typeId !== null && is_string($typeId)) {
-            $typeId = (int)$typeId;
+            $typeId = (int) $typeId;
         }
         // Get the (entry) type menu
         $typeMenu = [];
@@ -622,7 +622,7 @@ 
             $currentType = reset($typeMenu);
             $variables['currentType'] = $typeMenu[$typeId] ?? $currentType;
             $variables['currentTypeId'] = $typeId ?? key($typeMenu);
-            $typeId = (int)$variables['currentTypeId'];
+            $typeId = (int) $variables['currentTypeId'];
         }
         $pluginName = Seomatic::$settings->pluginName;
         // Asset bundle
@@ -643,7 +643,7 @@ 
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getMetaBundleBySourceHandle(
             $sourceBundleType,
@@ -669,7 +669,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - Content SEO - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['siteHandleUri'] = $siteHandleUri;
         $variables['crumbs'] = [
             [
@@ -678,10 +678,10 @@ 
             ],
             [
                 'label' => 'Content SEO',
-                'url' => UrlHelper::cpUrl('seomatic/content' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/content'.$siteHandleUri),
             ],
             [
-                'label' => $metaBundle->sourceName . ' · ' . $subSectionTitle,
+                'label' => $metaBundle->sourceName.' · '.$subSectionTitle,
                 'url' => UrlHelper::cpUrl("seomatic/edit-content/${subSection}/${sourceBundleType}/${sourceHandle}"),
             ],
         ];
@@ -711,13 +711,13 @@ 
         // Preview the meta containers
         Seomatic::$plugin->metaContainers->previewMetaContainers(
             $uri,
-            (int)$variables['currentSiteId'],
+            (int) $variables['currentSiteId'],
             false,
             false
         );
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/content/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/content/'.$subSection, $variables);
     }
 
     /**
@@ -758,7 +758,7 @@ 
     )
     {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromSource(
                 $sourceBundleType,
                 $sourceHandle,
@@ -767,7 +767,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromSource(
                 $sourceBundleType,
                 $sourceHandle,
@@ -902,7 +902,7 @@ 
         if ($subSection === 'social') {
             $subSectionSuffix = ' Media';
         }
-        $subSectionTitle = Craft::t('seomatic', ucfirst($subSection) . $subSectionSuffix);
+        $subSectionTitle = Craft::t('seomatic', ucfirst($subSection).$subSectionSuffix);
         // Asset bundle
         try {
             Seomatic::$view->registerAssetBundle(SeomaticAsset::class);
@@ -920,7 +920,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -928,11 +928,11 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('seomatic/site/identity' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/site/identity'.$siteHandleUri),
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/site/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/site/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'site';
@@ -940,14 +940,14 @@ 
 
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'site' . '/' . $subSection;
+        $variables['controllerHandle'] = 'site'.'/'.$subSection;
 
         // The site settings for the appropriate meta bundle
         Seomatic::$previewingMetaContainers = true;
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         Seomatic::$previewingMetaContainers = false;
@@ -965,7 +965,7 @@ 
         $variables['elementType'] = Asset::class;
 
         // Render the template
-        return $this->renderTemplate('seomatic/settings/site/' . $subSection, $variables);
+        return $this->renderTemplate('seomatic/settings/site/'.$subSection, $variables);
     }
 
     /**
@@ -1110,7 +1110,7 @@ 
         $siteId = $this->getSiteIdFromHandle($siteHandle);
         // Enabled sites
         $this->setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'tracking' . '/' . $subSection;
+        $variables['controllerHandle'] = 'tracking'.'/'.$subSection;
         $variables['currentSubSection'] = $subSection;
 
         // The script meta containers for the global meta bundle
@@ -1118,7 +1118,7 @@ 
         // Get the site to copy the settings from, if any
         $variables['loadFromSiteHandle'] = $loadFromSiteHandle;
         $loadFromSiteId = $this->getSiteIdFromHandle($loadFromSiteHandle);
-        $siteIdToLoad = $loadFromSiteHandle === null ? (int)$variables['currentSiteId'] : $loadFromSiteId;
+        $siteIdToLoad = $loadFromSiteHandle === null ? (int) $variables['currentSiteId'] : $loadFromSiteId;
         // Load the metabundle
         $metaBundle = Seomatic::$plugin->metaBundles->getGlobalMetaBundle($siteIdToLoad);
         if ($editedMetaBundle) {
@@ -1156,7 +1156,7 @@ 
         $variables['title'] = $templateTitle;
         $variables['subSectionTitle'] = $subSectionTitle;
         $variables['docTitle'] = "{$pluginName} - {$templateTitle} - {$subSectionTitle}";
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -1168,7 +1168,7 @@ 
             ],
             [
                 'label' => $subSectionTitle,
-                'url' => UrlHelper::cpUrl('seomatic/tracking/' . $subSection . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('seomatic/tracking/'.$subSection.$siteHandleUri),
             ],
         ];
         $variables['selectedSubnavItem'] = 'tracking';

src/base/MetaItem.php

Spacing +6 added lines, -6 removed lines

@@ -157,7 +157,7 @@ 
                 // Add a URL to the schema.org type if this is a MetaJsonLD object
                 if ($isMetaJsonLdModel) {
                     /** @var  $this MetaJsonLd */
-                    $extraInfo = ' for http://schema.org/' . $this->type;
+                    $extraInfo = ' for http://schema.org/'.$this->type;
                 }
                 $errorMsg =
                     Craft::t('seomatic', 'Scenario: "')
@@ -168,10 +168,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) {
@@ -190,9 +190,9 @@ 
                         /** @var MetaJsonLd $className  */
                         $className = \get_class($this);
                         if (!empty($className::$schemaPropertyDescriptions[$param])) {
-                            $errorMsg = Craft::t('seomatic', $errorLabel) . $param;
+                            $errorMsg = Craft::t('seomatic', $errorLabel).$param;
                             /** @var $className MetaJsonLd */
-                            $errorMsg .= ' -> ' . $className::$schemaPropertyDescriptions[$param];
+                            $errorMsg .= ' -> '.$className::$schemaPropertyDescriptions[$param];
                             Craft::info($errorMsg, __METHOD__);
                         }
                     }
@@ -214,7 +214,7 @@ 
         }
         if (!empty($attrs) && ArrayHelper::isIndexed($attrs, true)) {
             $attrs = [];
-            foreach($this->tagAttrs as $attr) {
+            foreach ($this->tagAttrs as $attr) {
                 $attrs[$attr['name']] = $attr['value'];
             }
         }

src/gql/resolvers/FrontendContainerResolver.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             ];
         }
 
-        array_walk($containerItems, function (&$contents, $type) use ($typeMap) {
+        array_walk($containerItems, function(&$contents, $type) use ($typeMap) {
             $contents = [
                 'filename' => $typeMap[$type],
                 'contents' => $contents

src/gql/resolvers/SitemapResolver.php

Indentation +6 added lines, -6 removed lines

@@ -111,12 +111,12 @@
     }
 
 /**
-     * Get all the sitemap index items by params.
-     *
-     * @param array $params
-     * @return array
-     * @throws \yii\web\NotFoundHttpException
-     */
+ * Get all the sitemap index items by params.
+ *
+ * @param array $params
+ * @return array
+ * @throws \yii\web\NotFoundHttpException
+ */
     public static function getSitemapStyles($source, $arguments, $context, ResolveInfo $resolveInfo): array
     {
         return [

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         }
 
         // If either of the source bundle arguments are present, get the sitemap
-        if (!empty($arguments['sourceBundleType']) || !empty($arguments['sourceBundleHandle']))  {
+        if (!empty($arguments['sourceBundleType']) || !empty($arguments['sourceBundleHandle'])) {
             $filename = self::createFilenameFromComponents($site->groupId, $arguments['sourceBundleType'] ?? '', $arguments['sourceBundleHandle'] ?? '', $siteId);
 
             return [

src/gql/interfaces/SeomaticInterface.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
             'name' => static::getName(),
             'fields' => self::class.'::getFieldDefinitions',
             'description' => 'This is the interface implemented by SEOmatic.',
-            'resolveType' => function (array $value) {
+            'resolveType' => function(array $value) {
                 return GqlEntityRegistry::getEntity(SeomaticGenerator::getName());
             },
         ]));
@@ -119,27 +119,27 @@ 
             'name' => 'sitemaps',
             'args' => SitemapArguments::getArguments(),
             'type' => Type::listOf(FileContentsType::getType()),
-            'resolve' => SitemapResolver::class .'::getSitemaps'
+            'resolve' => SitemapResolver::class.'::getSitemaps'
         ];
 
         $fields['sitemapIndexes'] = [
             'name' => 'sitemapIndexes',
             'args' => SitemapIndexArguments::getArguments(),
             'type' => Type::listOf(FileContentsType::getType()),
-            'resolve' => SitemapResolver::class .'::getSitemapIndexes'
+            'resolve' => SitemapResolver::class.'::getSitemapIndexes'
         ];
 
         $fields['sitemapStyles'] = [
             'name' => 'sitemapStyles',
             'type' => FileContentsType::getType(),
-            'resolve' => SitemapResolver::class .'::getSitemapStyles'
+            'resolve' => SitemapResolver::class.'::getSitemapStyles'
         ];
 
         $fields['frontendTemplates'] = [
             'name' => 'frontendTemplates',
             'args' => FrontendContainerArguments::getArguments(),
             'type' => Type::listOf(FileContentsType::getType()),
-            'resolve' => FrontendContainerResolver::class .'::getContainerFiles'
+            'resolve' => FrontendContainerResolver::class.'::getContainerFiles'
         ];
 
         return $fields;

src/models/SitemapIndexTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      */
     public function getFilename(int $groupId): string
     {
-        return 'sitemaps-' . $groupId . '-sitemap.xml';
+        return 'sitemaps-'.$groupId.'-sitemap.xml';
     }
 
     /**
@@ -149,7 +149,7 @@ 
             ],
         ]);
 
-        return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function () use ($groupSiteIds, $siteId) {
+        return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function() use ($groupSiteIds, $siteId) {
             Craft::info(
                 'Sitemap index cache miss',
                 __METHOD__

src/seomatic-config/globalmeta/FrontendTemplatesContainer.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     'name' => 'Frontend Templates',
     'description' => 'Templates that are rendered on the frontend',
     'handle' => FrontendTemplates::FRONTENDTEMPLATES_CONTAINER,
-    'class' => (string)FrontendTemplateContainer::class,
+    'class' => (string) FrontendTemplateContainer::class,
     'include' => true,
     'data' => [
         FrontendTemplates::HUMANS_TXT_HANDLE => [

src/services/MetaContainers.php

Spacing +22 added lines, -22 removed lines

@@ -157,7 +157,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;
         }
     }
 
@@ -173,10 +173,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 = [];
@@ -188,7 +188,7 @@ 
                             foreach ($scriptContainer->data as $metaScript) {
                                 /** @var MetaScript $metaScript */
                                 if (!empty($metaScript->bodyTemplatePath)
-                                    && ((int)$metaScript->bodyPosition === $bodyPosition)) {
+                                    && ((int) $metaScript->bodyPosition === $bodyPosition)) {
                                     $scriptData[] = $metaScript->renderBodyHtml();
                                 }
                             }
@@ -268,10 +268,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__
                 );
 
@@ -392,7 +392,7 @@ 
                     ?? 1;
             }
             // Handle pagination
-            $paginationPage = 'page' . $this->paginationPage;
+            $paginationPage = 'page'.$this->paginationPage;
             // Get the path for the current request
             $request = Craft::$app->getRequest();
             $requestPath = '/';
@@ -408,21 +408,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;
@@ -438,10 +438,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);
@@ -710,7 +710,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 */
@@ -962,10 +962,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
@@ -992,9 +992,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

src/helpers/DynamicMeta.php

Spacing +8 added lines, -8 removed lines

@@ -84,7 +84,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;
@@ -157,7 +157,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -176,11 +176,11 @@ 
                     if (is_array($href)) {
                         $headerValue = '';
                         foreach ($href as $hrefVal) {
-                            $headerValue .= ('<' . $hrefVal . '>' . ',');
+                            $headerValue .= ('<'.$hrefVal.'>'.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
-                        $headerValue = '<' . $href . '>';
+                        $headerValue = '<'.$href.'>';
                     }
                     $headerValue .= "; rel='canonical'";
                     $response->headers->add('Link', $headerValue);
@@ -196,7 +196,7 @@ 
                     if (is_array($content)) {
                         $headerValue = '';
                         foreach ($content as $contentVal) {
-                            $headerValue .= ($contentVal . ',');
+                            $headerValue .= ($contentVal.',');
                         }
                         $headerValue = rtrim($headerValue, ',');
                     } else {
@@ -382,7 +382,7 @@ 
         if ($lastElement && $element) {
             if ($lastElement->uri !== '__home__' && $element->uri) {
                 $path = $lastElement->uri;
-                $segments = array_values(array_filter(explode('/', $path), function ($segment) {
+                $segments = array_values(array_filter(explode('/', $path), function($segment) {
                     return $segment !== '';
                 }));
             }
@@ -542,7 +542,7 @@ 
                     $element = $elements->getElementByUri($url, $site->id, false);
                 }
                 if ($element !== null) {
-                    if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) {
+                    if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) {
                         $includeUrl = false;
                     }
                     /** @var MetaBundle $metaBundle */
@@ -795,7 +795,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;
                 }