Merge branch '6.4' into 7.0

fabpot · fabpot · commit 3c39c0485fe9 · 2024-03-04T13:47:58.000+01:00
* 6.4:
  [AssetMapper] Throw exception in Javascript compiler when PCRE error
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -115,7 +115,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             $relativeImportPath = $this->makeRelativeForJavaScript($relativeImportPath);
 
             return str_replace($importedModule, $relativeImportPath, $fullImportString);
-        }, $content, -1, $count, \PREG_OFFSET_CAPTURE);
+        }, $content, -1, $count, \PREG_OFFSET_CAPTURE) ?? throw new RuntimeException(sprintf('Failed to compile JavaScript import paths in "%s". Error: "%s".', $asset->sourcePath, preg_last_error_msg()));
     }
 
     public function supports(MappedAsset $asset): bool
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -641,4 +641,23 @@ public function testErrorMessageAvoidsCircularException()
         // should not be caught.
         $this->assertSame($content, $compiled);
     }
+
+    public function testCompilerThrowsExceptionOnPcreError()
+    {
+        $compiler = new JavaScriptImportPathCompiler($this->createMock(ImportMapConfigReader::class));
+        $content = str_repeat('foo "import *  ', 50);
+        $javascriptAsset = new MappedAsset('app.js', '/project/assets/app.js', publicPathWithoutDigest: '/assets/app.js');
+        $assetMapper = $this->createMock(AssetMapperInterface::class);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Failed to compile JavaScript import paths in "/project/assets/app.js". Error: "Backtrack limit exhausted".');
+
+        $limit = \ini_get('pcre.backtrack_limit');
+        ini_set('pcre.backtrack_limit', 10);
+        try {
+            $compiler->compile($content, $javascriptAsset, $assetMapper);
+        } finally {
+            ini_set('pcre.backtrack_limit', $limit);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac`
`115`	`115`	`$relativeImportPath = $this->makeRelativeForJavaScript($relativeImportPath);`
`116`	`116`
`117`	`117`	`return str_replace($importedModule, $relativeImportPath, $fullImportString);`
`118`		`- }, $content, -1, $count, \PREG_OFFSET_CAPTURE);`
	`118`	`+ }, $content, -1, $count, \PREG_OFFSET_CAPTURE) ?? throw new RuntimeException(sprintf('Failed to compile JavaScript import paths in "%s". Error: "%s".', $asset->sourcePath, preg_last_error_msg()));`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public function supports(MappedAsset $asset): bool`