fix: ignore missing directory in isVendor()

alexislefebvre · alexislefebvre · commit d38fc984b250 · 2024-11-13T18:38:50.000+01:00
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,11 +26,13 @@
 
 class MappedAssetFactoryTest extends TestCase
 {
+    final const DEFAULT_FIXTURES = __DIR__.'/../Fixtures/assets/vendor';
+
     private AssetMapperInterface&MockObject $assetMapper;
 
     public function testCreateMappedAsset()
     {
-        $factory = $this->createFactory();
+        $factory = $this->createFactory(self::DEFAULT_FIXTURES);
 
         $asset = $factory->createMappedAsset('file2.js', __DIR__.'/../Fixtures/dir1/file2.js');
         $this->assertSame('file2.js', $asset->logicalPath);
@@ -40,7 +42,7 @@ public function testCreateMappedAsset()
 
     public function testCreateMappedAssetRespectsPreDigestedPaths()
     {
-        $assetMapper = $this->createFactory();
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES);
         $asset = $assetMapper->createMappedAsset('already-abcdefVWXYZ0123456789.digested.css', __DIR__.'/../Fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css');
         $this->assertSame('already-abcdefVWXYZ0123456789.digested.css', $asset->logicalPath);
         $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->publicPath);
@@ -62,7 +64,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             }
         };
 
-        $assetMapper = $this->createFactory($file1Compiler);
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES, $file1Compiler);
         $expected = 'totally changed';
 
         $asset = $assetMapper->createMappedAsset('file1.css', __DIR__.'/../Fixtures/dir1/file1.css');
@@ -75,15 +77,15 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
 
     public function testCreateMappedAssetWithContentThatDoesNotChange()
     {
-        $assetMapper = $this->createFactory();
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES);
         $asset = $assetMapper->createMappedAsset('file1.css', __DIR__.'/../Fixtures/dir1/file1.css');
         // null content because the final content matches the file source
         $this->assertNull($asset->content);
     }
 
     public function testCreateMappedAssetWithContentErrorsOnCircularReferences()
     {
-        $factory = $this->createFactory();
+        $factory = $this->createFactory(self::DEFAULT_FIXTURES);
 
         $this->expectException(CircularAssetsException::class);
         $this->expectExceptionMessage('Circular reference detected while creating asset for "circular1.css": "circular1.css -> circular2.css -> circular1.css".');
@@ -108,36 +110,47 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             }
         };
 
-        $factory = $this->createFactory();
+        $factory = $this->createFactory(self::DEFAULT_FIXTURES);
         $asset = $factory->createMappedAsset('subdir/file6.js', __DIR__.'/../Fixtures/dir2/subdir/file6.js');
         $this->assertSame('7f983f4053a57f07551fed6099c0da4e', $asset->digest);
         $this->assertFalse($asset->isPredigested);
 
         // trigger the compiler, which will change file5.js
         // since file6.js imports file5.js, the digest for file6 should change,
         // because, internally, the file path in file6.js to file5.js will need to change
-        $factory = $this->createFactory($file6Compiler);
+        $factory = $this->createFactory(self::DEFAULT_FIXTURES, $file6Compiler);
         $asset = $factory->createMappedAsset('subdir/file6.js', __DIR__.'/../Fixtures/dir2/subdir/file6.js');
         $this->assertSame('7e4f24ebddd4ab2a3bcf0d89270b9f30', $asset->digest);
     }
 
     public function testCreateMappedAssetWithPredigested()
     {
-        $assetMapper = $this->createFactory();
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES);
         $asset = $assetMapper->createMappedAsset('already-abcdefVWXYZ0123456789.digested.css', __DIR__.'/../Fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css');
         $this->assertSame('abcdefVWXYZ0123456789.digested', $asset->digest);
         $this->assertTrue($asset->isPredigested);
     }
 
     public function testCreateMappedAssetInVendor()
     {
-        $assetMapper = $this->createFactory();
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES);
         $asset = $assetMapper->createMappedAsset('lodash.js', __DIR__.'/../Fixtures/assets/vendor/lodash/lodash.index.js');
         $this->assertSame('lodash.js', $asset->logicalPath);
         $this->assertTrue($asset->isVendor);
     }
 
-    private function createFactory(?AssetCompilerInterface $extraCompiler = null): MappedAssetFactory
+    public function testCreateMappedAssetInMissingVendor()
+    {
+        $assetMapper = $this->createFactory(self::DEFAULT_FIXTURES.'/this-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(
+        string $vendorDir,
+        ?AssetCompilerInterface $extraCompiler = null,
+    ): MappedAssetFactory
     {
         $compilers = [
             new JavaScriptImportPathCompiler($this->createMock(ImportMapConfigReader::class)),
@@ -162,7 +175,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`	`}`