Skip to content

Commit ba6bf07

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Safeguard dynamic access to Doctrine metadata properties Enhance error handling in StaticPrefixCollection for compatibility with libpcre2-10.43
2 parents 858b267 + 7fe3006 commit ba6bf07

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Matcher/Dumper/StaticPrefixCollection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
198198

199199
public static function handleError(int $type, string $msg): bool
200200
{
201-
return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');
201+
return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')
202+
|| str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');
202203
}
203204
}

0 commit comments

Comments
 (0)