Skip to content

Commit 38bca53

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Also support absolute Windows filenames
2 parents 94df2f6 + c5bafc3 commit 38bca53

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/dev/bless_tests.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ function getFiles(array $dirsOrFiles): \Iterator {
6262
}
6363

6464
function normalizeOutput(string $out): string {
65-
$out = preg_replace('/in \/.+ on line \d+$/m', 'in %s on line %d', $out);
66-
$out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out);
67-
$out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out);
65+
$out = preg_replace('/in (\/|[A-Z]:\\\\).+ on line \d+$/m', 'in %s on line %d', $out);
66+
$out = preg_replace('/in (\/|[A-Z]:\\\\).+:\d+$/m', 'in %s:%d', $out);
67+
$out = preg_replace('/^#(\d+) (\/|[A-Z]:\\\\).+\(\d+\):/m', '#$1 %s(%d):', $out);
6868
$out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out);
6969
$out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out);
7070
$out = preg_replace(

0 commit comments

Comments
 (0)