@@ -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 | /** |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | // Replace the hard-coded dev server URL with whatever they have theirs set to |
| 166 | 166 | $script = str_replace( |
| 167 | 167 | 'http://localhost:3000/', |
| 168 | - rtrim($this->devServerPublic, '/') . '/', |
|
| 168 | + rtrim($this->devServerPublic, '/').'/', |
|
| 169 | 169 | $script |
| 170 | 170 | ); |
| 171 | 171 | $lines[] = HtmlHelper::script( |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | // Replace the hard-coded dev server URL with whatever they have theirs set to |
| 306 | 306 | $script = str_replace( |
| 307 | 307 | 'http://localhost:3000/', |
| 308 | - rtrim($this->devServerPublic, '/') . '/', |
|
| 308 | + rtrim($this->devServerPublic, '/').'/', |
|
| 309 | 309 | $script |
| 310 | 310 | ); |
| 311 | 311 | $view->registerScript( |
@@ -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 | |
@@ -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': |
@@ -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 | |