Skip to content

Commit f775360

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Fix expected output for bug52820.phpt
2 parents aa9964e + b97dd33 commit f775360

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ext/standard/tests/file/bug52820.phpt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,18 @@ echo "\nDone.\n";
4545
--EXPECTREGEX--
4646
temp stream \(close after\):
4747
About to rewind!
48-
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/
49-
\* [Cc]losing connection( #?-?\d+)?
48+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)?
5049

5150
memory stream \(close after\):
5251
About to rewind!
53-
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/
54-
\* [Cc]losing connection( #?-?\d+)?
52+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)?
5553

5654
temp stream \(leak\):
5755
About to rewind!
58-
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/
59-
\* [Cc]losing connection( #?-?\d+)?
56+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)?
6057

6158
memory stream \(leak\):
6259
About to rewind!
63-
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/
64-
\* [Cc]losing connection( #?-?\d+)?
60+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)?
6561

6662
Done\.

0 commit comments

Comments
 (0)