suggestions from Nicolas!

weaverryan · weaverryan · commit 5bb88ad35dee · 2023-05-12T13:54:23.000-04:00
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php b/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
@@ -39,18 +39,9 @@ public function compile(string $content, MappedAsset $mappedAsset): string
                 continue;
             }
 
-            $content = $compiler->compile($content, $mappedAsset, $this->getAssetMapper());
+            $content = $compiler->compile($content, $mappedAsset, $this->assetMapper ??= ($this->assetMapperFactory)());
         }
 
         return $content;
     }
-
-    private function getAssetMapper(): AssetMapperInterface
-    {
-        if (!isset($this->assetMapper)) {
-            $this->assetMapper = ($this->assetMapperFactory)();
-        }
-
-        return $this->assetMapper;
-    }
 }
diff --git a/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php b/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php
@@ -66,7 +66,7 @@ public function createMappedAsset(string $logicalPath, string $sourcePath): ?Map
     private function getDigest(MappedAsset $asset): array
     {
         // check for a pre-digested file
-        if (1 === preg_match(self::PREDIGESTED_REGEX, $asset->getLogicalPath(), $matches)) {
+        if (preg_match(self::PREDIGESTED_REGEX, $asset->getLogicalPath(), $matches)) {
             return [$matches[1], true];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,18 +39,9 @@ public function compile(string $content, MappedAsset $mappedAsset): string`
`39`	`39`	`continue;`
`40`	`40`	`}`
`41`	`41`
`42`		`- $content = $compiler->compile($content, $mappedAsset, $this->getAssetMapper());`
	`42`	`+ $content = $compiler->compile($content, $mappedAsset, $this->assetMapper ??= ($this->assetMapperFactory)());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return $content;`
`46`	`46`	`}`
`47`		`-`
`48`		`- private function getAssetMapper(): AssetMapperInterface`
`49`		`- {`
`50`		`- if (!isset($this->assetMapper)) {`
`51`		`- $this->assetMapper = ($this->assetMapperFactory)();`
`52`		`- }`
`53`		`-`
`54`		`- return $this->assetMapper;`
`55`		`- }`
`56`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function createMappedAsset(string $logicalPath, string $sourcePath): ?Map`
`66`	`66`	`private function getDigest(MappedAsset $asset): array`
`67`	`67`	`{`
`68`	`68`	`// check for a pre-digested file`
`69`		`- if (1 === preg_match(self::PREDIGESTED_REGEX, $asset->getLogicalPath(), $matches)) {`
	`69`	`+ if (preg_match(self::PREDIGESTED_REGEX, $asset->getLogicalPath(), $matches)) {`
`70`	`70`	`return [$matches[1], true];`
`71`	`71`	`}`
`72`	`72`