[AssetMapper] Fixing merge from multiple PR's

weaverryan · weaverryan · commit 99d5cbb25b9c · 2023-10-28T22:12:07.000-04:00
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -172,7 +172,12 @@ private function findAssetForRelativeImport(string $importedModule, MappedAsset
             return null;
         }
 
-        $dependentAsset = $assetMapper->getAsset($resolvedSourcePath);
+        try {
+            $dependentAsset = $assetMapper->getAssetFromSourcePath($resolvedSourcePath);
+        } catch (CircularAssetsException $exception) {
+            $dependentAsset = $exception->getIncompleteMappedAsset();
+        }
+
         if ($dependentAsset) {
             return $dependentAsset;
         }
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -173,7 +173,6 @@ public static function provideCompileTests(): iterable
         ];
 
         yield 'importing_non_existent_file_without_strict_mode_is_ignored_and_no_import_added' => [
-            'sourceLogicalName' => 'app.js',
             'input' => "import './non-existent.js';",
             'expectedJavaScriptImports' => [],
         ];
@@ -277,7 +276,6 @@ public static function provideCompileTests(): iterable
         ];
 
         yield 'absolute_import_ignored_and_no_dependency_added' => [
-            'sourceLogicalName' => 'app.js',
             'input' => 'import "https://example.com/module.js";',
             'expectedJavaScriptImports' => [],
         ];
@@ -415,14 +413,14 @@ public static function providePathsCanUpdateTests(): iterable
 
     public function testCompileHandlesCircularRelativeAssets()
     {
-        $appAsset = new MappedAsset('app.js', 'anythingapp', '/assets/app.js');
-        $otherAsset = new MappedAsset('other.js', 'anythingother', '/assets/other.js');
+        $appAsset = new MappedAsset('app.js', '/project/assets/app.js', '/assets/app.js');
+        $otherAsset = new MappedAsset('other.js', '/project/assets/other.js', '/assets/other.js');
 
         $importMapConfigReader = $this->createMock(ImportMapConfigReader::class);
         $assetMapper = $this->createMock(AssetMapperInterface::class);
         $assetMapper->expects($this->once())
-            ->method('getAsset')
-            ->with('other.js')
+            ->method('getAssetFromSourcePath')
+            ->with('/project/assets/other.js')
             ->willThrowException(new CircularAssetsException($otherAsset));
 
         $compiler = new JavaScriptImportPathCompiler($importMapConfigReader);

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,12 @@ private function findAssetForRelativeImport(string $importedModule, MappedAsset`
`172`	`172`	`return null;`
`173`	`173`	`}`
`174`	`174`
`175`		`- $dependentAsset = $assetMapper->getAsset($resolvedSourcePath);`
	`175`	`+ try {`
	`176`	`+ $dependentAsset = $assetMapper->getAssetFromSourcePath($resolvedSourcePath);`
	`177`	`+ } catch (CircularAssetsException $exception) {`
	`178`	`+ $dependentAsset = $exception->getIncompleteMappedAsset();`
	`179`	`+ }`
	`180`	`+`
`176`	`181`	`if ($dependentAsset) {`
`177`	`182`	`return $dependentAsset;`
`178`	`183`	`}`