nystudio107 / craft-seomatic

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;
                 }

src/services/MetaBundles.php

Spacing +11 added lines, -11 removed lines

@@ -175,7 +175,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 = [];
@@ -304,8 +304,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
@@ -315,7 +315,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;
@@ -331,7 +331,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}';
             }
@@ -413,7 +413,7 @@ 
                 $metaBundleDefaults = ArrayHelper::merge(
                     $seoElement::metaBundleConfig($sourceModel),
                     [
-                        'sourceTemplate' => (string)$siteSetting->template,
+                        'sourceTemplate' => (string) $siteSetting->template,
                         'sourceSiteId' => $siteSetting->siteId,
                         'sourceAltSiteSettings' => $siteSettingsArray,
                         'sourceDateUpdated' => $dateUpdated,
@@ -461,7 +461,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];
@@ -548,7 +548,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;
                             }
                         }
@@ -588,7 +588,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];
@@ -784,7 +784,7 @@ 
                 ->from(['{{%seomatic_metabundles}}'])
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE]);
 
-            if ((int)$sourceSiteId !== 0) {
+            if ((int) $sourceSiteId !== 0) {
                 $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]);
             }
             if ($filter !== '') {
@@ -821,7 +821,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]);