@@ -19,11 +19,11 @@ |
||
19 | 19 | */ |
20 | 20 | |
21 | 21 | return [ |
22 | - MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE => [ |
|
22 | + MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE => [ |
|
23 | 23 | 'name' => 'General', |
24 | 24 | 'description' => 'JsonLd Tags', |
25 | 25 | 'handle' => JsonLdService::GENERAL_HANDLE, |
26 | - 'class' => (string)MetaJsonLdContainer::class, |
|
26 | + 'class' => (string) MetaJsonLdContainer::class, |
|
27 | 27 | 'include' => true, |
28 | 28 | 'dependencies' => [ |
29 | 29 | ], |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * @inheritdoc |
33 | 33 | */ |
34 | - protected array|bool|int $allowAnonymous = [ |
|
34 | + protected array | bool | int $allowAnonymous = [ |
|
35 | 35 | 'sitemap-index', |
36 | 36 | 'sitemap-index-redirect', |
37 | 37 | 'sitemap', |
@@ -36,7 +36,7 @@ |
||
36 | 36 | /** |
37 | 37 | * @inheritdoc |
38 | 38 | */ |
39 | - protected array|bool|int $allowAnonymous = [ |
|
39 | + protected array | bool | int $allowAnonymous = [ |
|
40 | 40 | 'all-meta-containers', |
41 | 41 | 'meta-title-container', |
42 | 42 | 'meta-tag-container', |
@@ -30,7 +30,7 @@ |
||
30 | 30 | /** |
31 | 31 | * @inheritdoc |
32 | 32 | */ |
33 | - protected array|bool|int $allowAnonymous = [ |
|
33 | + protected array | bool | int $allowAnonymous = [ |
|
34 | 34 | 'humans', |
35 | 35 | 'robots', |
36 | 36 | 'ads', |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * @var bool|array |
48 | 48 | */ |
49 | - protected array|bool|int $allowAnonymous = [ |
|
49 | + protected array | bool | int $allowAnonymous = [ |
|
50 | 50 | ]; |
51 | 51 | |
52 | 52 | // Public Methods |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | // Query the db table |
101 | 101 | $offset = ($page - 1) * $per_page; |
102 | 102 | $currentSiteHandle = ''; |
103 | - if ((int)$siteId !== 0) { |
|
103 | + if ((int) $siteId !== 0) { |
|
104 | 104 | $site = Craft::$app->getSites()->getSiteById($siteId); |
105 | 105 | if ($site !== null) { |
106 | 106 | $currentSiteHandle = $site->handle; |
@@ -155,11 +155,11 @@ discard block |
||
155 | 155 | $numGrades = \count(SettingsController::SETUP_GRADES); |
156 | 156 | $numFields = \count(SettingsController::SEO_SETUP_FIELDS); |
157 | 157 | foreach (SettingsController::SEO_SETUP_FIELDS as $setupField => $setupLabel) { |
158 | - $stat += (int)!empty($metaBundle->metaGlobalVars[$setupField]); |
|
158 | + $stat += (int) !empty($metaBundle->metaGlobalVars[$setupField]); |
|
159 | 159 | $value = $variables['contentSetupChecklist'][$setupField]['value'] ?? 0; |
160 | 160 | $variables['contentSetupChecklist'][$setupField] = [ |
161 | 161 | 'label' => $setupLabel, |
162 | - 'value' => $value + (int)!empty($metaBundle->metaGlobalVars[$setupField]), |
|
162 | + 'value' => $value + (int) !empty($metaBundle->metaGlobalVars[$setupField]), |
|
163 | 163 | ]; |
164 | 164 | } |
165 | 165 | $stat = round($numGrades - (($stat * $numGrades) / $numFields)); |
@@ -66,8 +66,8 @@ |
||
66 | 66 | string $sort = 'sourceName|asc', |
67 | 67 | int $page = 1, |
68 | 68 | int $per_page = 20, |
69 | - $filter = '', |
|
70 | - $siteId = 0 |
|
69 | + $filter = '', |
|
70 | + $siteId = 0 |
|
71 | 71 | ): Response |
72 | 72 | { |
73 | 73 | $data = []; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | /** |
31 | 31 | * @inheritdoc |
32 | 32 | */ |
33 | - protected array|bool|int $allowAnonymous = [ |
|
33 | + protected array | bool | int $allowAnonymous = [ |
|
34 | 34 | 'get-type', |
35 | 35 | 'get-decomposed-type', |
36 | 36 | 'get-type-array', |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @inheritdoc |
34 | 34 | */ |
35 | - protected array|bool|int $allowAnonymous = [ |
|
35 | + protected array | bool | int $allowAnonymous = [ |
|
36 | 36 | 'social-media', |
37 | 37 | ]; |
38 | 38 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $html = ''; |
54 | 54 | |
55 | 55 | // Don't allow the preview to be accessed publicly |
56 | - $this->requireAuthorization(Seomatic::SEOMATIC_PREVIEW_AUTHORIZATION_KEY . $elementId); |
|
56 | + $this->requireAuthorization(Seomatic::SEOMATIC_PREVIEW_AUTHORIZATION_KEY.$elementId); |
|
57 | 57 | |
58 | 58 | /** @var Element $element */ |
59 | 59 | $element = Craft::$app->getElements()->getElementById($elementId, null, $siteId); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | /** |
35 | 35 | * @inheritdoc |
36 | 36 | */ |
37 | - protected array|bool|int $allowAnonymous = [ |
|
37 | + protected array | bool | int $allowAnonymous = [ |
|
38 | 38 | 'seo-file-link', |
39 | 39 | ]; |
40 | 40 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | // Add the Link header |
85 | 85 | if (!empty($canonical)) { |
86 | - $headerValue = '<' . $canonical . '>; rel="canonical"'; |
|
86 | + $headerValue = '<'.$canonical.'>; rel="canonical"'; |
|
87 | 87 | $response->headers->add('Link', $headerValue); |
88 | 88 | } |
89 | 89 | // Ensure the file type is allowed |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | // Get the page number of this request |
161 | 161 | $request = Craft::$app->getRequest(); |
162 | 162 | if (!$request->isConsoleRequest) { |
163 | - $this->paginationPage = (string)$request->pageNum; |
|
163 | + $this->paginationPage = (string) $request->pageNum; |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY; |
177 | 177 | $uniqueKey .= $bodyPosition; |
178 | 178 | $scriptData = Craft::$app->getCache()->getOrSet( |
179 | - self::GLOBALS_CACHE_KEY . $uniqueKey, |
|
180 | - function () use ($uniqueKey, $bodyPosition) { |
|
179 | + self::GLOBALS_CACHE_KEY.$uniqueKey, |
|
180 | + function() use ($uniqueKey, $bodyPosition) { |
|
181 | 181 | Craft::info( |
182 | - self::SCRIPTS_CACHE_KEY . ' cache miss: ' . $uniqueKey, |
|
182 | + self::SCRIPTS_CACHE_KEY.' cache miss: '.$uniqueKey, |
|
183 | 183 | __METHOD__ |
184 | 184 | ); |
185 | 185 | $scriptData = []; |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | foreach ($scriptContainer->data as $metaScript) { |
192 | 192 | /** @var MetaScript $metaScript */ |
193 | 193 | if (!empty($metaScript->bodyTemplatePath) |
194 | - && ((int)$metaScript->bodyPosition === $bodyPosition)) { |
|
194 | + && ((int) $metaScript->bodyPosition === $bodyPosition)) { |
|
195 | 195 | $scriptData[] = $metaScript->renderBodyHtml(); |
196 | 196 | } |
197 | 197 | } |
@@ -271,10 +271,10 @@ discard block |
||
271 | 271 | $dependency = $this->containerDependency; |
272 | 272 | $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY; |
273 | 273 | list($this->metaGlobalVars, $this->metaSiteVars) = Craft::$app->getCache()->getOrSet( |
274 | - self::GLOBALS_CACHE_KEY . $uniqueKey, |
|
275 | - function () use ($uniqueKey) { |
|
274 | + self::GLOBALS_CACHE_KEY.$uniqueKey, |
|
275 | + function() use ($uniqueKey) { |
|
276 | 276 | Craft::info( |
277 | - self::GLOBALS_CACHE_KEY . ' cache miss: ' . $uniqueKey, |
|
277 | + self::GLOBALS_CACHE_KEY.' cache miss: '.$uniqueKey, |
|
278 | 278 | __METHOD__ |
279 | 279 | ); |
280 | 280 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | ?? 1; |
396 | 396 | } |
397 | 397 | // Handle pagination |
398 | - $paginationPage = 'page' . $this->paginationPage; |
|
398 | + $paginationPage = 'page'.$this->paginationPage; |
|
399 | 399 | // Get the path for the current request |
400 | 400 | $request = Craft::$app->getRequest(); |
401 | 401 | $requestPath = '/'; |
@@ -411,21 +411,21 @@ discard block |
||
411 | 411 | } |
412 | 412 | } |
413 | 413 | // Get our cache key |
414 | - $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams(); |
|
414 | + $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams(); |
|
415 | 415 | // For requests with a status code of >= 400, use one cache key |
416 | 416 | if (!$request->isConsoleRequest) { |
417 | 417 | $response = Craft::$app->getResponse(); |
418 | 418 | if ($response->statusCode >= 400) { |
419 | - $cacheKey = $siteId . self::INVALID_RESPONSE_CACHE_KEY . $response->statusCode; |
|
419 | + $cacheKey = $siteId.self::INVALID_RESPONSE_CACHE_KEY.$response->statusCode; |
|
420 | 420 | } |
421 | 421 | } |
422 | 422 | // Load the meta containers |
423 | 423 | $dependency = new TagDependency([ |
424 | 424 | 'tags' => [ |
425 | 425 | self::GLOBAL_METACONTAINER_CACHE_TAG, |
426 | - self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId, |
|
427 | - self::METACONTAINER_CACHE_TAG . $uri . $siteId, |
|
428 | - self::METACONTAINER_CACHE_TAG . $cacheKey, |
|
426 | + self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId, |
|
427 | + self::METACONTAINER_CACHE_TAG.$uri.$siteId, |
|
428 | + self::METACONTAINER_CACHE_TAG.$cacheKey, |
|
429 | 429 | ], |
430 | 430 | ]); |
431 | 431 | $this->containerDependency = $dependency; |
@@ -441,10 +441,10 @@ discard block |
||
441 | 441 | } else { |
442 | 442 | $cache = Craft::$app->getCache(); |
443 | 443 | list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet( |
444 | - self::CACHE_KEY . $cacheKey, |
|
445 | - function () use ($uri, $siteId) { |
|
444 | + self::CACHE_KEY.$cacheKey, |
|
445 | + function() use ($uri, $siteId) { |
|
446 | 446 | Craft::info( |
447 | - 'Meta container cache miss: ' . $uri . '/' . $siteId, |
|
447 | + 'Meta container cache miss: '.$uri.'/'.$siteId, |
|
448 | 448 | __METHOD__ |
449 | 449 | ); |
450 | 450 | $this->loadGlobalMetaContainers($siteId); |
@@ -839,10 +839,10 @@ discard block |
||
839 | 839 | $cache = Craft::$app->getCache(); |
840 | 840 | TagDependency::invalidate( |
841 | 841 | $cache, |
842 | - self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId |
|
842 | + self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId |
|
843 | 843 | ); |
844 | 844 | Craft::info( |
845 | - 'Meta bundle cache cleared: ' . $metaBundleSourceId . ' / ' . $metaBundleSourceType . ' / ' . $siteId, |
|
845 | + 'Meta bundle cache cleared: '.$metaBundleSourceId.' / '.$metaBundleSourceType.' / '.$siteId, |
|
846 | 846 | __METHOD__ |
847 | 847 | ); |
848 | 848 | // Trigger an event to let other plugins/modules know we've cleared our caches |
@@ -869,9 +869,9 @@ discard block |
||
869 | 869 | if ($siteId === null) { |
870 | 870 | $siteId = Craft::$app->getSites()->currentSite->id ?? 1; |
871 | 871 | } |
872 | - TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG . $uri . $siteId); |
|
872 | + TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG.$uri.$siteId); |
|
873 | 873 | Craft::info( |
874 | - 'Meta container cache cleared: ' . $uri . ' / ' . $siteId, |
|
874 | + 'Meta container cache cleared: '.$uri.' / '.$siteId, |
|
875 | 875 | __METHOD__ |
876 | 876 | ); |
877 | 877 | // Trigger an event to let other plugins/modules know we've cleared our caches |
@@ -988,7 +988,7 @@ discard block |
||
988 | 988 | |
989 | 989 | // Handle re-creating the `mainEntityOfPage` so that the model injected into the |
990 | 990 | // templates has the appropriate attributes |
991 | - $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE; |
|
991 | + $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE; |
|
992 | 992 | $generalContainer = $this->metaContainers[$generalContainerKey]; |
993 | 993 | if (($generalContainer !== null) && !empty($generalContainer->data['mainEntityOfPage'])) { |
994 | 994 | /** @var MetaJsonLd $jsonLdModel */ |