[AssetMapper] Fix JavaScriptImportPathCompiler regression in regex

PhilETaylor · nicolas-grekas · commit ae16b2d49d91 · 2024-02-29T15:33:03.000+01:00
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -28,16 +28,15 @@
 final class JavaScriptImportPathCompiler implements AssetCompilerInterface
 {
     /**
-     * @see https://regex101.com/r/1iBAIb/1
+     * @see https://regex101.com/r/1iBAIb/2
      */
     private const IMPORT_PATTERN = '/
-        ^
-            (?:\/\/.*)                     # Lines that start with comments
+            ^(?:\/\/.*)                     # Lines that start with comments
         |
             (?:
-                \'(?:[^\'\\\\\n]|\\\\.)*\'   # Strings enclosed in single quotes
+                \'(?:[^\'\\\\\n]|\\\\.)*+\'   # Strings enclosed in single quotes
             |
-                "(?:[^"\\\\\n]|\\\\.)*"      # Strings enclosed in double quotes
+                "(?:[^"\\\\\n]|\\\\.)*+"      # Strings enclosed in double quotes
             )
         |
             (?:                            # Import statements (script captured)
@@ -49,7 +48,7 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface
             |
                 \bimport\(
             )
-            \s*[\'"`](\.\/[^\'"`\n]+|(\.\.\/)*[^\'"`\n]+)[\'"`]\s*[;\)]
+            \s*[\'"`](\.\/[^\'"`\n]++|(\.\.\/)*+[^\'"`\n]++)[\'"`]\s*[;\)]
         ?
     /mx';
 

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,15 @@`
`28`	`28`	`final class JavaScriptImportPathCompiler implements AssetCompilerInterface`
`29`	`29`	`{`
`30`	`30`	`/**`
`31`		`- * @see https://regex101.com/r/1iBAIb/1`
	`31`	`+ * @see https://regex101.com/r/1iBAIb/2`
`32`	`32`	`*/`
`33`	`33`	`private const IMPORT_PATTERN = '/`
`34`		`- ^`
`35`		`- (?:\/\/.*) # Lines that start with comments`
	`34`	`+ ^(?:\/\/.*) # Lines that start with comments`
`36`	`35`	`\|`
`37`	`36`	`(?:`
`38`		`- \'(?:[^\'\\\\\n]\|\\\\.)*\' # Strings enclosed in single quotes`
	`37`	`+ \'(?:[^\'\\\\\n]\|\\\\.)*+\' # Strings enclosed in single quotes`
`39`	`38`	`\|`
`40`		`- "(?:[^"\\\\\n]\|\\\\.)*" # Strings enclosed in double quotes`
	`39`	`+ "(?:[^"\\\\\n]\|\\\\.)*+" # Strings enclosed in double quotes`
`41`	`40`	`)`
`42`	`41`	`\|`
`43`	`42`	`(?: # Import statements (script captured)`
`@@ -49,7 +48,7 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface`
`49`	`48`	`\|`
`50`	`49`	`\bimport\(`
`51`	`50`	`)`
`52`		- \s[\'"`](\.\/[^\'"`\n]+\|(\.\.\/)[^\'"`\n]+)[\'"`]\s*[;\)]
	`51`	+ \s[\'"`](\.\/[^\'"`\n]++\|(\.\.\/)+[^\'"`\n]++)[\'"`]\s*[;\)]
`53`	`52`	`?`
`54`	`53`	`/mx';`
`55`	`54`