@@ -57,7 +57,7 @@ |
||
57 | 57 | ]; |
58 | 58 | } |
59 | 59 | |
60 | - array_walk($containerItems, function (&$contents, $type) use ($typeMap) { |
|
60 | + array_walk($containerItems, function(&$contents, $type) use ($typeMap) { |
|
61 | 61 | $contents = [ |
62 | 62 | 'filename' => $typeMap[$type], |
63 | 63 | 'contents' => $contents |
@@ -111,12 +111,12 @@ |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
114 | - * Get all the sitemap index items by params. |
|
115 | - * |
|
116 | - * @param array $params |
|
117 | - * @return array |
|
118 | - * @throws \yii\web\NotFoundHttpException |
|
119 | - */ |
|
114 | + * Get all the sitemap index items by params. |
|
115 | + * |
|
116 | + * @param array $params |
|
117 | + * @return array |
|
118 | + * @throws \yii\web\NotFoundHttpException |
|
119 | + */ |
|
120 | 120 | public static function getSitemapStyles($source, $arguments, $context, ResolveInfo $resolveInfo): array |
121 | 121 | { |
122 | 122 | return [ |
@@ -53,7 +53,7 @@ |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | // If either of the source bundle arguments are present, get the sitemap |
56 | - if (!empty($arguments['sourceBundleType']) || !empty($arguments['sourceBundleHandle'])) { |
|
56 | + if (!empty($arguments['sourceBundleType']) || !empty($arguments['sourceBundleHandle'])) { |
|
57 | 57 | $filename = self::createFilenameFromComponents($site->groupId, $arguments['sourceBundleType'] ?? '', $arguments['sourceBundleHandle'] ?? '', $siteId); |
58 | 58 | |
59 | 59 | return [ |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | 'name' => static::getName(), |
81 | 81 | 'fields' => self::class.'::getFieldDefinitions', |
82 | 82 | 'description' => 'This is the interface implemented by SEOmatic.', |
83 | - 'resolveType' => function (array $value) { |
|
83 | + 'resolveType' => function(array $value) { |
|
84 | 84 | return GqlEntityRegistry::getEntity(SeomaticGenerator::getName()); |
85 | 85 | }, |
86 | 86 | ])); |
@@ -119,27 +119,27 @@ discard block |
||
119 | 119 | 'name' => 'sitemaps', |
120 | 120 | 'args' => SitemapArguments::getArguments(), |
121 | 121 | 'type' => Type::listOf(FileContentsType::getType()), |
122 | - 'resolve' => SitemapResolver::class .'::getSitemaps' |
|
122 | + 'resolve' => SitemapResolver::class.'::getSitemaps' |
|
123 | 123 | ]; |
124 | 124 | |
125 | 125 | $fields['sitemapIndexes'] = [ |
126 | 126 | 'name' => 'sitemapIndexes', |
127 | 127 | 'args' => SitemapIndexArguments::getArguments(), |
128 | 128 | 'type' => Type::listOf(FileContentsType::getType()), |
129 | - 'resolve' => SitemapResolver::class .'::getSitemapIndexes' |
|
129 | + 'resolve' => SitemapResolver::class.'::getSitemapIndexes' |
|
130 | 130 | ]; |
131 | 131 | |
132 | 132 | $fields['sitemapStyles'] = [ |
133 | 133 | 'name' => 'sitemapStyles', |
134 | 134 | 'type' => FileContentsType::getType(), |
135 | - 'resolve' => SitemapResolver::class .'::getSitemapStyles' |
|
135 | + 'resolve' => SitemapResolver::class.'::getSitemapStyles' |
|
136 | 136 | ]; |
137 | 137 | |
138 | 138 | $fields['frontendTemplates'] = [ |
139 | 139 | 'name' => 'frontendTemplates', |
140 | 140 | 'args' => FrontendContainerArguments::getArguments(), |
141 | 141 | 'type' => Type::listOf(FileContentsType::getType()), |
142 | - 'resolve' => FrontendContainerResolver::class .'::getContainerFiles' |
|
142 | + 'resolve' => FrontendContainerResolver::class.'::getContainerFiles' |
|
143 | 143 | ]; |
144 | 144 | |
145 | 145 | return $fields; |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public function getFilename(int $groupId): string |
118 | 118 | { |
119 | - return 'sitemaps-' . $groupId . '-sitemap.xml'; |
|
119 | + return 'sitemaps-'.$groupId.'-sitemap.xml'; |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | ], |
150 | 150 | ]); |
151 | 151 | |
152 | - return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function () use ($groupSiteIds, $siteId) { |
|
152 | + return $cache->getOrSet(self::CACHE_KEY.$groupId.'.'.$siteId, function() use ($groupSiteIds, $siteId) { |
|
153 | 153 | Craft::info( |
154 | 154 | 'Sitemap index cache miss', |
155 | 155 | __METHOD__ |
@@ -22,7 +22,7 @@ |
||
22 | 22 | 'name' => 'Frontend Templates', |
23 | 23 | 'description' => 'Templates that are rendered on the frontend', |
24 | 24 | 'handle' => FrontendTemplates::FRONTENDTEMPLATES_CONTAINER, |
25 | - 'class' => (string)FrontendTemplateContainer::class, |
|
25 | + 'class' => (string) FrontendTemplateContainer::class, |
|
26 | 26 | 'include' => true, |
27 | 27 | 'data' => [ |
28 | 28 | FrontendTemplates::HUMANS_TXT_HANDLE => [ |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | if ($pageInfo !== null && $pageInfo->currentPage !== null) { |
86 | 86 | // Let the meta containers know that this page is paginated |
87 | - Seomatic::$plugin->metaContainers->paginationPage = (string)$pageInfo->currentPage; |
|
87 | + Seomatic::$plugin->metaContainers->paginationPage = (string) $pageInfo->currentPage; |
|
88 | 88 | // See if we should strip the query params |
89 | 89 | $stripQueryParams = true; |
90 | 90 | $pageTrigger = Craft::$app->getConfig()->getGeneral()->pageTrigger; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if (is_array($content)) { |
158 | 158 | $headerValue = ''; |
159 | 159 | foreach ($content as $contentVal) { |
160 | - $headerValue .= ($contentVal . ','); |
|
160 | + $headerValue .= ($contentVal.','); |
|
161 | 161 | } |
162 | 162 | $headerValue = rtrim($headerValue, ','); |
163 | 163 | } else { |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | if (is_array($href)) { |
177 | 177 | $headerValue = ''; |
178 | 178 | foreach ($href as $hrefVal) { |
179 | - $headerValue .= ('<' . $hrefVal . '>' . ','); |
|
179 | + $headerValue .= ('<'.$hrefVal.'>'.','); |
|
180 | 180 | } |
181 | 181 | $headerValue = rtrim($headerValue, ','); |
182 | 182 | } else { |
183 | - $headerValue = '<' . $href . '>'; |
|
183 | + $headerValue = '<'.$href.'>'; |
|
184 | 184 | } |
185 | 185 | $headerValue .= "; rel='canonical'"; |
186 | 186 | $response->headers->add('Link', $headerValue); |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | if (is_array($content)) { |
197 | 197 | $headerValue = ''; |
198 | 198 | foreach ($content as $contentVal) { |
199 | - $headerValue .= ($contentVal . ','); |
|
199 | + $headerValue .= ($contentVal.','); |
|
200 | 200 | } |
201 | 201 | $headerValue = rtrim($headerValue, ','); |
202 | 202 | } else { |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | if ($lastElement && $element) { |
383 | 383 | if ($lastElement->uri !== '__home__' && $element->uri) { |
384 | 384 | $path = $lastElement->uri; |
385 | - $segments = array_values(array_filter(explode('/', $path), function ($segment) { |
|
385 | + $segments = array_values(array_filter(explode('/', $path), function($segment) { |
|
386 | 386 | return $segment !== ''; |
387 | 387 | })); |
388 | 388 | } |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | $element = $elements->getElementByUri($url, $site->id, false); |
543 | 543 | } |
544 | 544 | if ($element !== null) { |
545 | - if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) { |
|
545 | + if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) { |
|
546 | 546 | $includeUrl = false; |
547 | 547 | } |
548 | 548 | /** @var MetaBundle $metaBundle */ |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | if (isset($value[$day][$time]) |
796 | 796 | && ($date = DateTimeHelper::toDateTime($value[$day][$time])) !== false |
797 | 797 | ) { |
798 | - $normalized[$day][$time] = (array)($date); |
|
798 | + $normalized[$day][$time] = (array) ($date); |
|
799 | 799 | } else { |
800 | 800 | $normalized[$day][$time] = null; |
801 | 801 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @param MetaBundle $metaBundle |
176 | 176 | * @param bool $forceUpdate |
177 | 177 | */ |
178 | - public function syncBundleWithConfig(MetaBundle &$metaBundle, bool $forceUpdate = false) |
|
178 | + public function syncBundleWithConfig(MetaBundle & $metaBundle, bool $forceUpdate = false) |
|
179 | 179 | { |
180 | 180 | $prevMetaBundle = $metaBundle; |
181 | 181 | $config = []; |
@@ -304,8 +304,8 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function updateMetaBundle(MetaBundle $metaBundle, int $siteId) |
306 | 306 | { |
307 | - $metaBundle->sourceName = (string)$metaBundle->sourceName; |
|
308 | - $metaBundle->sourceTemplate = (string)$metaBundle->sourceTemplate; |
|
307 | + $metaBundle->sourceName = (string) $metaBundle->sourceName; |
|
308 | + $metaBundle->sourceTemplate = (string) $metaBundle->sourceTemplate; |
|
309 | 309 | // Make sure it validates |
310 | 310 | if ($metaBundle->validate(null, true)) { |
311 | 311 | // Save it out to a record |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | 'sourceSiteId' => $siteId, |
316 | 316 | ]; |
317 | 317 | if ($metaBundle->typeId !== null) { |
318 | - $metaBundle->typeId = (int)$metaBundle->typeId; |
|
318 | + $metaBundle->typeId = (int) $metaBundle->typeId; |
|
319 | 319 | } |
320 | 320 | if (!empty($metaBundle->typeId)) { |
321 | 321 | $params['typeId'] = $metaBundle->typeId; |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | // @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 |
332 | 332 | // The issue was that the containers were getting saved to the db with a hard-coded setting in them, because they'd |
333 | 333 | // been set that way by the environment, whereas to be changeable via the GUI, it needs to be set to {seomatic.meta.robots} |
334 | - $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE]->data['robots'] ?? null; |
|
334 | + $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE]->data['robots'] ?? null; |
|
335 | 335 | if (!empty($robotsTag)) { |
336 | 336 | $robotsTag->content = $robotsTag->environment['live']['content'] ?? '{seomatic.meta.robots}'; |
337 | 337 | } |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $metaBundleDefaults = ArrayHelper::merge( |
414 | 414 | $seoElement::metaBundleConfig($sourceModel), |
415 | 415 | [ |
416 | - 'sourceTemplate' => (string)$siteSetting->template, |
|
416 | + 'sourceTemplate' => (string) $siteSetting->template, |
|
417 | 417 | 'sourceSiteId' => $siteSetting->siteId, |
418 | 418 | 'sourceAltSiteSettings' => $siteSettingsArray, |
419 | 419 | 'sourceDateUpdated' => $dateUpdated, |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | public function getMetaBundleBySourceHandle(string $sourceBundleType, string $sourceHandle, int $sourceSiteId, $typeId = null) |
462 | 462 | { |
463 | 463 | $metaBundle = null; |
464 | - $typeId = (int)$typeId; |
|
464 | + $typeId = (int) $typeId; |
|
465 | 465 | // See if we have the meta bundle cached |
466 | 466 | if (!empty($this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId])) { |
467 | 467 | $id = $this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId]; |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | /** @var Section|CategoryGroup|ProductType $sourceModel */ |
549 | 549 | $sourceModel = $seoElement::sourceModelFromId($sourceId); |
550 | 550 | if ($sourceModel !== null) { |
551 | - $metaBundle->sourceName = (string)$sourceModel->name; |
|
551 | + $metaBundle->sourceName = (string) $sourceModel->name; |
|
552 | 552 | $metaBundle->sourceHandle = $sourceModel->handle; |
553 | 553 | } |
554 | 554 | } |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | public function getMetaBundleBySourceId(string $sourceBundleType, int $sourceId, int $sourceSiteId, $typeId = null) |
589 | 589 | { |
590 | 590 | $metaBundle = null; |
591 | - $typeId = (int)$typeId; |
|
591 | + $typeId = (int) $typeId; |
|
592 | 592 | // See if we have the meta bundle cached |
593 | 593 | if (!empty($this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId])) { |
594 | 594 | $id = $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId]; |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | ->from(['{{%seomatic_metabundles}}']) |
785 | 785 | ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE]); |
786 | 786 | |
787 | - if ((int)$sourceSiteId !== 0) { |
|
787 | + if ((int) $sourceSiteId !== 0) { |
|
788 | 788 | $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]); |
789 | 789 | } |
790 | 790 | if ($filter !== '') { |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | public function getContentMetaBundleForElement(Element $element) |
822 | 822 | { |
823 | 823 | $source = $this->getMetaSourceFromElement($element); |
824 | - $key = implode(".", $source) . '.' . $element->siteId; |
|
824 | + $key = implode(".", $source).'.'.$element->siteId; |
|
825 | 825 | |
826 | 826 | if (empty($this->elementContentMetaBundles[$key])) { |
827 | 827 | $this->elementContentMetaBundles[$key] = $this->getMetaBundleBySourceId($source[1], $source[0], $element->siteId, $source[4]); |
@@ -81,24 +81,24 @@ |
||
81 | 81 | $metaContainers = Seomatic::$plugin->metaContainers; |
82 | 82 | // Get our cache key |
83 | 83 | $asArrayKey = $asArray ? 'true' : 'false'; |
84 | - $cacheKey = $uri . $siteId . implode($containerKeys) . $asArrayKey . Seomatic::$environment; |
|
84 | + $cacheKey = $uri.$siteId.implode($containerKeys).$asArrayKey.Seomatic::$environment; |
|
85 | 85 | // Load the meta containers |
86 | 86 | $dependency = new TagDependency([ |
87 | 87 | 'tags' => [ |
88 | 88 | $metaContainers::GLOBAL_METACONTAINER_CACHE_TAG, |
89 | - $metaContainers::METACONTAINER_CACHE_TAG . $sourceId . $sourceBundleType . $siteId, |
|
90 | - $metaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId, |
|
91 | - $metaContainers::METACONTAINER_CACHE_TAG . $cacheKey, |
|
89 | + $metaContainers::METACONTAINER_CACHE_TAG.$sourceId.$sourceBundleType.$siteId, |
|
90 | + $metaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId, |
|
91 | + $metaContainers::METACONTAINER_CACHE_TAG.$cacheKey, |
|
92 | 92 | ], |
93 | 93 | ]); |
94 | 94 | |
95 | 95 | $cache = Craft::$app->getCache(); |
96 | 96 | $result = $cache->getOrSet( |
97 | - self::CACHE_KEY . $cacheKey, |
|
98 | - function () use ($uri, $siteId, $containerKeys, $asArray) { |
|
97 | + self::CACHE_KEY.$cacheKey, |
|
98 | + function() use ($uri, $siteId, $containerKeys, $asArray) { |
|
99 | 99 | $result = []; |
100 | 100 | Craft::info( |
101 | - 'Meta controller container cache miss: ' . $uri . '/' . $siteId, |
|
101 | + 'Meta controller container cache miss: '.$uri.'/'.$siteId, |
|
102 | 102 | __METHOD__ |
103 | 103 | ); |
104 | 104 | // Load the meta containers and parse our globals |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | $metaValue = Craft::t( |
295 | 295 | 'seomatic', |
296 | 296 | 'Error rendering `{template}` -> {error}', |
297 | - ['template' => $metaValue, 'error' => $e->getMessage() . ' - ' . print_r($metaValue, true)] |
|
297 | + ['template' => $metaValue, 'error' => $e->getMessage().' - '.print_r($metaValue, true)] |
|
298 | 298 | ); |
299 | 299 | Craft::error($metaValue, __METHOD__); |
300 | 300 | Craft::$app->getErrorHandler()->logException($e); |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | // Handle being passed in an object |
314 | 314 | if (is_object($metaValue)) { |
315 | 315 | if ($metaValue instanceof Markup) { |
316 | - return trim(html_entity_decode((string)$metaValue, ENT_NOQUOTES, 'UTF-8')); |
|
316 | + return trim(html_entity_decode((string) $metaValue, ENT_NOQUOTES, 'UTF-8')); |
|
317 | 317 | } |
318 | 318 | if ($metaValue instanceof Asset) { |
319 | 319 | /** @var Asset $metaValue */ |