@@ -49,16 +49,16 @@ |
||
| 49 | 49 | public function includeMetaData($dependency) |
| 50 | 50 | { |
| 51 | 51 | Craft::beginProfile('MetaLinkContainer::includeMetaData', __METHOD__); |
| 52 | - $uniqueKey = $this->handle . $dependency->tags[3]; |
|
| 52 | + $uniqueKey = $this->handle.$dependency->tags[3]; |
|
| 53 | 53 | $cache = Craft::$app->getCache(); |
| 54 | 54 | if ($this->clearCache) { |
| 55 | 55 | TagDependency::invalidate($cache, $dependency->tags[3]); |
| 56 | 56 | } |
| 57 | 57 | $tagData = $cache->getOrSet( |
| 58 | - self::CONTAINER_TYPE . $uniqueKey, |
|
| 58 | + self::CONTAINER_TYPE.$uniqueKey, |
|
| 59 | 59 | function() use ($uniqueKey) { |
| 60 | 60 | Craft::info( |
| 61 | - self::CONTAINER_TYPE . ' cache miss: ' . $uniqueKey, |
|
| 61 | + self::CONTAINER_TYPE.' cache miss: '.$uniqueKey, |
|
| 62 | 62 | __METHOD__ |
| 63 | 63 | ); |
| 64 | 64 | $tagData = []; |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -19,44 +19,44 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'General Meta Tags', |
| 25 | 25 | 'handle' => TagService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTagContainer::class, |
|
| 26 | + 'class' => (string) MetaTagContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
| 30 | 30 | 'data' => [ |
| 31 | 31 | ], |
| 32 | 32 | ], |
| 33 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 33 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 34 | 34 | 'name' => 'Facebook', |
| 35 | 35 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 36 | 36 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 37 | - 'class' => (string)MetaTagContainer::class, |
|
| 37 | + 'class' => (string) MetaTagContainer::class, |
|
| 38 | 38 | 'include' => true, |
| 39 | 39 | 'dependencies' => [ |
| 40 | 40 | ], |
| 41 | 41 | 'data' => [ |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 44 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 45 | 45 | 'name' => 'Twitter', |
| 46 | 46 | 'description' => 'Twitter Card Meta Tags', |
| 47 | 47 | 'handle' => TagService::TWITTER_HANDLE, |
| 48 | - 'class' => (string)MetaTagContainer::class, |
|
| 48 | + 'class' => (string) MetaTagContainer::class, |
|
| 49 | 49 | 'include' => true, |
| 50 | 50 | 'dependencies' => [ |
| 51 | 51 | ], |
| 52 | 52 | 'data' => [ |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 55 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 56 | 56 | 'name' => 'Miscellaneous', |
| 57 | 57 | 'description' => 'Miscellaneous Meta Tags', |
| 58 | 58 | 'handle' => TagService::MISC_HANDLE, |
| 59 | - 'class' => (string)MetaTagContainer::class, |
|
| 59 | + 'class' => (string) MetaTagContainer::class, |
|
| 60 | 60 | 'include' => true, |
| 61 | 61 | 'dependencies' => [ |
| 62 | 62 | ], |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | // Get the page number of this request |
| 178 | 178 | $request = Craft::$app->getRequest(); |
| 179 | 179 | if (!$request->isConsoleRequest) { |
| 180 | - $this->paginationPage = (string)$request->pageNum; |
|
| 180 | + $this->paginationPage = (string) $request->pageNum; |
|
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
@@ -253,10 +253,10 @@ discard block |
||
| 253 | 253 | $dependency = $this->containerDependency; |
| 254 | 254 | $uniqueKey = $dependency->tags[3] ?? self::GLOBALS_CACHE_KEY; |
| 255 | 255 | list($this->metaGlobalVars, $this->metaSiteVars) = Craft::$app->getCache()->getOrSet( |
| 256 | - self::GLOBALS_CACHE_KEY . $uniqueKey, |
|
| 256 | + self::GLOBALS_CACHE_KEY.$uniqueKey, |
|
| 257 | 257 | function() use ($uniqueKey) { |
| 258 | 258 | Craft::info( |
| 259 | - self::GLOBALS_CACHE_KEY . ' cache miss: ' . $uniqueKey, |
|
| 259 | + self::GLOBALS_CACHE_KEY.' cache miss: '.$uniqueKey, |
|
| 260 | 260 | __METHOD__ |
| 261 | 261 | ); |
| 262 | 262 | |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | ?? 1; |
| 377 | 377 | } |
| 378 | 378 | // Handle pagination |
| 379 | - $paginationPage = 'page' . $this->paginationPage; |
|
| 379 | + $paginationPage = 'page'.$this->paginationPage; |
|
| 380 | 380 | // Get the path for the current request |
| 381 | 381 | $request = Craft::$app->getRequest(); |
| 382 | 382 | $requestPath = '/'; |
@@ -392,21 +392,21 @@ discard block |
||
| 392 | 392 | } |
| 393 | 393 | } |
| 394 | 394 | // Get our cache key |
| 395 | - $cacheKey = $uri . $siteId . $paginationPage . $requestPath . $this->getAllowedUrlParams(); |
|
| 395 | + $cacheKey = $uri.$siteId.$paginationPage.$requestPath.$this->getAllowedUrlParams(); |
|
| 396 | 396 | // For requests with a status code of >= 400, use one cache key |
| 397 | 397 | if (!$request->isConsoleRequest) { |
| 398 | 398 | $response = Craft::$app->getResponse(); |
| 399 | 399 | if ($response->statusCode >= 400) { |
| 400 | - $cacheKey = $siteId . self::INVALID_RESPONSE_CACHE_KEY . $response->statusCode; |
|
| 400 | + $cacheKey = $siteId.self::INVALID_RESPONSE_CACHE_KEY.$response->statusCode; |
|
| 401 | 401 | } |
| 402 | 402 | } |
| 403 | 403 | // Load the meta containers |
| 404 | 404 | $dependency = new TagDependency([ |
| 405 | 405 | 'tags' => [ |
| 406 | 406 | self::GLOBAL_METACONTAINER_CACHE_TAG, |
| 407 | - self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId, |
|
| 408 | - self::METACONTAINER_CACHE_TAG . $uri . $siteId, |
|
| 409 | - self::METACONTAINER_CACHE_TAG . $cacheKey, |
|
| 407 | + self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId, |
|
| 408 | + self::METACONTAINER_CACHE_TAG.$uri.$siteId, |
|
| 409 | + self::METACONTAINER_CACHE_TAG.$cacheKey, |
|
| 410 | 410 | ], |
| 411 | 411 | ]); |
| 412 | 412 | $this->containerDependency = $dependency; |
@@ -423,10 +423,10 @@ discard block |
||
| 423 | 423 | } else { |
| 424 | 424 | $cache = Craft::$app->getCache(); |
| 425 | 425 | list($this->metaGlobalVars, $this->metaSiteVars, $this->metaSitemapVars, $this->metaContainers) = $cache->getOrSet( |
| 426 | - self::CACHE_KEY . $cacheKey, |
|
| 426 | + self::CACHE_KEY.$cacheKey, |
|
| 427 | 427 | function() use ($uri, $siteId) { |
| 428 | 428 | Craft::info( |
| 429 | - 'Meta container cache miss: ' . $uri . '/' . $siteId, |
|
| 429 | + 'Meta container cache miss: '.$uri.'/'.$siteId, |
|
| 430 | 430 | __METHOD__ |
| 431 | 431 | ); |
| 432 | 432 | $this->loadGlobalMetaContainers($siteId); |
@@ -829,10 +829,10 @@ discard block |
||
| 829 | 829 | $cache = Craft::$app->getCache(); |
| 830 | 830 | TagDependency::invalidate( |
| 831 | 831 | $cache, |
| 832 | - self::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId |
|
| 832 | + self::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId |
|
| 833 | 833 | ); |
| 834 | 834 | Craft::info( |
| 835 | - 'Meta bundle cache cleared: ' . $metaBundleSourceId . ' / ' . $metaBundleSourceType . ' / ' . $siteId, |
|
| 835 | + 'Meta bundle cache cleared: '.$metaBundleSourceId.' / '.$metaBundleSourceType.' / '.$siteId, |
|
| 836 | 836 | __METHOD__ |
| 837 | 837 | ); |
| 838 | 838 | // Trigger an event to let other plugins/modules know we've cleared our caches |
@@ -859,9 +859,9 @@ discard block |
||
| 859 | 859 | if ($siteId === null) { |
| 860 | 860 | $siteId = Craft::$app->getSites()->currentSite->id ?? 1; |
| 861 | 861 | } |
| 862 | - TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG . $uri . $siteId); |
|
| 862 | + TagDependency::invalidate($cache, self::METACONTAINER_CACHE_TAG.$uri.$siteId); |
|
| 863 | 863 | Craft::info( |
| 864 | - 'Meta container cache cleared: ' . $uri . ' / ' . $siteId, |
|
| 864 | + 'Meta container cache cleared: '.$uri.' / '.$siteId, |
|
| 865 | 865 | __METHOD__ |
| 866 | 866 | ); |
| 867 | 867 | // Trigger an event to let other plugins/modules know we've cleared our caches |
@@ -1002,7 +1002,7 @@ discard block |
||
| 1002 | 1002 | |
| 1003 | 1003 | // Handle re-creating the `mainEntityOfPage` so that the model injected into the |
| 1004 | 1004 | // templates has the appropriate attributes |
| 1005 | - $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE; |
|
| 1005 | + $generalContainerKey = MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE; |
|
| 1006 | 1006 | $generalContainer = $this->metaContainers[$generalContainerKey]; |
| 1007 | 1007 | if (($generalContainer !== null) && !empty($generalContainer->data['mainEntityOfPage'])) { |
| 1008 | 1008 | /** @var MetaJsonLd $jsonLdModel */ |
@@ -388,7 +388,7 @@ |
||
| 388 | 388 | ConfigHelper::getConfigFromFile(self::configFilePath()), |
| 389 | 389 | [ |
| 390 | 390 | 'sourceId' => $sourceModel->id, |
| 391 | - 'sourceName' => (string)$sourceModel->name, |
|
| 391 | + 'sourceName' => (string) $sourceModel->name, |
|
| 392 | 392 | 'sourceHandle' => $sourceModel->handle, |
| 393 | 393 | ] |
| 394 | 394 | ); |