@@ -45,14 +45,14 @@ |
||
| 45 | 45 | public static function fetchManifest(string $manifestPath) |
| 46 | 46 | { |
| 47 | 47 | // Grab the manifest |
| 48 | - $pathOrUrl = (string)Craft::parseEnv($manifestPath); |
|
| 48 | + $pathOrUrl = (string) Craft::parseEnv($manifestPath); |
|
| 49 | 49 | $manifest = FileHelper::fetch($pathOrUrl, [JsonHelper::class, 'decodeIfJson']); |
| 50 | 50 | // If no manifest file is found, log it |
| 51 | 51 | if ($manifest === null) { |
| 52 | - Craft::error('Manifest not found at ' . $manifestPath, __METHOD__); |
|
| 52 | + Craft::error('Manifest not found at '.$manifestPath, __METHOD__); |
|
| 53 | 53 | } |
| 54 | 54 | // Ensure we're dealing with an array |
| 55 | - self::$manifest = (array)$manifest; |
|
| 55 | + self::$manifest = (array) $manifest; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -54,12 +54,12 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public static function fetch(string $pathOrUrl, callable $callback = null, string $cacheKeySuffix = '') |
| 56 | 56 | { |
| 57 | - $pathOrUrl = (string)Craft::parseEnv($pathOrUrl); |
|
| 57 | + $pathOrUrl = (string) Craft::parseEnv($pathOrUrl); |
|
| 58 | 58 | // Create the dependency tags |
| 59 | 59 | $dependency = new TagDependency([ |
| 60 | 60 | 'tags' => [ |
| 61 | - self::CACHE_TAG . $cacheKeySuffix, |
|
| 62 | - self::CACHE_TAG . $cacheKeySuffix . $pathOrUrl, |
|
| 61 | + self::CACHE_TAG.$cacheKeySuffix, |
|
| 62 | + self::CACHE_TAG.$cacheKeySuffix.$pathOrUrl, |
|
| 63 | 63 | ], |
| 64 | 64 | ]); |
| 65 | 65 | // If this is a file path such as for the `manifest.json`, add a FileDependency so it's cache bust if the file changes |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | // Get the result from the cache, or parse the file |
| 81 | 81 | $cache = Craft::$app->getCache(); |
| 82 | 82 | return $cache->getOrSet( |
| 83 | - self::CACHE_KEY . $cacheKeySuffix . $pathOrUrl, |
|
| 84 | - function () use ($pathOrUrl, $callback) { |
|
| 83 | + self::CACHE_KEY.$cacheKeySuffix.$pathOrUrl, |
|
| 84 | + function() use ($pathOrUrl, $callback) { |
|
| 85 | 85 | $contents = null; |
| 86 | 86 | $result = null; |
| 87 | 87 | if (UrlHelper::isAbsoluteUrl($pathOrUrl)) { |
@@ -133,8 +133,8 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | public static function createUrl(string $url, string $path): string |
| 135 | 135 | { |
| 136 | - $url = (string)Craft::parseEnv($url); |
|
| 137 | - return rtrim($url, '/') . '/' . trim($path, '/'); |
|
| 136 | + $url = (string) Craft::parseEnv($url); |
|
| 137 | + return rtrim($url, '/').'/'.trim($path, '/'); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | $this->manifestShimsIncluded = true; |
| 212 | 212 | } |
| 213 | - foreach(array_merge($tags, $legacyTags) as $tag) { |
|
| 213 | + foreach (array_merge($tags, $legacyTags) as $tag) { |
|
| 214 | 214 | if (!empty($tag)) { |
| 215 | 215 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
| 216 | 216 | switch ($tag['type']) { |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | $view->registerJsFile( |
| 292 | 292 | $url, |
| 293 | 293 | array_merge(['type' => 'module'], $scriptTagAttrs), |
| 294 | - md5($url . JsonHelper::encode($scriptTagAttrs)) |
|
| 294 | + md5($url.JsonHelper::encode($scriptTagAttrs)) |
|
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | } |
| 328 | 328 | $this->manifestShimsIncluded = true; |
| 329 | 329 | } |
| 330 | - foreach(array_merge($tags, $legacyTags) as $tag) { |
|
| 330 | + foreach (array_merge($tags, $legacyTags) as $tag) { |
|
| 331 | 331 | if (!empty($tag)) { |
| 332 | 332 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
| 333 | 333 | switch ($tag['type']) { |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $view->registerJsFile( |
| 336 | 336 | $url, |
| 337 | 337 | $tag['options'], |
| 338 | - md5($url . JsonHelper::encode($tag['options'])) |
|
| 338 | + md5($url.JsonHelper::encode($tag['options'])) |
|
| 339 | 339 | ); |
| 340 | 340 | break; |
| 341 | 341 | case 'css': |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | public function invalidateCaches() |
| 394 | 394 | { |
| 395 | 395 | $cache = Craft::$app->getCache(); |
| 396 | - TagDependency::invalidate($cache, FileHelper::CACHE_TAG . $this->cacheKeySuffix); |
|
| 396 | + TagDependency::invalidate($cache, FileHelper::CACHE_TAG.$this->cacheKeySuffix); |
|
| 397 | 397 | Craft::info('All Vite caches cleared', __METHOD__); |
| 398 | 398 | } |
| 399 | 399 | |