mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-7.4'
* PHP-7.4: Also support absolute Windows filenames
This commit is contained in:
@@ -62,9 +62,9 @@ function getFiles(array $dirsOrFiles): \Iterator {
|
||||
}
|
||||
|
||||
function normalizeOutput(string $out): string {
|
||||
$out = preg_replace('/in \/.+ on line \d+$/m', 'in %s on line %d', $out);
|
||||
$out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out);
|
||||
$out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out);
|
||||
$out = preg_replace('/in (\/|[A-Z]:\\\\).+ on line \d+$/m', 'in %s on line %d', $out);
|
||||
$out = preg_replace('/in (\/|[A-Z]:\\\\).+:\d+$/m', 'in %s:%d', $out);
|
||||
$out = preg_replace('/^#(\d+) (\/|[A-Z]:\\\\).+\(\d+\):/m', '#$1 %s(%d):', $out);
|
||||
$out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out);
|
||||
$out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out);
|
||||
$out = preg_replace(
|
||||
|
||||
Reference in New Issue
Block a user