Skip to content

Commit c5e47df

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 5aee8cc + 92fe9f5 commit c5e47df

File tree

3 files changed

+54
-0
lines changed

3 files changed

+54
-0
lines changed
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
From: Peter Kokot <[email protected]>
2+
Subject: Fix ext/standard/tests/streams/gh15937.phpt
3+
4+
---
5+
ext/standard/tests/streams/gh15937.phpt | 3 ++-
6+
1 file changed, 2 insertions(+), 1 deletion(-)
7+
8+
diff --git a/ext/standard/tests/streams/gh15937.phpt b/ext/standard/tests/streams/gh15937.phpt
9+
index db0564342b..553a92a842 100644
10+
--- a/ext/standard/tests/streams/gh15937.phpt
11+
+++ b/ext/standard/tests/streams/gh15937.phpt
12+
@@ -13,4 +13,5 @@
13+
var_dump(fopen("http://www.example.com", "r", false, $ctx));
14+
?>
15+
--EXPECTF--
16+
-resource(%d) of type (stream)
17+
+Warning: fopen(http://www.example.com): Failed to open stream: timeout must be lower than %d in %s on line %d
18+
+bool(false)
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
From: Peter Kokot <[email protected]>
2+
Subject: Fix ext/standard/tests/streams/gh15937.phpt
3+
4+
---
5+
ext/standard/tests/streams/gh15937.phpt | 3 ++-
6+
1 file changed, 2 insertions(+), 1 deletion(-)
7+
8+
diff --git a/ext/standard/tests/streams/gh15937.phpt b/ext/standard/tests/streams/gh15937.phpt
9+
index db0564342b..553a92a842 100644
10+
--- a/ext/standard/tests/streams/gh15937.phpt
11+
+++ b/ext/standard/tests/streams/gh15937.phpt
12+
@@ -13,4 +13,5 @@
13+
var_dump(fopen("http://www.example.com", "r", false, $ctx));
14+
?>
15+
--EXPECTF--
16+
-resource(%d) of type (stream)
17+
+Warning: fopen(http://www.example.com): Failed to open stream: timeout must be lower than %d in %s on line %d
18+
+bool(false)
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
From: Peter Kokot <[email protected]>
2+
Subject: Fix ext/standard/tests/streams/gh15937.phpt
3+
4+
---
5+
ext/standard/tests/streams/gh15937.phpt | 3 ++-
6+
1 file changed, 2 insertions(+), 1 deletion(-)
7+
8+
diff --git a/ext/standard/tests/streams/gh15937.phpt b/ext/standard/tests/streams/gh15937.phpt
9+
index db0564342b..553a92a842 100644
10+
--- a/ext/standard/tests/streams/gh15937.phpt
11+
+++ b/ext/standard/tests/streams/gh15937.phpt
12+
@@ -13,4 +13,5 @@
13+
var_dump(fopen("http://www.example.com", "r", false, $ctx));
14+
?>
15+
--EXPECTF--
16+
-resource(%d) of type (stream)
17+
+Warning: fopen(http://www.example.com): Failed to open stream: timeout must be lower than %d in %s on line %d
18+
+bool(false)

0 commit comments

Comments
 (0)