bug #58859 [AssetMapper] ignore missing directory in isVendor() (alexislefebvre)

nicolas-grekas · nicolas-grekas · commit 10be4d657d06 · 2024-11-20T12:01:55.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] ignore missing directory in `isVendor()` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #58858 | License | MIT ~~I don't know how to add tests yet, because this method is private.~~ Commits ------- 9e3984f fix: ignore missing directory in isVendor()
diff --git a/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php b/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php
@@ -128,6 +128,6 @@ private function isVendor(string $sourcePath): bool
         $sourcePath = realpath($sourcePath);
         $vendorDir = realpath($this->vendorDir);
 
-        return $sourcePath && str_starts_with($sourcePath, $vendorDir);
+        return $sourcePath && $vendorDir && str_starts_with($sourcePath, $vendorDir);
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php b/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php
@@ -26,6 +26,8 @@
 
 class MappedAssetFactoryTest extends TestCase
 {
+    private const DEFAULT_FIXTURES = __DIR__.'/../Fixtures/assets/vendor';
+
     private AssetMapperInterface&MockObject $assetMapper;
 
     public function testCreateMappedAsset()
@@ -137,7 +139,15 @@ public function testCreateMappedAssetInVendor()
         $this->assertTrue($asset->isVendor);
     }
 
-    private function createFactory(?AssetCompilerInterface $extraCompiler = null): MappedAssetFactory
+    public function testCreateMappedAssetInMissingVendor()
+    {
+        $assetMapper = $this->createFactory(null, '/this-path-does-not-exist/');
+        $asset = $assetMapper->createMappedAsset('lodash.js', __DIR__.'/../Fixtures/assets/vendor/lodash/lodash.index.js');
+        $this->assertSame('lodash.js', $asset->logicalPath);
+        $this->assertFalse($asset->isVendor);
+    }
+
+    private function createFactory(?AssetCompilerInterface $extraCompiler = null, ?string $vendorDir = self::DEFAULT_FIXTURES): MappedAssetFactory
     {
         $compilers = [
             new JavaScriptImportPathCompiler($this->createMock(ImportMapConfigReader::class)),
@@ -162,7 +172,7 @@ private function createFactory(?AssetCompilerInterface $extraCompiler = null): M
         $factory = new MappedAssetFactory(
             $pathResolver,
             $compiler,
-            __DIR__.'/../Fixtures/assets/vendor',
+            $vendorDir,
         );
 
         // mock the AssetMapper to behave like normal: by calling back to the factory

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,6 @@ private function isVendor(string $sourcePath): bool`
`128`	`128`	`$sourcePath = realpath($sourcePath);`
`129`	`129`	`$vendorDir = realpath($this->vendorDir);`
`130`	`130`
`131`		`- return $sourcePath && str_starts_with($sourcePath, $vendorDir);`
	`131`	`+ return $sourcePath && $vendorDir && str_starts_with($sourcePath, $vendorDir);`
`132`	`132`	`}`
`133`	`133`	`}`