bug #54080 [Routing] Enhance error handling in StaticPrefixCollection for compatibility with libpcre2-10.43 (Lustmored)

derrabus · derrabus · commit dc1da9c85be1 · 2024-02-27T13:31:11.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Routing] Enhance error handling in StaticPrefixCollection for compatibility with libpcre2-10.43 The error handling function in the StaticPrefixCollection class has been extended. A new check for 'Compilation failed: length of lookbehind assertion is not limited' message error was added to improve the error capture process. | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54067 | License | MIT Recent changes in libpcre2 have changed the error message we are trying to catch in StaticPrefixCollection. The change comes from this commit (please take a look at changes in `src/pcre2_error.c`): PCRE2Project/pcre2@1e78b77 This PR checks for both possible error messages for backwards-compatible way of handling errors. I did not add any tests as current tests are throwing PHP warnings when run with newer libpcre2, which are gone after the proposed change and I'm unsure how to proceed with that fact. Commits ------- 7183330 Enhance error handling in StaticPrefixCollection for compatibility with libpcre2-10.43
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -200,6 +200,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
 
     public static function handleError(int $type, string $msg)
     {
-        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');
+        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')
+            || str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array`
`200`	`200`
`201`	`201`	`public static function handleError(int $type, string $msg)`
`202`	`202`	`{`
`203`		`- return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');`
	`203`	`+ return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')`
	`204`	`+ \|\| str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');`
`204`	`205`	`}`
`205`	`206`	`}`