summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-09-23 10:54:40 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-09-23 10:54:59 +0200
commita89ac98f151d837c6128474aabcbdf2b6cb3bb76 (patch)
treefca6ffd71ea1ad7be4098486426d5716aa184ead /ext
parentd30ec2cd85f2a6654dbad0910edc7435e25b4429 (diff)
parent2576c57a5133df757c51f341e794bf53add7663f (diff)
downloadphp-git-a89ac98f151d837c6128474aabcbdf2b6cb3bb76.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #76735: Incorrect message in fopen on invalid mode
Diffstat (limited to 'ext')
-rw-r--r--ext/bz2/tests/002.phpt4
-rw-r--r--ext/standard/tests/file/bug76735.phpt8
2 files changed, 10 insertions, 2 deletions
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index a69514a711..1b0fd2a660 100644
--- a/ext/bz2/tests/002.phpt
+++ b/ext/bz2/tests/002.phpt
@@ -83,12 +83,12 @@ bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): failed to open stream: `br' is not a valid mode for fopen in %s on line %d
Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
bool(false)
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): failed to open stream: `br' is not a valid mode for fopen in %s on line %d
Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
bool(false)
diff --git a/ext/standard/tests/file/bug76735.phpt b/ext/standard/tests/file/bug76735.phpt
new file mode 100644
index 0000000000..451988cc65
--- /dev/null
+++ b/ext/standard/tests/file/bug76735.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #76735 (Incorrect message in fopen on invalid mode)
+--FILE--
+<?php
+fopen(__FILE__, 'Q');
+?>
+--EXPECTF--
+Warning: fopen(%s): failed to open stream: `Q' is not a valid mode for fopen in %s on line %d