@@ -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 | /** |
@@ -45,14 +45,14 @@ discard block |
||
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 | /** |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | } |
196 | 196 | |
197 | 197 | $imports = $entry['imports'] ?? []; |
198 | - foreach($imports as $import) { |
|
198 | + foreach ($imports as $import) { |
|
199 | 199 | $importFiles[] = $manifest[$import]['file']; |
200 | 200 | self::extractImportFiles($manifest, $import, $importFiles); |
201 | 201 | } |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $this->manifestShimsIncluded = true; |
217 | 217 | } |
218 | 218 | |
219 | - foreach(array_merge($tags, $legacyTags) as $tag) { |
|
219 | + foreach (array_merge($tags, $legacyTags) as $tag) { |
|
220 | 220 | if (!empty($tag)) { |
221 | 221 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
222 | 222 | switch ($tag['type']) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | |
235 | 235 | // modulepreload any imports from modern tags |
236 | 236 | $modulepreloadPolyfillRequired = false; |
237 | - foreach($tags as $tag) { |
|
237 | + foreach ($tags as $tag) { |
|
238 | 238 | if (!empty($tag)) { |
239 | 239 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
240 | 240 | switch ($tag['type']) { |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | } |
253 | 253 | } |
254 | - if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) { |
|
254 | + if ($modulepreloadPolyfillRequired && !$this->modulepreloadPolyfillIncluded) { |
|
255 | 255 | $this->modulepreloadPolyfillIncluded = true; |
256 | 256 | $lines[] = HtmlHelper::script( |
257 | 257 | FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix), |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | $view->registerJsFile( |
325 | 325 | $url, |
326 | 326 | array_merge(['type' => 'module'], $scriptTagAttrs), |
327 | - md5($url . JsonHelper::encode($scriptTagAttrs)) |
|
327 | + md5($url.JsonHelper::encode($scriptTagAttrs)) |
|
328 | 328 | ); |
329 | 329 | } |
330 | 330 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | } |
361 | 361 | $this->manifestShimsIncluded = true; |
362 | 362 | } |
363 | - foreach(array_merge($tags, $legacyTags) as $tag) { |
|
363 | + foreach (array_merge($tags, $legacyTags) as $tag) { |
|
364 | 364 | if (!empty($tag)) { |
365 | 365 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
366 | 366 | switch ($tag['type']) { |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | $view->registerJsFile( |
369 | 369 | $url, |
370 | 370 | $tag['options'], |
371 | - md5($url . JsonHelper::encode($tag['options'])) |
|
371 | + md5($url.JsonHelper::encode($tag['options'])) |
|
372 | 372 | ); |
373 | 373 | break; |
374 | 374 | case 'css': |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | |
386 | 386 | // modulepreload any imports from modern tags |
387 | 387 | $modulepreloadPolyfillRequired = false; |
388 | - foreach($tags as $tag) { |
|
388 | + foreach ($tags as $tag) { |
|
389 | 389 | if (!empty($tag)) { |
390 | 390 | $url = FileHelper::createUrl($this->serverPublic, $tag['url']); |
391 | 391 | switch ($tag['type']) { |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | } |
406 | 406 | } |
407 | 407 | } |
408 | - if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) { |
|
408 | + if ($modulepreloadPolyfillRequired && !$this->modulepreloadPolyfillIncluded) { |
|
409 | 409 | $this->modulepreloadPolyfillIncluded = true; |
410 | 410 | $view->registerScript( |
411 | 411 | FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix), |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | public function invalidateCaches() |
459 | 459 | { |
460 | 460 | $cache = Craft::$app->getCache(); |
461 | - TagDependency::invalidate($cache, FileHelper::CACHE_TAG . $this->cacheKeySuffix); |
|
461 | + TagDependency::invalidate($cache, FileHelper::CACHE_TAG.$this->cacheKeySuffix); |
|
462 | 462 | Craft::info('All Vite caches cleared', __METHOD__); |
463 | 463 | } |
464 | 464 |