Commit 34c686a5b4e for php.net

commit 34c686a5b4ef10fd2451deb52422b410d4c7d619
Author: Gina Peter Banyard <girgias@php.net>
Date:   Sun Jul 19 16:15:01 2026 +0100

    stream: remove path parameter in stream error functions (#22792)

    Instead rely on the mechanism gated by the error_include_args INI to display them.

    This actually aligns the behaviour of what was accepted in https://wiki.php.net/rfc/display_error_function_args.

diff --git a/Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt b/Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt
index 49796a9b910..18f155611f4 100644
--- a/Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt
+++ b/Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt
@@ -30,7 +30,7 @@ public function load($class) {
 }
 ?>
 --EXPECTF--
-ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include
+ERR#2: include(): Failed to open stream: "CLWrapper::stream_open" call failed @ include
 ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include

 Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s
diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt
index 9d843512167..a4cd6de8f50 100644
--- a/Zend/tests/bug30998.phpt
+++ b/Zend/tests/bug30998.phpt
@@ -14,6 +14,6 @@ function my_error($errno, $errstr, $errfile, $errline)
 $f = fopen("/tmp/blah", "r");
 ?>
 --EXPECTF--
-fopen(/tmp/blah): Failed to open stream: %s (2) in %s:%d
+fopen(): Failed to open stream: %s (2) in %s:%d

-Warning: fopen(/tmp/blah): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/bug60909_1.phpt
index 4404adfd54a..bde5a381ba4 100644
--- a/Zend/tests/bug60909_1.phpt
+++ b/Zend/tests/bug60909_1.phpt
@@ -11,10 +11,10 @@
 require 'notfound.php';
 ?>
 --EXPECTF--
-error(require(notfound.php): Failed to open stream: %s)
+error(require(): Failed to open stream: %s)
 Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5
 Stack trace:
-#0 %s(%d): {closure:%s:%d}(2, 'require(notfoun...', '%s', 8)
+#0 %s(%d): {closure:%s:%d}(2, 'require(): Fail...', '%s', 8)
 #1 %sbug60909_1.php(8): require()
 #2 {main}
   thrown in %sbug60909_1.php on line 5
diff --git a/Zend/tests/gh11735_2.phpt b/Zend/tests/gh11735_2.phpt
index b568b6f6df3..521862b4823 100644
--- a/Zend/tests/gh11735_2.phpt
+++ b/Zend/tests/gh11735_2.phpt
@@ -13,5 +13,5 @@ public function stream_open($path, $mode, $options, &$opened_path) {
 var_dump(fopen('foo://bar', 'r'));
 ?>
 --EXPECTF--
-Warning: fopen(foo://bar): Failed to open stream: "FooWrapper::stream_open" call failed in %s on line %d
+Warning: fopen(): Failed to open stream: "FooWrapper::stream_open" call failed in %s on line %d
 bool(false)
diff --git a/Zend/tests/include_stat_is_quiet.phpt b/Zend/tests/include_stat_is_quiet.phpt
index 75ba8f3d627..39eb3053fbe 100644
--- a/Zend/tests/include_stat_is_quiet.phpt
+++ b/Zend/tests/include_stat_is_quiet.phpt
@@ -26,7 +26,7 @@ public function url_stat($path, $flags) {

 ?>
 --EXPECTF--
-Warning: require_once(doesnt_exist.php): Failed to open stream: No such file or directory in %s on line %d
+Warning: require_once(): Failed to open stream: No such file or directory in %s on line %d

 Fatal error: Uncaught Error: Failed opening required 'doesnt_exist.php' (include_path='test://foo:test://bar') in %s:%d
 Stack trace:
diff --git a/Zend/tests/oss_fuzz_64209.phpt b/Zend/tests/oss_fuzz_64209.phpt
index 599ae258e5b..56b9dcfc7a2 100644
--- a/Zend/tests/oss_fuzz_64209.phpt
+++ b/Zend/tests/oss_fuzz_64209.phpt
@@ -5,7 +5,7 @@
 require '://@';
 ?>
 --EXPECTF--
-Warning: require(://@): Failed to open stream: No such file or directory in %s on line %d
+Warning: require(): Failed to open stream: No such file or directory in %s on line %d

 Fatal error: Uncaught Error: Failed opening required '://@' (include_path='%s') in %s:%d
 Stack trace:
diff --git a/Zend/tests/require_once_warning_to_exception.phpt b/Zend/tests/require_once_warning_to_exception.phpt
index d115ac68ccd..bc706622438 100644
--- a/Zend/tests/require_once_warning_to_exception.phpt
+++ b/Zend/tests/require_once_warning_to_exception.phpt
@@ -16,4 +16,4 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {

 ?>
 --EXPECT--
-require_once(does-not-exist.php): Failed to open stream: No such file or directory
+require_once(): Failed to open stream: No such file or directory
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
index 767a50a27d8..6323a224c3a 100644
--- a/ext/bz2/tests/001.phpt
+++ b/ext/bz2/tests/001.phpt
@@ -48,6 +48,6 @@
 bzopen(): Argument #2 ($mode) must be either "r" or "w"
 bzopen(): Argument #2 ($mode) must be either "r" or "w"

-Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d
+Warning: bzopen(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 resource(%d) of type (stream)
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index f87048f9231..7210f90a4d9 100644
--- a/ext/bz2/tests/002.phpt
+++ b/ext/bz2/tests/002.phpt
@@ -90,10 +90,10 @@
 resource(%d) of type (stream)
 resource(%d) of type (stream)

-Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
+Warning: fopen(): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
 bzopen(): Argument #1 ($file) must be of type string or file-resource, false given

-Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
+Warning: fopen(): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
 bzopen(): Argument #1 ($file) must be of type string or file-resource, false given

 Warning: bzopen(): cannot write to a stream opened in read only mode in %s on line %d
diff --git a/ext/dba/tests/dba_cdb_creation_matrix.phpt b/ext/dba/tests/dba_cdb_creation_matrix.phpt
index 36880911c89..c7dda5b61b6 100644
--- a/ext/dba/tests/dba_cdb_creation_matrix.phpt
+++ b/ext/dba/tests/dba_cdb_creation_matrix.phpt
@@ -25,35 +25,35 @@
 === OPENING NON-EXISTING FILE ===
 Mode parameter is "rl":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "rd":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r-":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wl":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wd":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w-":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w":

-Warning: dba_open(cdb_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "cl":

diff --git a/ext/dba/tests/dba_flatfile_creation_matrix.phpt b/ext/dba/tests/dba_flatfile_creation_matrix.phpt
index 6009c077894..d10523f9b1e 100644
--- a/ext/dba/tests/dba_flatfile_creation_matrix.phpt
+++ b/ext/dba/tests/dba_flatfile_creation_matrix.phpt
@@ -25,35 +25,35 @@
 === OPENING NON-EXISTING FILE ===
 Mode parameter is "rl":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "rd":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r-":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wl":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wd":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w-":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w":

-Warning: dba_open(flatfile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "cl":
 This is a test insert
diff --git a/ext/dba/tests/dba_inifile_creation_matrix.phpt b/ext/dba/tests/dba_inifile_creation_matrix.phpt
index aff1fdfb4f1..2e93e865e3e 100644
--- a/ext/dba/tests/dba_inifile_creation_matrix.phpt
+++ b/ext/dba/tests/dba_inifile_creation_matrix.phpt
@@ -25,35 +25,35 @@
 === OPENING NON-EXISTING FILE ===
 Mode parameter is "rl":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "rd":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r-":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wl":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wd":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w-":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w":

-Warning: dba_open(inifile_not_existing.db): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "cl":
 This is a test insert
diff --git a/ext/dba/tests/dba_tcadb_creation_matrix.phpt b/ext/dba/tests/dba_tcadb_creation_matrix.phpt
index e86efce75ca..92872977774 100644
--- a/ext/dba/tests/dba_tcadb_creation_matrix.phpt
+++ b/ext/dba/tests/dba_tcadb_creation_matrix.phpt
@@ -29,7 +29,7 @@
 Opening DB failed
 Mode parameter is "rd":

-Warning: dba_open(tcadb_not_existing.tch): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "r-":

@@ -37,7 +37,7 @@
 Opening DB failed
 Mode parameter is "r":

-Warning: dba_open(tcadb_not_existing.tch): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "wl":

@@ -45,7 +45,7 @@
 Opening DB failed
 Mode parameter is "wd":

-Warning: dba_open(tcadb_not_existing.tch): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "w-":

@@ -53,7 +53,7 @@
 Opening DB failed
 Mode parameter is "w":

-Warning: dba_open(tcadb_not_existing.tch): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_open(): Failed to open stream: No such file or directory in %s on line %d
 Opening DB failed
 Mode parameter is "cl":
 This is a test insert
diff --git a/ext/dba/tests/gh18247.phpt b/ext/dba/tests/gh18247.phpt
index bb757452321..c7bc0277dc2 100644
--- a/ext/dba/tests/gh18247.phpt
+++ b/ext/dba/tests/gh18247.phpt
@@ -8,5 +8,5 @@
 ?>
 --EXPECTF--

-Warning: dba_popen(/inexistent): Failed to open stream: No such file or directory in %s on line %d
+Warning: dba_popen(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_local_file_does_not_exist.phpt b/ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_local_file_does_not_exist.phpt
index ce96afd69eb..52e709e4a0c 100644
--- a/ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_local_file_does_not_exist.phpt
+++ b/ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_local_file_does_not_exist.phpt
@@ -10,7 +10,7 @@

 ?>
 --EXPECTF--
-Warning: Dom\HTMLDocument::createFromFile(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: Dom\HTMLDocument::createFromFile(): Failed to open stream: No such file or directory in %s on line %d

 Fatal error: Uncaught Exception: Cannot open file '%s' in %s:%d
 Stack trace:
diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt
index 2d78234c2f0..36fe66adb09 100644
--- a/ext/exif/tests/exif_imagetype_error.phpt
+++ b/ext/exif/tests/exif_imagetype_error.phpt
@@ -17,5 +17,5 @@

 -- Testing exif_imagetype() function with an unknown file  --

-Warning: exif_imagetype(%s/foo.jpg): Failed to open stream: No such file or directory in %s on line %d
+Warning: exif_imagetype(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/fileinfo/tests/bug68996.phpt b/ext/fileinfo/tests/bug68996.phpt
index 7dbbf4f7f07..4f4716336e8 100644
--- a/ext/fileinfo/tests/bug68996.phpt
+++ b/ext/fileinfo/tests/bug68996.phpt
@@ -10,8 +10,8 @@
 ?>
 --EXPECTF--
 <br />
-<b>Warning</b>:  finfo_open(%s�c): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
+<b>Warning</b>:  finfo_open(): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
 <br />
-<b>Warning</b>:  finfo_open(%s�c): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
+<b>Warning</b>:  finfo_open(): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
 <br />
 <b>Warning</b>:  finfo_open(): Failed to load magic database at &quot;%s�c&quot; in <b>%s</b> on line <b>%d</b><br />
diff --git a/ext/fileinfo/tests/finfo_file_001.phpt b/ext/fileinfo/tests/finfo_file_001.phpt
index 737b8db53ff..91b9b69717f 100644
--- a/ext/fileinfo/tests/finfo_file_001.phpt
+++ b/ext/fileinfo/tests/finfo_file_001.phpt
@@ -25,5 +25,5 @@
 finfo_file(): Argument #2 ($filename) must not be empty
 string(9) "directory"

-Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt
index 21b90042f0f..2ed7168e90d 100644
--- a/ext/fileinfo/tests/finfo_open_001.phpt
+++ b/ext/fileinfo/tests/finfo_open_001.phpt
@@ -44,23 +44,23 @@
 object(finfo)#%d (0) {
 }

-Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

-Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

 Warning: finfo_open(): Failed to load magic database at "%s123" in %s on line %d
 bool(false)

-Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

-Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

 Warning: finfo_open(): Failed to load magic database at "%s1" in %s on line %d
 bool(false)

-Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

-Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %s on line %d

 Warning: finfo_open(): Failed to load magic database at "%sinexistent" in %s on line %d
 bool(false)
@@ -68,6 +68,6 @@
 }
 object(finfo)#%d (%d) {
 }
-finfo::__construct(%s123): Failed to open stream: No such file or directory
-finfo::__construct(%s1): Failed to open stream: No such file or directory
-finfo::__construct(%sinexistent): Failed to open stream: No such file or directory
+finfo::__construct(): Failed to open stream: No such file or directory
+finfo::__construct(): Failed to open stream: No such file or directory
+finfo::__construct(): Failed to open stream: No such file or directory
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index c4aa082111d..7c6fc976637 100644
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -27,9 +27,9 @@
 --EXPECTF--
 *** Testing finfo_open() : error functionality ***

-Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d

-Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
+Warning: finfo_open(): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d

 Warning: finfo_open(): Failed to load magic database at "%sfoobarfile" in %sfinfo_open_error.php on line %d
 bool(false)
diff --git a/ext/fileinfo/tests/mime_content_type_001.phpt b/ext/fileinfo/tests/mime_content_type_001.phpt
index 98c1325959d..93b14576814 100644
--- a/ext/fileinfo/tests/mime_content_type_001.phpt
+++ b/ext/fileinfo/tests/mime_content_type_001.phpt
@@ -46,6 +46,6 @@
 mime_content_type(): Argument #1 ($filename) must be of type resource|string, stdClass given
 mime_content_type(): Argument #1 ($filename) must be of type resource|string, array given

-Warning: mime_content_type(foo/inexistent): Failed to open stream: No such file or directory in %s on line %d
+Warning: mime_content_type(): Failed to open stream: No such file or directory in %s on line %d
 mime_content_type(): Argument #1 ($filename) must not be empty
 mime_content_type(): Argument #1 ($filename) must not contain any null bytes
diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt
index 3093a59783d..4c0971cf194 100644
--- a/ext/gd/tests/001-mb.phpt
+++ b/ext/gd/tests/001-mb.phpt
@@ -19,7 +19,7 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): Failed to open stream: No such file or directory in %s on line %d
+Warning: imagecreatefrompng(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 Warning: imagecreatefrompng(): "%s001私はガラスを食べられます.test" is not a valid PNG file in %s on line %d
diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt
index 7c2fcf36523..a589a66ffa0 100644
--- a/ext/gd/tests/001.phpt
+++ b/ext/gd/tests/001.phpt
@@ -19,7 +19,7 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: imagecreatefrompng(%s001.test): Failed to open stream: No such file or directory in %s on line %d
+Warning: imagecreatefrompng(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 Warning: imagecreatefrompng(): "%s001.test" is not a valid PNG file in %s on line %d
diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt
index 76984876801..3a60df5b70d 100644
--- a/ext/gd/tests/imageloadfont_error2.phpt
+++ b/ext/gd/tests/imageloadfont_error2.phpt
@@ -9,5 +9,5 @@
 var_dump( imageloadfont('\src\invalidfile.font') );
 ?>
 --EXPECTF--
-Warning: imageloadfont(\src\invalidfile.font): Failed to open stream: No such file or directory in %s on line %d
+Warning: imageloadfont(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
index 44f3d092559..68ba55f4a37 100644
--- a/ext/hash/tests/hash_file_error.phpt
+++ b/ext/hash/tests/hash_file_error.phpt
@@ -38,5 +38,5 @@

 -- Testing hash_file() function with a non-existent file --

-Warning: hash_file(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: hash_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt
index f11f1095220..e8f00447164 100644
--- a/ext/libxml/tests/bug61367-write.phpt
+++ b/ext/libxml/tests/bug61367-write.phpt
@@ -44,5 +44,5 @@ public function stream_open (  $path ,  $mode ,  $options ,  &$opened_path ) {

 Warning: DOMDocument::save(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d

-Warning: DOMDocument::save(%s): Failed to open stream: %r(Operation not permitted|Insufficient privileges)%r in %s on line %d
+Warning: DOMDocument::save(): Failed to open stream: %r(Operation not permitted|Insufficient privileges)%r in %s on line %d
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
index 70e18584326..2a1a54d6b65 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
@@ -179,7 +179,7 @@ function sha_connect($offset, $host, $db, $port, $socket, $file) {
 Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
 [300 + 002] [1045] %s

-Warning: mysqli::real_connect(%sest_sha256_wrong_%d): Failed to open stream: No such file or directory in %s on line %d
+Warning: mysqli::real_connect(): Failed to open stream: No such file or directory in %s on line %d

 Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
 [400 + 002] [1045] %s
diff --git a/ext/openssl/tests/bug65538_002.phpt b/ext/openssl/tests/bug65538_002.phpt
index 44a322c6828..85369572337 100644
--- a/ext/openssl/tests/bug65538_002.phpt
+++ b/ext/openssl/tests/bug65538_002.phpt
@@ -23,4 +23,4 @@

 Warning: file_get_contents(): Failed to enable crypto in %s on line %d

-Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: operation failed in %s on line %d
diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt
index f0315b151be..63bdabb3183 100644
--- a/ext/phar/tests/013.phpt
+++ b/ext/phar/tests/013.phpt
@@ -20,4 +20,4 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d
diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt
index 7b2a6d0166e..7ce06ce5d91 100644
--- a/ext/phar/tests/014.phpt
+++ b/ext/phar/tests/014.phpt
@@ -20,4 +20,4 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d
diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt
index d14c1292a6e..17052735b04 100644
--- a/ext/phar/tests/016.phpt
+++ b/ext/phar/tests/016.phpt
@@ -28,12 +28,12 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d
 bool(false)

-Warning: file_get_contents(phar://%s/b): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d
 bool(false)
 string(1) "*"

-Warning: file_get_contents(phar://%s/d): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d
 bool(false)
diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt
index 72b7019def5..ba07a10bb75 100644
--- a/ext/phar/tests/016b.phpt
+++ b/ext/phar/tests/016b.phpt
@@ -21,4 +21,4 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d
diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index 74ffddad40b..14ebddc787e 100644
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -27,5 +27,5 @@
 string(%d) "%s017.phar.php"
 bool(true)

-Warning: opendir(phar://hio): Failed to open directory: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar)
+Warning: opendir(): Failed to open directory: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar)
 phar url "phar://hio" is unknown in %s017.php on line %d
diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index e5c2add435e..b285f16f808 100644
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -83,10 +83,10 @@ function dump($phar, $base)
 bool(false)
 opendir edge cases

-Warning: opendir(phar://): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar)
+Warning: opendir(): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar)
 phar url "phar://" is unknown in %s027.php on line %d
 bool(false)

-Warning: opendir(phar://foo.phar/hi): Failed to open directory: phar error: invalid url or non-existent phar "phar://foo.phar/hi"
+Warning: opendir(): Failed to open directory: phar error: invalid url or non-existent phar "phar://foo.phar/hi"
 phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d
 bool(false)
diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt
index a6afe0f15e7..dbcae78db73 100644
--- a/ext/phar/tests/bug69720.phpt
+++ b/ext/phar/tests/bug69720.phpt
@@ -24,7 +24,7 @@
 --EXPECTF--
 MY_METADATA_NULL

-Warning: file_get_contents(phar://%s): Failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d
 array(1) {
   ["whatever"]=>
   int(123)
diff --git a/ext/phar/tests/bug77432.phpt b/ext/phar/tests/bug77432.phpt
index 86a07fe99a4..1223575badf 100644
--- a/ext/phar/tests/bug77432.phpt
+++ b/ext/phar/tests/bug77432.phpt
@@ -39,6 +39,6 @@
 hello world
 --- After unlink ---

-Warning: include(%sbug77432.phar): Failed to open stream: phar error: could not reopen phar "%sbug77432.phar" in %s on line %d
+Warning: include(): Failed to open stream: phar error: could not reopen phar "%sbug77432.phar" in %s on line %d

 Warning: include(): Failed opening '%sbug77432.phar' for inclusion (include_path=%s) in %s on line %d
diff --git a/ext/phar/tests/bug81726.phpt b/ext/phar/tests/bug81726.phpt
index a86c52a6498..e27f9d7e2f3 100644
--- a/ext/phar/tests/bug81726.phpt
+++ b/ext/phar/tests/bug81726.phpt
@@ -8,5 +8,5 @@
 var_dump(fopen("phar://" . __DIR__ . "/bug81726.gz", "r"));
 ?>
 --EXPECTF--
-Warning: fopen(phar://%s): Failed to open stream: unable to decompress gzipped phar archive "%s" in %s on line %d
+Warning: fopen(): Failed to open stream: unable to decompress gzipped phar archive "%s" in %s on line %d
 bool(false)
diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt
index 6747da6dc79..ac12e7ef01c 100644
--- a/ext/phar/tests/cache_list/frontcontroller22.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller22.phpt
@@ -21,6 +21,6 @@
 string(4) "test"
 string(12) "oof/test.php"

-Warning: include(./hi.php): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
+Warning: include(): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d

 Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index fb106153ca8..9d9c8640dd5 100644
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
@@ -13,9 +13,9 @@
 include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php';
 ?>
 --EXPECTF--
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d

-Warning: include(phar://%screate_new_phar_b.phar.php/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d
+Warning: include(): Failed to open stream: %s in %screate_new_phar_b.php on line %d

 Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.php/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d

diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index fea390e477c..13a0fea2bb7 100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
@@ -65,17 +65,17 @@ function error_handler($errno, $errmsg)
 --EXPECTF--
 string(5) "query"
 string(5) "query"
-1:Error: file_put_contents(phar://%s//): Failed to open stream: phar error: file "" in phar "%s" must not be empty
-2:Error: file_put_contents(phar://%s/.): Failed to open stream: phar error: file "" in phar "%s" must not be empty
-3:Error: file_put_contents(phar://%s/../): Failed to open stream: phar error: file "" in phar "%s" must not be empty
-4:Error: file_put_contents(phar://%s/a/..): Failed to open stream: phar error: file "" in phar "%s" must not be empty
+1:Error: file_put_contents(): Failed to open stream: phar error: file "" in phar "%s" must not be empty
+2:Error: file_put_contents(): Failed to open stream: phar error: file "" in phar "%s" must not be empty
+3:Error: file_put_contents(): Failed to open stream: phar error: file "" in phar "%s" must not be empty
+4:Error: file_put_contents(): Failed to open stream: phar error: file "" in phar "%s" must not be empty
 5:
 6:
 7:
 8:
-9:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character
-10:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character
-11:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character
-12:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character
-13:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character
+9:Error: file_put_contents(): Failed to open stream: phar error: invalid path "%s" contains illegal character
+10:Error: file_put_contents(): Failed to open stream: phar error: invalid path "%s" contains illegal character
+11:Error: file_put_contents(): Failed to open stream: phar error: invalid path "%s" contains illegal character
+12:Error: file_put_contents(): Failed to open stream: phar error: invalid path "%s" contains illegal character
+13:Error: file_put_contents(): Failed to open stream: phar error: invalid path "%s" contains illegal character
 Exception: Phar::offsetSet(): Argument #1 ($localName) must not contain any null bytes
diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt
index 1cf95cb82d5..3264e731263 100644
--- a/ext/phar/tests/delete.phpt
+++ b/ext/phar/tests/delete.phpt
@@ -28,4 +28,4 @@
 --EXPECTF--
 a

-Warning: file_get_contents(phar://%sdelete.phar.php/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16
diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt
index 11978fdce7b..78149bf8761 100644
--- a/ext/phar/tests/delete_in_phar.phpt
+++ b/ext/phar/tests/delete_in_phar.phpt
@@ -41,7 +41,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar.phar.php/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d

diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt
index 12d1099bf63..215f20ddf9c 100644
--- a/ext/phar/tests/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/delete_in_phar_confirm.phpt
@@ -45,7 +45,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d

diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt
index 81a2f43e80a..1daa3a13e59 100644
--- a/ext/phar/tests/fgc_edgecases.phpt
+++ b/ext/phar/tests/fgc_edgecases.phpt
@@ -90,7 +90,7 @@
 echo file_get_contents("./hi", 0, $context, 0, 0);
 ?>

-Warning: file_get_contents(phar://%sfgc_edgecases.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d

 Warning: file_get_contents(): Failed to seek to position 50000 in the stream in phar://%sfgc_edgecases.phar.php/foo/hi on line %d
 <?php
diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt
index 6d907317453..9a2d5e3b013 100644
--- a/ext/phar/tests/fopen.phpt
+++ b/ext/phar/tests/fopen.phpt
@@ -35,4 +35,4 @@
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 hihi
-Warning: fopen(notfound.txt): Failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d
diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt
index 12b4ecde758..5c8e6c87dfb 100644
--- a/ext/phar/tests/fopen_edgecases.phpt
+++ b/ext/phar/tests/fopen_edgecases.phpt
@@ -71,16 +71,16 @@
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?>
 <?php unlink(__DIR__ . '/fopen_edgetest.phar'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sfopen_edgecases.phar.php/b/c.php): Failed to open stream: phar error: open mode append not supported in %sfopen_edgecases.php on line %d
+Warning: fopen(): Failed to open stream: phar error: open mode append not supported in %sfopen_edgecases.php on line %d

-Warning: fopen(phar://%sfopen_edgecases.phar.php.phar.gz): Failed to open stream: phar error: invalid url or non-existent phar "phar://%sfopen_edgecases.phar.php.phar.gz" in %sfopen_edgecases.php on line %d
+Warning: fopen(): Failed to open stream: phar error: invalid url or non-existent phar "phar://%sfopen_edgecases.phar.php.phar.gz" in %sfopen_edgecases.php on line %d
 bool(false)

-Warning: fopen(phar://%sfopen_edgecases.2.phar.php/hi): Failed to open stream: internal corruption of phar "%sfopen_edgecases.2.phar.php" (truncated manifest at stub end) in %sfopen_edgecases.php on line %d
+Warning: fopen(): Failed to open stream: internal corruption of phar "%sfopen_edgecases.2.phar.php" (truncated manifest at stub end) in %sfopen_edgecases.php on line %d

-Warning: fopen(phar://): Failed to open stream: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %sfopen_edgecases.php on line %d
+Warning: fopen(): Failed to open stream: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %sfopen_edgecases.php on line %d

-Warning: fopen(phar://foo.phar): Failed to open stream: %s in %sfopen_edgecases.php on line %d
+Warning: fopen(): Failed to open stream: %s in %sfopen_edgecases.php on line %d
 int(0)
 int(1)
 int(0)
@@ -118,5 +118,5 @@

 Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/hi" to "phar://%sfopen_edgecases.phar.php/there": invalid or non-writable url "phar://%sfopen_edgecases.phar.php/hi" in %sfopen_edgecases.php on line %d

-Warning: fopen(./notfound.php): Failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d

diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt
index 6fae07c0fda..697ce81cf33 100644
--- a/ext/phar/tests/fopen_edgecases2.phpt
+++ b/ext/phar/tests/fopen_edgecases2.phpt
@@ -41,4 +41,4 @@
 blah
 test

-Warning: fopen(phar://%sfopen_edgecases2.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d
+Warning: fopen(): Failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 5fb9490e2dc..431e8991ce6 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -16,6 +16,6 @@
 string(4) "test"
 string(12) "oof/test.php"

-Warning: include(./hi.php): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
+Warning: include(): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d

 Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt
index 0f2dd585904..a7fe9a46887 100644
--- a/ext/phar/tests/include_path.phpt
+++ b/ext/phar/tests/include_path.phpt
@@ -29,6 +29,6 @@
 file1.php
 test/file1.php

-Warning: include(file2.php): Failed to open stream: No such file or directory in %sinclude_path.php on line %d
+Warning: include(): Failed to open stream: No such file or directory in %sinclude_path.php on line %d

 Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d
diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt
index 2f6be58eb4d..e9f9bbec468 100644
--- a/ext/phar/tests/mounteddir.phpt
+++ b/ext/phar/tests/mounteddir.phpt
@@ -95,7 +95,7 @@
 var_dump(__FILE__);
 ?>

-Warning: file_get_contents(phar://%stempmanifest1.phar.php/testit/directory): Failed to open stream: phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d

 oops
 string(%d) "phar://%sextfile.php"
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index c11fb9a67f1..e590e68919c 100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -23,6 +23,6 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
 bool(false)
 This is b/c
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index e8867d83b46..56fdccee067 100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -23,6 +23,6 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
 bool(false)
 This is b/c
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 498e3dd4be3..76248ceeb6f 100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -25,11 +25,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d

diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index 8bb0e2ba680..9a940823dd3 100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -25,11 +25,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d

diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt
index 77a17c80f22..a11c50e0001 100644
--- a/ext/phar/tests/opendir.phpt
+++ b/ext/phar/tests/opendir.phpt
@@ -35,8 +35,8 @@
 --EXPECTF--
 file1.txtfile2.txtfile3.txt

-Warning: opendir(phar://): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar)
+Warning: opendir(): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar)
 phar url "phar://" is unknown in %sopendir.php on line %d

-Warning: opendir(phar://hi.phar): Failed to open directory: phar error: invalid url or non-existent phar "phar://hi.phar"
+Warning: opendir(): Failed to open directory: phar error: invalid url or non-existent phar "phar://hi.phar"
 phar url "phar://hi.phar" is unknown in %sopendir.php on line %d
diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt
index fbca644d18d..4d35f0655c9 100644
--- a/ext/phar/tests/opendir_edgecases.phpt
+++ b/ext/phar/tests/opendir_edgecases.phpt
@@ -60,4 +60,4 @@
 ..
 foo

-Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): Failed to open directory: %s in phar://%sopendir_edgecases.phar.php/foo on line %d
+Warning: opendir(): Failed to open directory: %s in phar://%sopendir_edgecases.phar.php/foo on line %d
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
index e2d51b2c466..6a41caf0388 100644
--- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -21,4 +21,4 @@
 ?>
 --EXPECT--
 string(24) "UnexpectedValueException"
-RecursiveDirectoryIterator::__construct(1): Failed to open directory: No such file or directory
+RecursiveDirectoryIterator::__construct(): Failed to open directory: No such file or directory
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt
index c828587548a..b5f14671dbf 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -21,4 +21,4 @@
 ?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
-RecursiveDirectoryIterator::__construct(1): Failed to open directory: No such file or directory
+RecursiveDirectoryIterator::__construct(): Failed to open directory: No such file or directory
diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt
index 8100e6cf300..552fab406e7 100644
--- a/ext/phar/tests/phar_gobyebye-win32.phpt
+++ b/ext/phar/tests/phar_gobyebye-win32.phpt
@@ -31,11 +31,11 @@
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php');
 ?>
 --EXPECTF--
-Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d

-Warning: fopen(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d

-Warning: file_get_contents(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d

 Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
 bool(false)
@@ -44,4 +44,4 @@
 bool(false)
 bool(false)

-Warning: opendir(foo/hi): Failed to open directory: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+Warning: opendir(): Failed to open directory: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt
index 4db6e0d91cd..a42757936d7 100644
--- a/ext/phar/tests/phar_gobyebye.phpt
+++ b/ext/phar/tests/phar_gobyebye.phpt
@@ -32,11 +32,11 @@
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php');
 ?>
 --EXPECTF--
-Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d

-Warning: fopen(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d

-Warning: file_get_contents(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d

 Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
 bool(false)
@@ -45,4 +45,4 @@
 bool(false)
 bool(false)

-Warning: opendir(foo/hi): Failed to open directory: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
+Warning: opendir(): Failed to open directory: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt
index c4de84eefe3..78101605130 100644
--- a/ext/phar/tests/readfile_edgecases.phpt
+++ b/ext/phar/tests/readfile_edgecases.phpt
@@ -54,4 +54,4 @@
 readfile("../oops");
 ?>

-Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d
+Warning: readfile(): Failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d
diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt
index 1793d34834d..ea0d28446c0 100644
--- a/ext/phar/tests/rename.phpt
+++ b/ext/phar/tests/rename.phpt
@@ -29,4 +29,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename.phar.php/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d
diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt
index bbba70137fb..7bf59e1f1d9 100644
--- a/ext/phar/tests/rename_dir.phpt
+++ b/ext/phar/tests/rename_dir.phpt
@@ -30,4 +30,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename_dir.phar.php/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d
diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt
index 7ec06f42931..2c09c0470cd 100644
--- a/ext/phar/tests/tar/create_new_phar_b.phpt
+++ b/ext/phar/tests/tar/create_new_phar_b.phpt
@@ -13,9 +13,9 @@
 include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php';
 ?>
 --EXPECTF--
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d

-Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d
+Warning: include(): Failed to open stream: %s in %screate_new_phar_b.php on line %d

 Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.tar/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d

diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt
index eab91d5a0e1..2a6a8f57667 100644
--- a/ext/phar/tests/tar/delete.phpt
+++ b/ext/phar/tests/tar/delete.phpt
@@ -29,4 +29,4 @@
 --EXPECTF--
 a

-Warning: file_get_contents(phar://%sdelete.phar.tar/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d
diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt
index b9f624c728d..79aeeba0d0f 100644
--- a/ext/phar/tests/tar/delete_in_phar.phpt
+++ b/ext/phar/tests/tar/delete_in_phar.phpt
@@ -42,7 +42,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar.phar.tar/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d

diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt
index 4a952a4b9f1..cdd08441e86 100644
--- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt
@@ -45,7 +45,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d

diff --git a/ext/phar/tests/tar/gh16695_1.phpt b/ext/phar/tests/tar/gh16695_1.phpt
index 8ce82bcf28d..8613c77658d 100644
--- a/ext/phar/tests/tar/gh16695_1.phpt
+++ b/ext/phar/tests/tar/gh16695_1.phpt
@@ -24,5 +24,5 @@
 --EXPECTF--
 int(512)

-Warning: file_get_contents(%stls): Failed to open stream: phar error: path "tls" is a directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: path "tls" is a directory in %s on line %d
 bool(false)
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index ce400ab687f..b8afb8b21c0 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -36,7 +36,7 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
 bool(false)
 This is b/c

diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 0d251944b9f..0cba841f2d8 100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -36,7 +36,7 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
 bool(false)
 This is b/c

diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index c4192f2a862..794d02d8acf 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -37,11 +37,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d

diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index 89887823cc2..13c80ec857a 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -36,11 +36,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d

diff --git a/ext/phar/tests/tar/rename.phpt b/ext/phar/tests/tar/rename.phpt
index b80362bd33f..7173697c46d 100644
--- a/ext/phar/tests/tar/rename.phpt
+++ b/ext/phar/tests/tar/rename.phpt
@@ -39,4 +39,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename.phar.tar/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d
diff --git a/ext/phar/tests/tar/rename_dir.phpt b/ext/phar/tests/tar/rename_dir.phpt
index e043cf236a8..205f7d0bd82 100644
--- a/ext/phar/tests/tar/rename_dir.phpt
+++ b/ext/phar/tests/tar/rename_dir.phpt
@@ -39,4 +39,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename_dir.phar.tar/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d
diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt
index 55b56c0469a..2ddeae188e4 100644
--- a/ext/phar/tests/tar/tar_001.phpt
+++ b/ext/phar/tests/tar/tar_001.phpt
@@ -24,5 +24,5 @@
 @unlink(__DIR__ . '/tar_001.phar.tar');
 ?>
 --EXPECTF--
-Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): Failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9
+Warning: fopen(): Failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9
 phar error: "%star_001.phar.tar" is a corrupted tar file (truncated)
diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt
index 75bbe91d8c3..12c7ec3bbcc 100644
--- a/ext/phar/tests/tar/tar_002.phpt
+++ b/ext/phar/tests/tar/tar_002.phpt
@@ -27,5 +27,5 @@
 @unlink(__DIR__ . '/tar_002.phar.tar');
 ?>
 --EXPECTF--
-Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): Failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9
+Warning: fopen(): Failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9
 phar error: "%star_002.phar.tar" is a corrupted tar file (truncated)
diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index 061fa6c8f5e..708354f82dc 100644
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -41,6 +41,6 @@
 @unlink(__DIR__ . '/tar_nostub.tar');
 ?>
 --EXPECTF--
-RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): Failed to open directory: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
+RecursiveDirectoryIterator::__construct(): Failed to open directory: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
 phar url "phar://%star_nostub.phar.tar/" is unknown
 string(0) ""
diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt
index 3a11fbac6d5..0b332514a34 100644
--- a/ext/phar/tests/test_alias_unset.phpt
+++ b/ext/phar/tests/test_alias_unset.phpt
@@ -40,4 +40,4 @@
 Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by existing archive
 string(5) "first"

-Warning: file_get_contents(phar://%sfile1.txt): Failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d
+Warning: file_get_contents(): Failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d
diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index 0f4e239f91d..c976a3a2dde 100644
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -13,9 +13,9 @@
 include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php';
 ?>
 --EXPECTF--
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d

-Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d
+Warning: include(): Failed to open stream: %s in %screate_new_phar_b.php on line %d

 Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.zip/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d

diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt
index 7453445f224..9247a70ea06 100644
--- a/ext/phar/tests/zip/delete.phpt
+++ b/ext/phar/tests/zip/delete.phpt
@@ -28,4 +28,4 @@
 --EXPECTF--
 a

-Warning: file_get_contents(phar://%sdelete.phar.zip/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d
diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt
index b07f0bdbd8b..8ebdd95cd2d 100644
--- a/ext/phar/tests/zip/delete_in_phar.phpt
+++ b/ext/phar/tests/zip/delete_in_phar.phpt
@@ -41,7 +41,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar.phar.zip/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d

diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
index f5f65c8ede8..14a2a78b62e 100644
--- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
@@ -46,7 +46,7 @@
 This is a
 This is b

-Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d

 Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d

diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt
index ab4f80e430b..31e8b3f7bb5 100644
--- a/ext/phar/tests/zip/notphar.phpt
+++ b/ext/phar/tests/zip/notphar.phpt
@@ -20,5 +20,5 @@
 __HALT_COMPILER();
 ?>
 --EXPECTF--
-Warning: include(phar://%snotphar.phar.zip/.phar/stub.php): Failed to open stream: '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d
+Warning: include(): Failed to open stream: '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d
 PK%a
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index 9383f3bfe5e..cc8d07e549b 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -33,6 +33,6 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
 bool(false)
 This is b/c
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 2e972c112f3..b99f7652345 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -33,6 +33,6 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
 bool(false)
 This is b/c
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index c70968809b5..4ca15e58c29 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -36,11 +36,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d

diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index fbfe2104c84..89a380d345a 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -36,11 +36,11 @@
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
 bool(false)
 This is b/c

-Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d
+Warning: include(): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d

 Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d

diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt
index 209a6b4ac47..362f0c04d00 100644
--- a/ext/phar/tests/zip/rename.phpt
+++ b/ext/phar/tests/zip/rename.phpt
@@ -31,4 +31,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename.phar.zip/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d
diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt
index 76d07734e5b..e8a26f15384 100644
--- a/ext/phar/tests/zip/rename_dir.phpt
+++ b/ext/phar/tests/zip/rename_dir.phpt
@@ -31,4 +31,4 @@
 a
 a

-Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d
+Warning: file_get_contents(): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d
diff --git a/ext/standard/tests/dir/bug80960.phpt b/ext/standard/tests/dir/bug80960.phpt
index 33fcaf9fe28..e52a4a71999 100644
--- a/ext/standard/tests/dir/bug80960.phpt
+++ b/ext/standard/tests/dir/bug80960.phpt
@@ -11,8 +11,8 @@
 opendir(str_pad("longname", PHP_MAXPATHLEN - strlen(getcwd()), "_"));
 ?>
 --EXPECTF--
-Warning: opendir(notexist*): Failed to open directory: No such file or directory in %s on line %d
+Warning: opendir(): Failed to open directory: No such file or directory in %s on line %d

-Warning: opendir(notexist?): Failed to open directory: No such file or directory in %s on line %d
+Warning: opendir(): Failed to open directory: No such file or directory in %s on line %d

-Warning: opendir(longname%r_+%r): Failed to open directory: Filename too long in %s on line %d
+Warning: opendir(): Failed to open directory: Filename too long in %s on line %d
diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt
index 41a29760eb0..841257a79c4 100644
--- a/ext/standard/tests/dir/dir_variation5.phpt
+++ b/ext/standard/tests/dir/dir_variation5.phpt
@@ -24,6 +24,6 @@
 --EXPECTF--
 *** Testing dir() : open a file instead of a directory ***

-Warning: dir(%s): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt
index 0f9c14b91d4..aa0a9aa3a4c 100644
--- a/ext/standard/tests/dir/dir_variation6.phpt
+++ b/ext/standard/tests/dir/dir_variation6.phpt
@@ -42,10 +42,10 @@
 *** Testing dir() : open a non-existent directory ***
 -- opening previously removed directory --

-Warning: dir(%s): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 -- opening non-existent directory --

-Warning: dir(%s): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt
index 2b245fd612a..b09f6ed8265 100644
--- a/ext/standard/tests/dir/dir_variation7.phpt
+++ b/ext/standard/tests/dir/dir_variation7.phpt
@@ -71,10 +71,10 @@
 *** Testing dir() : remove execute permission from the parent dir ***
 -- After restricting 1st level parent directory --

-Warning: dir(%s/dir_variation7/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 -- After restricting parent directory --

-Warning: dir(%s/dir_variation7/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt
index 38d60a03905..f2855b08c69 100644
--- a/ext/standard/tests/dir/dir_variation8.phpt
+++ b/ext/standard/tests/dir/dir_variation8.phpt
@@ -39,16 +39,16 @@
 *** Testing dir() : checking with wildcard characters ***
 -- wildcard = '*' --

-Warning: dir(%s/dir_var*): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: dir(%s/*): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 -- wildcard = '?' --

-Warning: dir(%s/dir_variation81/sub_dir?): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: dir(%s/dir_variation81/sub?dir1): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt
index 88ea69cb3df..aafcba6dd7a 100644
--- a/ext/standard/tests/dir/dir_variation9.phpt
+++ b/ext/standard/tests/dir/dir_variation9.phpt
@@ -97,15 +97,15 @@

 -- With invalid paths --

-Warning: dir(%s/dir_variation91/sub_dir12/sub_dir111/..): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: dir(%s/dir_variation92/sub_dir21/../dir_variation91): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: dir(%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: dir(%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 32371f91782..5c077bc431f 100644
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -27,10 +27,10 @@

 -- Pass a non-existent absolute path: --

-Warning: opendir(%s/idonotexist): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 -- Pass a non-existent relative path: --

-Warning: opendir(idonotexist): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index f6b2934474b..856c6998ac4 100644
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -78,10 +78,10 @@

 -- After restricting 1st level parent directory --

-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 -- After restricting parent directory --

-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt
index e2cd97f4e05..92d1d22ca3f 100644
--- a/ext/standard/tests/dir/opendir_variation6-win32.phpt
+++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt
@@ -45,16 +45,16 @@

 -- Wildcard = '*' --

-Warning: opendir(%s/opendir_var*): %s in %s on line %d
+Warning: opendir(): %s in %s on line %d
 bool(false)

-Warning: opendir(%s/*): %s in %s on line %d
+Warning: opendir(): %s in %s on line %d
 bool(false)

 -- Wildcard = '?' --

-Warning: opendir(%s/opendir_variation6/sub_dir?): %s in %s on line %d
+Warning: opendir(): %s in %s on line %d
 bool(false)

-Warning: opendir(%s/opendir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index 7e3046f9af8..69c9395b0bb 100644
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -45,16 +45,16 @@

 -- Wildcard = '*' --

-Warning: opendir(%s/opendir_var*): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: opendir(%s/*): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 -- Wildcard = '?' --

-Warning: opendir(%s/opendir_variation6/sub_dir?): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

-Warning: opendir(%s/opendir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt
index d17feb1136b..a2668490b54 100644
--- a/ext/standard/tests/dir/scandir_error2.phpt
+++ b/ext/standard/tests/dir/scandir_error2.phpt
@@ -27,14 +27,14 @@

 -- Pass scandir() an absolute path that does not exist --

-Warning: scandir(%s/idonotexist): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)

 -- Pass scandir() a relative path that does not exist --

-Warning: scandir(/idonotexist): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt
index 7bee9f087a7..7b4f57b949c 100644
--- a/ext/standard/tests/dir/scandir_variation5.phpt
+++ b/ext/standard/tests/dir/scandir_variation5.phpt
@@ -70,14 +70,14 @@

 -- After restricting 1st level parent directory --

-Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)

 -- After restricting parent directory --

-Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt
index 60f64b5b60d..82fcaf6fede 100644
--- a/ext/standard/tests/dir/scandir_variation6.phpt
+++ b/ext/standard/tests/dir/scandir_variation6.phpt
@@ -46,24 +46,24 @@

 -- Wildcard = '*' --

-Warning: scandir(%s/scandir_var*): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)

-Warning: scandir(%s/*): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)

 -- Wildcard = '?' --

-Warning: scandir(%s/scandir_variation6/sub_dir?): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)

-Warning: scandir(%s/scandir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 54e89d95f37..cbda911849d 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -55,5 +55,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt
index 7ce4f04a861..a91374dd6de 100644
--- a/ext/standard/tests/file/007_variation16.phpt
+++ b/ext/standard/tests/file/007_variation16.phpt
@@ -46,5 +46,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index f080596a2cd..c475d08a37d 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -46,5 +46,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt
index 3d4d4c4152a..bfd2181b346 100644
--- a/ext/standard/tests/file/007_variation24.phpt
+++ b/ext/standard/tests/file/007_variation24.phpt
@@ -46,5 +46,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index e25c1dd9083..59b703f8c1b 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -46,5 +46,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt
index ec7cbae903d..ab5dafb931a 100644
--- a/ext/standard/tests/file/007_variation8.phpt
+++ b/ext/standard/tests/file/007_variation8.phpt
@@ -46,5 +46,5 @@
 bool(true)
 string(7) "Unknown"

-Warning: fopen(%s): Failed to open stream: File exists in %s on line %d
+Warning: fopen(): Failed to open stream: File exists in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt
index 29ab0248d8d..1bba283abc3 100644
--- a/ext/standard/tests/file/bug35740.phpt
+++ b/ext/standard/tests/file/bug35740.phpt
@@ -8,7 +8,7 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: include(%s): Failed to open stream: %s in %s on line %d
+Warning: include(): Failed to open stream: %s in %s on line %d

 Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d
 Done
diff --git a/ext/standard/tests/file/bug43353.phpt b/ext/standard/tests/file/bug43353.phpt
index 6089fabadd9..3a9ea39cc91 100644
--- a/ext/standard/tests/file/bug43353.phpt
+++ b/ext/standard/tests/file/bug43353.phpt
@@ -2,6 +2,8 @@
 Bug #43353 wrong detection of 'data' wrapper
 --INI--
 allow_url_fopen=1
+zend.exception_string_param_max_len=1000000
+error_include_args=On
 --FILE--
 <?php

@@ -16,5 +18,5 @@
 bool(false)
 string(3) "foo"

-Warning: file_get_contents(datafoo:text/plain,foo): Failed to open stream: No such file or directory in %s
+Warning: file_get_contents('datafoo:text/plain,foo'): Failed to open stream: No such file or directory in %s
 bool(false)
diff --git a/ext/standard/tests/file/bug76735.phpt b/ext/standard/tests/file/bug76735.phpt
index 8469312801e..98d8b8bd69f 100644
--- a/ext/standard/tests/file/bug76735.phpt
+++ b/ext/standard/tests/file/bug76735.phpt
@@ -5,4 +5,4 @@
 fopen(__FILE__, 'Q');
 ?>
 --EXPECTF--
-Warning: fopen(%s): Failed to open stream: `Q' is not a valid mode for fopen in %s on line %d
+Warning: fopen(): Failed to open stream: `Q' is not a valid mode for fopen in %s on line %d
diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt
index 3814c3d5f26..fb989a35838 100644
--- a/ext/standard/tests/file/copy_error.phpt
+++ b/ext/standard/tests/file/copy_error.phpt
@@ -11,6 +11,6 @@
 --EXPECTF--
 *** Testing copy() function: error conditions --

-Warning: copy(/no/file): Failed to open stream: No such file or directory in %s on line %d
+Warning: copy(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 *** Done ***
diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt
index a79bbf69c5b..c4ff093ea77 100644
--- a/ext/standard/tests/file/copy_variation14.phpt
+++ b/ext/standard/tests/file/copy_variation14.phpt
@@ -29,12 +29,12 @@
 ?>
 --EXPECTF--
 *** Test copy() function: Trying to create a copy of non-existing source in existing destination ***
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)

 *** Test copy() function: Trying to create copy of an existing source in non-existing destination ***
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)
 int(1500)
diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index abe425a4e32..0068d46a0d4 100644
--- a/ext/standard/tests/file/copy_variation15.phpt
+++ b/ext/standard/tests/file/copy_variation15.phpt
@@ -42,7 +42,7 @@
 ?>
 --EXPECTF--
 *** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions ***
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)
 int(300)
diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt
index d2730ce3325..05607042506 100644
--- a/ext/standard/tests/file/copy_variation16-win32.phpt
+++ b/ext/standard/tests/file/copy_variation16-win32.phpt
@@ -125,7 +125,7 @@
 -- Iteration 7 --
 Size of source file => int(3500)
 Copy operation =>
-Warning: copy(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: copy(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 Existence of destination file => bool(false)

diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt
index 446d72d35db..9c46eeb2601 100644
--- a/ext/standard/tests/file/copy_variation17.phpt
+++ b/ext/standard/tests/file/copy_variation17.phpt
@@ -51,19 +51,19 @@
 bool(true)
 int(1500)

-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)

-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)

-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)

-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 bool(false)
 *** Done ***
diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
index 67d84ee3e32..3d1da337795 100644
--- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
@@ -117,13 +117,13 @@

 -- Iteration 5 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

 -- Iteration 6 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

@@ -150,7 +150,7 @@

 -- Iteration 10 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

@@ -191,7 +191,7 @@

 -- Iteration 16 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt
index c8f695efea7..eb8c7042fe2 100644
--- a/ext/standard/tests/file/copy_variation2-win32.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32.phpt
@@ -117,13 +117,13 @@

 -- Iteration 5 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

 -- Iteration 6 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

@@ -150,7 +150,7 @@

 -- Iteration 10 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

@@ -191,7 +191,7 @@

 -- Iteration 16 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt
index ed4cbfb89bd..ee5678a8ab4 100644
--- a/ext/standard/tests/file/copy_variation3-win32.phpt
+++ b/ext/standard/tests/file/copy_variation3-win32.phpt
@@ -92,13 +92,13 @@

 -- Iteration 3 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)

 -- Iteration 4 --
 Copy operation =>
-Warning: copy(%s): %s
+Warning: copy(): %s
 bool(false)
 Existence of destination file => bool(false)
 *** Done ***
diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt
index c0b3ec97202..32c21a450c1 100644
--- a/ext/standard/tests/file/copy_variation6-win32.phpt
+++ b/ext/standard/tests/file/copy_variation6-win32.phpt
@@ -124,7 +124,7 @@

 -- Iteration 7 --
 Copy operation =>
-Warning: copy(%s/copy_variation6/copy_variation6_sub///../*): Failed to open stream: No such file or directory in %s on line %d
+Warning: copy(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 Existence of destination file => bool(false)

diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index 69bb93c0b7a..fffad3c59b6 100644
--- a/ext/standard/tests/file/file_error.phpt
+++ b/ext/standard/tests/file/file_error.phpt
@@ -32,7 +32,7 @@
 ValueError: file(): Argument #2 ($flags) must be a valid flag value
 ValueError: file(): Argument #2 ($flags) must be a valid flag value

-Warning: file(temp.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 --- Done ---
diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt
index 5ac352123b3..add7831ef39 100644
--- a/ext/standard/tests/file/file_get_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_error.phpt
@@ -11,7 +11,7 @@
 include($file_path."/file.inc");

 echo "\n-- Testing with  Non-existing file --\n";
-print( file_get_contents("/no/such/file/or/dir") );
+var_dump( file_get_contents("/no/such/file/or/dir") );

 create_files($file_path, 1, "text", 0755, 100, "w", "file_get_contents_error", 1, "byte");
 $file_handle = fopen($file_path."/file_put_contents_error.tmp", "w");
@@ -44,7 +44,8 @@

 -- Testing with  Non-existing file --

-Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
+bool(false)

 -- Testing for invalid negative maxlen values --
 file_get_contents(): Argument #5 ($length) must be greater than or equal to 0
diff --git a/ext/standard/tests/file/file_get_contents_error_folder-win.phpt b/ext/standard/tests/file/file_get_contents_error_folder-win.phpt
index ea3902fdbe0..9d3615353f7 100644
--- a/ext/standard/tests/file/file_get_contents_error_folder-win.phpt
+++ b/ext/standard/tests/file/file_get_contents_error_folder-win.phpt
@@ -9,4 +9,4 @@
 file_get_contents(__DIR__);
 ?>
 --EXPECTF--
-Warning: file_get_contents(%s): Failed to open stream: Permission denied in %s on line %d
+Warning: file_get_contents(): Failed to open stream: Permission denied in %s on line %d
diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
index 91a37cd2e1a..7133ae766d6 100644
--- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
@@ -31,7 +31,7 @@

 -- Testing with  Non-existing file --

-Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d

 -- Testing for invalid negative maxlen values --
 file_get_contents(): Argument #5 ($length) must be greater than or equal to 0
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
index 5dfa6227bcc..9bb97c623b4 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
@@ -87,12 +87,12 @@

 -- Iteration 5 --

-Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\..\\\fileGetContentsVar7Sub私はガラスを食べられます\\..\\..\fileGetContentsVar7Sub私はガラスを食べられます\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -109,7 +109,7 @@

 -- Iteration 11 --

-Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
index a353630c953..0cf7cc7d5aa 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
@@ -87,12 +87,12 @@

 -- Iteration 5 --

-Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\..\\\fileGetContentsVar7Sub\\..\\..\fileGetContentsVar7Sub\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -109,7 +109,7 @@

 -- Iteration 11 --

-Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt
index 2d574c6410b..25a31c6dea9 100644
--- a/ext/standard/tests/file/file_get_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7.phpt
@@ -79,12 +79,12 @@

 -- Iteration 5 --

-Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/..///fileGetContentsVar7Sub//..//../fileGetContentsVar7Sub/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -101,7 +101,7 @@

 -- Iteration 11 --

-Warning: file_get_contents(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 *** Done ***
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
index ee408b2c975..204a5c77725 100644
--- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
@@ -46,12 +46,12 @@

 -- Filename: -1 --

-Warning: file_get_contents(-1): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Filename: TRUE --

-Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Filename: FALSE --
@@ -62,7 +62,7 @@

 -- Filename: " " --

-Warning: file_get_contents( ): Failed to open stream: Permission denied in %s on line %d
+Warning: file_get_contents(): Failed to open stream: Permission denied in %s on line %d
 bool(false)

 -- Filename: \0 --
@@ -73,10 +73,10 @@

 -- Filename: /no/such/file/dir --

-Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Filename: php/php --

-Warning: file_get_contents(php/php): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index d6edef55db6..94d3a31c775 100644
--- a/ext/standard/tests/file/file_get_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8.phpt
@@ -45,11 +45,11 @@
 *** Testing file_get_contents() : variation ***
 -- Iteration 0 --

-Warning: file_get_contents(-1): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 1 --

-Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 2 --
 ValueError: Path must not be empty
@@ -57,7 +57,7 @@
 ValueError: Path must not be empty
 -- Iteration 4 --

-Warning: file_get_contents( ): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 5 --
 ValueError: file_get_contents(): Argument #1 ($filename) must not contain any null bytes
@@ -65,11 +65,11 @@
 TypeError: file_get_contents(): Argument #1 ($filename) must be of type string, array given
 -- Iteration 7 --

-Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 8 --

-Warning: file_get_contents(php/php): Failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 *** Done ***
diff --git a/ext/standard/tests/file/file_get_contents_with_custom_uri_parser.phpt b/ext/standard/tests/file/file_get_contents_with_custom_uri_parser.phpt
index b5070b74023..01ee940d953 100644
--- a/ext/standard/tests/file/file_get_contents_with_custom_uri_parser.phpt
+++ b/ext/standard/tests/file/file_get_contents_with_custom_uri_parser.phpt
@@ -39,11 +39,11 @@
 --EXPECTF--
 file_get_contents(): Provided stream context has invalid value for the "uri_parser_class" option

-Warning: file_get_contents(http:///example.com): Failed to open stream: operation failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: operation failed in %s on line %d
 bool(false)

-Warning: file_get_contents(http://éxamplé.com): Failed to open stream: operation failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: operation failed in %s on line %d
 bool(false)

-Warning: file_get_contents(http://exa%23mple.org): Failed to open stream: operation failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: operation failed in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
index fe9796979d1..b41af4b1128 100644
--- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
@@ -103,12 +103,12 @@

 -- Iteration 5 --

-Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\..\\\filePutContentsVar7Sub\\..\\..\filePutContentsVar7Sub\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 -- Iteration 6 --

-Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 -- Iteration 7 --
@@ -125,7 +125,7 @@

 -- Iteration 11 --

-Warning: file_put_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt
index fe9cfe57894..260ee1cf5bf 100644
--- a/ext/standard/tests/file/file_put_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7.phpt
@@ -100,12 +100,12 @@

 -- Iteration 5 --

-Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/..///filePutContentsVar7Sub//..//../filePutContentsVar7Sub/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 -- Iteration 6 --

-Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 -- Iteration 7 --
@@ -122,7 +122,7 @@

 -- Iteration 11 --

-Warning: file_put_contents(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 No data written

 *** Done ***
diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
index b1625f030b0..221bffc54db 100644
--- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
@@ -62,7 +62,7 @@

 -- Filename: " " --

-Warning: file_put_contents( ): Failed to open stream: Permission denied in %s on line %d
+Warning: file_put_contents(): Failed to open stream: Permission denied in %s on line %d
 Failed to write data to: " "

 -- Filename: \0 --
@@ -73,10 +73,10 @@

 -- Filename: /no/such/file/dir --

-Warning: file_put_contents(/no/such/file/dir): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 Failed to write data to: /no/such/file/dir

 -- Filename: php/php --

-Warning: file_put_contents(php/php): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 Failed to write data to: php/php
diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index 81bbd251688..12ae8379f69 100644
--- a/ext/standard/tests/file/file_put_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8.phpt
@@ -75,11 +75,11 @@
 TypeError: file_put_contents(): Argument #1 ($filename) must be of type string, array given
 -- Iteration 7 --

-Warning: file_put_contents(%sdir): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 Failed to write data to: '%sir'
 -- Iteration 8 --

-Warning: file_put_contents(%sphp): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 Failed to write data to: '%sphp'

 *** Done ***
diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt
index 2aeaf451ae9..644bebe8a2d 100644
--- a/ext/standard/tests/file/file_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_variation8-win32.phpt
@@ -99,12 +99,12 @@

 -- Iteration 5 --

-Warning: file(%sfileVar8_win32.dir\fileVar8Sub\..\\\fileVar8Sub\\..\\..\fileVar8Sub\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: file(%sfileVar8_win32.dir\fileVar8Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -133,7 +133,7 @@

 -- Iteration 11 --

-Warning: file(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt
index 8c79a3bb4f4..cefb26a5444 100644
--- a/ext/standard/tests/file/file_variation8.phpt
+++ b/ext/standard/tests/file/file_variation8.phpt
@@ -91,12 +91,12 @@

 -- Iteration 5 --

-Warning: file(%sfileVar8.dir/fileVar8Sub/..///fileVar8Sub//..//../fileVar8Sub/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: file(%sfileVar8.dir/fileVar8Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -125,7 +125,7 @@

 -- Iteration 11 --

-Warning: file(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 *** Done ***
diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt
index 45ec3052cdc..b87f5b18116 100644
--- a/ext/standard/tests/file/fopen_variation10-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation10-win32.phpt
@@ -88,17 +88,17 @@

 --c--

-Warning: fopen(c\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --\--

-Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --/--

-Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --c:fopen10.tmpdirTwo--
@@ -106,7 +106,7 @@

 --c:adir--

-Warning: fopen(c:adir\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --c:\/--
@@ -126,5 +126,5 @@

 --/sortout--

-Warning: fopen(/sortout\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt
index 22368812637..60eeb562a96 100644
--- a/ext/standard/tests/file/fopen_variation11-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation11-win32.phpt
@@ -86,17 +86,17 @@

 --c--

-Warning: fopen(c\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --\--

-Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --/--

-Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --c:fopen11.tmpdirTwo--
@@ -104,7 +104,7 @@

 --c:adir--

-Warning: fopen(c:adir\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read

 --c:\/--
@@ -124,5 +124,5 @@

 --/sortout--

-Warning: fopen(/sortout\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt
index 71a0ecd0c70..ae0049cdbe1 100644
--- a/ext/standard/tests/file/fopen_variation14-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation14-win32.phpt
@@ -98,42 +98,42 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen14.tmpDir\fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://.\fopen14.tmpDir\fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://.\fopen14.tmpDir\fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp ---
 test passed
 --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp ---
@@ -150,22 +150,22 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://..\fopen14.tmpDir\fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://..\fopen14.tmpDir\fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp ---
 test passed
 --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp ---
diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt
index 554527d0877..5fc8d92b7a0 100644
--- a/ext/standard/tests/file/fopen_variation14.phpt
+++ b/ext/standard/tests/file/fopen_variation14.phpt
@@ -90,22 +90,22 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp ---
 test passed
 --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp ---
@@ -114,12 +114,12 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp ---

 Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d

-Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp ---
 test passed
 --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp ---
diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt
index edabaa5c5ca..266ea0d13ce 100644
--- a/ext/standard/tests/file/fopen_variation15-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation15-win32.phpt
@@ -102,42 +102,42 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen15.tmpDir\fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://.\fopen15.tmpDir\fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://.\fopen15.tmpDir\fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp ---
 test passed
 --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp ---
@@ -154,22 +154,22 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://..\fopen15.tmpDir\fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://..\fopen15.tmpDir\fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp ---
 test passed
 --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp ---
diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt
index a182865bcbb..b6cc92548df 100644
--- a/ext/standard/tests/file/fopen_variation15.phpt
+++ b/ext/standard/tests/file/fopen_variation15.phpt
@@ -94,22 +94,22 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp ---
 test passed
 --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp ---
@@ -118,12 +118,12 @@ function runtest($fileURIs) {

 Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp ---

 Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d

-Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp ---
 test passed
 --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp ---
diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt
index 26357607627..bf0a1096393 100644
--- a/ext/standard/tests/file/include_userstream_002.phpt
+++ b/ext/standard/tests/file/include_userstream_002.phpt
@@ -101,8 +101,8 @@ function stream_seek($offset, $whence)

 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_include=0 in %sinclude_userstream_002.php on line 11

-Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 11
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 11

-Warning: include(test2://hello): Failed to open stream: "test::stream_open" call failed in %sinclude_userstream_002.php on line 90
+Warning: include(): Failed to open stream: "test::stream_open" call failed in %sinclude_userstream_002.php on line 90

 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_002.php on line 90
diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt
index 1f2c44821f8..1a9c96833c9 100644
--- a/ext/standard/tests/file/include_userstream_003.phpt
+++ b/ext/standard/tests/file/include_userstream_003.phpt
@@ -100,26 +100,26 @@ function stream_seek($offset, $whence)

 Warning: file_get_contents(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %s on line %d

-Warning: file_get_contents(test1://hello): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: file_get_contents(): Failed to open stream: no suitable wrapper could be found in %s on line %d


 Warning: include(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %s on line %d

-Warning: include(test1://hello): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: include(): Failed to open stream: no suitable wrapper could be found in %s on line %d

 Warning: include(): Failed opening 'test1://hello' for inclusion (include_path='%s') in %s on line %d

 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %s on line %d

-Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d

-Warning: file_get_contents(test2://hello): Failed to open stream: "test::stream_open" call failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: "test::stream_open" call failed in %s on line %d


 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %s on line %d

-Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d

-Warning: include(test2://hello): Failed to open stream: "test::stream_open" call failed in %s on line %d
+Warning: include(): Failed to open stream: "test::stream_open" call failed in %s on line %d

 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %s on line %d
diff --git a/ext/standard/tests/file/open_basedir_cwd_resolve.phpt b/ext/standard/tests/file/open_basedir_cwd_resolve.phpt
index 9c95e4904fa..074a015e1c1 100644
--- a/ext/standard/tests/file/open_basedir_cwd_resolve.phpt
+++ b/ext/standard/tests/file/open_basedir_cwd_resolve.phpt
@@ -11,5 +11,5 @@
 --EXPECTF--
 Warning: file_get_contents(): open_basedir restriction in effect. File(/some/path/outside/open/basedir) is not within the allowed path(s): (%s) in %s on line %d

-Warning: file_get_contents(/some/path/outside/open/basedir): Failed to open stream: %r(Operation not permitted|Insufficient privileges)%r in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %r(Operation not permitted|Insufficient privileges)%r in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt
index ce4952f1083..583be438006 100644
--- a/ext/standard/tests/file/parse_ini_file_error.phpt
+++ b/ext/standard/tests/file/parse_ini_file_error.phpt
@@ -22,11 +22,11 @@

 -- Testing parse_ini_file() function with more than expected no. of arguments --

-Warning: parse_ini_file(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Testing parse_ini_file() function with a non-existent file --

-Warning: parse_ini_file(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
index c5c5934062c..6834964a043 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
@@ -91,12 +91,12 @@

 -- Iteration 5 --

-Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\..\\\parseIniFileVar私はガラスを食べられますSub\\..\\..\parseIniFileVar私はガラスを食べられますSub\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\BADDIR\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -125,7 +125,7 @@

 -- Iteration 11 --

-Warning: parse_ini_file(BADDIR\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
index a7b005c6e9a..b187c1ed217 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
@@ -91,12 +91,12 @@

 -- Iteration 5 --

-Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\..\\\parseIniFileVar6Sub\\..\\..\parseIniFileVar6Sub\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\BADDIR\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -125,7 +125,7 @@

 -- Iteration 11 --

-Warning: parse_ini_file(BADDIR\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 12 --
diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt
index 4c84672821d..03fde0dc303 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt
@@ -87,12 +87,12 @@

 -- Iteration 5 --

-Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/..///parseIniFileVar6Sub//..//../parseIniFileVar6Sub/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 6 --

-Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/BADDIR/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Iteration 7 --
@@ -121,7 +121,7 @@

 -- Iteration 11 --

-Warning: parse_ini_file(BADDIR/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 *** Done ***
diff --git a/ext/standard/tests/file/php_fd_wrapper_03.phpt b/ext/standard/tests/file/php_fd_wrapper_03.phpt
index a19d1f5acd9..f8ce8ffef61 100644
--- a/ext/standard/tests/file/php_fd_wrapper_03.phpt
+++ b/ext/standard/tests/file/php_fd_wrapper_03.phpt
@@ -11,12 +11,12 @@
 ?>
 --EXPECTF--

-Warning: fopen(php://fd): Failed to open stream: operation failed in %s on line 2
+Warning: fopen(): Failed to open stream: operation failed in %s on line 2

-Warning: fopen(php://fd/): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d
+Warning: fopen(): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d

-Warning: fopen(php://fd/-2): Failed to open stream: The file descriptors must be non-negative numbers smaller than %d in %s on line %d
+Warning: fopen(): Failed to open stream: The file descriptors must be non-negative numbers smaller than %d in %s on line %d

-Warning: fopen(php://fd/1/): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d
+Warning: fopen(): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d

 Done.
diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt
index e1f9927ee9d..068866f9adb 100644
--- a/ext/standard/tests/file/php_fd_wrapper_04.phpt
+++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt
@@ -12,6 +12,6 @@
 echo "\nDone.\n";
 ?>
 --EXPECTF--
-Warning: fopen(php://fd/1023): Failed to open stream: Error duping file descriptor 1023; possibly it doesn't exist: [9]: %s in %s on line %d
+Warning: fopen(): Failed to open stream: Error duping file descriptor 1023; possibly it doesn't exist: [9]: %s in %s on line %d

 Done.
diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt
index ec2cf53946a..d21554296a1 100644
--- a/ext/standard/tests/file/readfile_error.phpt
+++ b/ext/standard/tests/file/readfile_error.phpt
@@ -34,6 +34,6 @@

 -- Testing readfile() with non-existent file --

-Warning: readfile(%s/non_existent_file.tmp): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
index 2ec770b4101..1dbb896fbc8 100644
--- a/ext/standard/tests/file/readfile_variation10-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -44,11 +44,11 @@

 -- Filename: -1 --

-Warning: readfile(-1): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- Filename: TRUE --

-Warning: readfile(1): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- Filename: FALSE --
 ValueError: Path must not be empty
@@ -58,7 +58,7 @@

 -- Filename: " " --

-Warning: readfile( ): Failed to open stream: Permission denied in %s on line %d
+Warning: readfile(): Failed to open stream: Permission denied in %s on line %d

 -- Filename: \0 --
 ValueError: readfile(): Argument #1 ($filename) must not contain any null bytes
@@ -68,8 +68,8 @@

 -- Filename: /no/such/file/dir --

-Warning: readfile(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- Filename: php/php --

-Warning: readfile(php/php): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d
diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt
index d2875215e5f..3782f738451 100644
--- a/ext/standard/tests/file/readfile_variation10.phpt
+++ b/ext/standard/tests/file/readfile_variation10.phpt
@@ -44,22 +44,22 @@
 *** Testing readfile() : variation ***
 -- testing '-1' --

-Warning: readfile(-1): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
 -- testing '1' --

-Warning: readfile(1): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
 -- testing '' --
 ValueError: Path must not be empty
 -- testing '' --
 ValueError: Path must not be empty
 -- testing ' ' --

-Warning: readfile( ): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
 -- testing '%0' --
 ValueError: readfile(): Argument #1 ($filename) must not contain any null bytes
 -- testing '%sdir' --

-Warning: readfile(%sdir): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
 -- testing '%sphp' --

-Warning: readfile(%sphp): Failed to open stream: %s in %s on line %d
+Warning: readfile(): Failed to open stream: %s in %s on line %d
diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
index 5db61a3b2e9..91b58f5a4e3 100644
--- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
+++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
@@ -80,11 +80,11 @@
 The File Contents
 -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub --

-Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR --

-Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub --
 The File Contents
@@ -96,7 +96,7 @@
 The File Contents
 -- BADDIR --

-Warning: readfile(BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- /%s/readfileVar私はガラスを食べられます8/readfileVar私はガラスを食べられます8Sub --
 The File Contents
diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt
index a44709b6b2c..ac753df7f07 100644
--- a/ext/standard/tests/file/readfile_variation8-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation8-win32.phpt
@@ -80,11 +80,11 @@
 The File Contents
 -- %s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub --

-Warning: readfile(%s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- %s\readfileVar8\readfileVar8Sub\BADDIR --

-Warning: readfile(%s\readfileVar8\readfileVar8Sub\BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- readfileVar8\readfileVar8Sub --
 The File Contents
@@ -96,7 +96,7 @@
 The File Contents
 -- BADDIR --

-Warning: readfile(BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- /%s/readfileVar8/readfileVar8Sub --
 The File Contents
diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt
index 382186fed10..c06383a9494 100644
--- a/ext/standard/tests/file/readfile_variation9.phpt
+++ b/ext/standard/tests/file/readfile_variation9.phpt
@@ -72,11 +72,11 @@
 The File Contents
 -- Iteration 5 --

-Warning: readfile(%sreadfileVar9Sub/..///readfileVar9Sub//..//../readfileVar9Sub/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- Iteration 6 --

-Warning: readfile(%sreadfileVar9Sub/BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 -- Iteration 7 --
 The File Contents
@@ -88,6 +88,6 @@
 The File Contents
 -- Iteration 11 --

-Warning: readfile(BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(): Failed to open stream: No such file or directory in %s on line %d

 *** Done ***
diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt
index 6a203c67722..b5e80293825 100644
--- a/ext/standard/tests/file/stream_001.phpt
+++ b/ext/standard/tests/file/stream_001.phpt
@@ -17,7 +17,7 @@

 Warning: fopen(): file:// wrapper is disabled in the server configuration in %s on line %d

-Warning: fopen(file://%s): Failed to open stream: no suitable wrapper could be found in %s on line %d
+Warning: fopen(): Failed to open stream: no suitable wrapper could be found in %s on line %d
 bool(false)
 bool(true)
 resource(%d) of type (stream)
diff --git a/ext/standard/tests/file/stream_rfc2397_002.phpt b/ext/standard/tests/file/stream_rfc2397_002.phpt
index d145456fdb5..2d32011f066 100644
--- a/ext/standard/tests/file/stream_rfc2397_002.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_002.phpt
@@ -51,7 +51,7 @@
 }
 NULL

-Warning: fopen(data://): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d
 array(7) {
   ["base64"]=>
   bool(true)
@@ -70,11 +70,11 @@
 }
 NULL

-Warning: fopen(data://;base64): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d

-Warning: fopen(data://foo,): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d

-Warning: fopen(data://foo=bar,): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d
 array(8) {
   ["mediatype"]=>
   string(10) "text/plain"
@@ -95,7 +95,7 @@
 }
 NULL

-Warning: fopen(data://text/plain;foo,): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d
 array(9) {
   ["mediatype"]=>
   string(10) "text/plain"
@@ -118,7 +118,7 @@
 }
 string(3) "bar"

-Warning: fopen(data://text/plain;foo=bar;bla,): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d
 array(9) {
   ["mediatype"]=>
   string(10) "text/plain"
@@ -141,7 +141,7 @@
 }
 string(3) "bar"

-Warning: fopen(data://text/plain;foo=bar;bar=baz): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d
+Warning: fopen(): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d
 array(10) {
   ["mediatype"]=>
   string(10) "text/plain"
diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt
index 649c94d6da6..bde1d4e0ceb 100644
--- a/ext/standard/tests/file/stream_rfc2397_006.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_006.phpt
@@ -26,8 +26,8 @@
 file_get_contents(): Argument #1 ($filename) must not contain any null bytes
 file_get_contents(): Argument #1 ($filename) must not contain any null bytes

-Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhcg==): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
+Warning: file_get_contents(): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
 bool(false)

-Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
+Warning: file_get_contents(): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
 bool(false)
diff --git a/ext/standard/tests/general_functions/bug44295-win.phpt b/ext/standard/tests/general_functions/bug44295-win.phpt
index fd014cf9e9a..223e0c24a10 100644
--- a/ext/standard/tests/general_functions/bug44295-win.phpt
+++ b/ext/standard/tests/general_functions/bug44295-win.phpt
@@ -25,5 +25,5 @@ function my_error_handler() {$a = func_get_args(); print "in error handler\n"; }
 <?php exit(0); ?>
 --EXPECT--
 before
-in catch: DirectoryIterator::__construct(c:\not\exists\here): Failed to open directory: No such file or directory
+in catch: DirectoryIterator::__construct(): Failed to open directory: No such file or directory
 ==DONE==
diff --git a/ext/standard/tests/general_functions/bug44295.phpt b/ext/standard/tests/general_functions/bug44295.phpt
index 12cfb819a42..131f6496b7b 100644
--- a/ext/standard/tests/general_functions/bug44295.phpt
+++ b/ext/standard/tests/general_functions/bug44295.phpt
@@ -25,5 +25,5 @@ function my_error_handler() {$a = func_get_args(); print "in error handler\n"; }
 <?php exit(0); ?>
 --EXPECT--
 before
-in catch: DirectoryIterator::__construct(/this/path/does/not/exist): Failed to open directory: No such file or directory
+in catch: DirectoryIterator::__construct(): Failed to open directory: No such file or directory
 ==DONE==
diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt
index ff0f9f2e6f1..b5bc4daac88 100644
--- a/ext/standard/tests/general_functions/parse_ini_file.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_file.phpt
@@ -117,10 +117,10 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: parse_ini_file(%sparse_ini_file.dat): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
 bool(false)

-Warning: parse_ini_file(%sparse_ini_file.dat): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
+Warning: parse_ini_file(): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
 bool(false)
 array(1) {
   ["test"]=>
diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt
index 1ee42904a05..8f065401eb1 100644
--- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt
+++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt
@@ -45,7 +45,7 @@
   resource(%d) of type (Unknown)
 }

-Warning: proc_open(test): Failed to open stream: %s in %s on line %d
+Warning: proc_open(): Failed to open stream: %s in %s on line %d
 array(4) {
   [3]=>
   resource(%d) of type (Unknown)
diff --git a/ext/standard/tests/http/bug38802.phpt b/ext/standard/tests/http/bug38802.phpt
index e3eea5ee652..8461560b59d 100644
--- a/ext/standard/tests/http/bug38802.phpt
+++ b/ext/standard/tests/http/bug38802.phpt
@@ -109,7 +109,7 @@ function do_test($context_options) {
 "
 -- Test: fail after 2 redirections --

-Warning: fopen(http://%s:%d/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s
+Warning: fopen(): Failed to open stream: Redirection limit reached, aborting in %s
 bool(false)
 string(%d) "GET /foo/bar HTTP/1.1
 Host: %s:%d
@@ -122,7 +122,7 @@ function do_test($context_options) {
 "
 -- Test: fail at first redirection --

-Warning: fopen(http://%s:%d/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s
+Warning: fopen(): Failed to open stream: Redirection limit reached, aborting in %s
 bool(false)
 string(%d) "GET /foo/bar HTTP/1.1
 Host: %s:%d
@@ -131,7 +131,7 @@ function do_test($context_options) {
 "
 -- Test: fail at first redirection (2) --

-Warning: fopen(http://%s:%d/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s
+Warning: fopen(): Failed to open stream: Redirection limit reached, aborting in %s
 bool(false)
 string(%d) "GET /foo/bar HTTP/1.1
 Host: %s:%d
diff --git a/ext/standard/tests/http/bug47021.phpt b/ext/standard/tests/http/bug47021.phpt
index 168721f4ec1..d3237f5862e 100644
--- a/ext/standard/tests/http/bug47021.phpt
+++ b/ext/standard/tests/http/bug47021.phpt
@@ -75,22 +75,22 @@ function do_test($num_spaces, $leave_trailing_space=false) {
 Type='text/plain'
 Hello

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s


 Type='text/plain'
 Hello

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s


 Type='text/plain'
 Hello

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s


 Type='text/plain'
 Hello

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt
index 7b62bdaf0b3..d6d1bcf7a7d 100644
--- a/ext/standard/tests/http/bug60570.phpt
+++ b/ext/standard/tests/http/bug60570.phpt
@@ -39,13 +39,13 @@ function do_test() {
 do_test();
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
  in %s on line %d

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
  in %s on line %d

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
  in %s on line %d
 leak? penultimate iteration: %d, last one: %d
 bool(true)
diff --git a/ext/standard/tests/http/bug69337.phpt b/ext/standard/tests/http/bug69337.phpt
index 051108a0948..533a21b5bdb 100644
--- a/ext/standard/tests/http/bug69337.phpt
+++ b/ext/standard/tests/http/bug69337.phpt
@@ -33,5 +33,5 @@ function stream_notification_callback($notification_code, $severity, $message, $
 var_dump($f);
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d
 bool(false)
diff --git a/ext/standard/tests/http/bug76342.phpt b/ext/standard/tests/http/bug76342.phpt
index f1464417f98..d8f733113ba 100644
--- a/ext/standard/tests/http/bug76342.phpt
+++ b/ext/standard/tests/http/bug76342.phpt
@@ -31,5 +31,5 @@
 ?>
 DONE
 --EXPECTF--
-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! in %s on line %d
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! in %s on line %d
 DONE
diff --git a/ext/standard/tests/http/gh16810.phpt b/ext/standard/tests/http/gh16810.phpt
index 6feab1fb01f..e17440c95ef 100644
--- a/ext/standard/tests/http/gh16810.phpt
+++ b/ext/standard/tests/http/gh16810.phpt
@@ -29,5 +29,5 @@
 --EXPECTF--
 resource(%d) of type (stream)

-Warning: fopen(http://%s): Failed to open stream: timeout must be lower than %d in %s on line %d
+Warning: fopen(): Failed to open stream: timeout must be lower than %d in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt
index 73e1408c370..a8786d15a6d 100644
--- a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt
+++ b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt
@@ -46,7 +46,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 Found the mime-type: text/html;
 Redirected: string(8000) "%s"

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: %s
+Warning: file_get_contents(): Failed to open stream: %s
 string(0) ""
 array(3) {
   [0]=>
diff --git a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt
index cde5aff0afe..b6df1099a09 100644
--- a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt
+++ b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt
@@ -45,7 +45,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 --EXPECTF--
 Found the mime-type: text/html;

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP Location header size is over the limit of 8182 bytes in %s
+Warning: file_get_contents(): Failed to open stream: HTTP Location header size is over the limit of 8182 bytes in %s
 string(0) ""
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt b/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt
index e7dd194dbbe..9542511d68a 100644
--- a/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt
+++ b/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt
@@ -19,10 +19,4 @@
 echo file_get_contents("http://$host/$userinput", false, $context);
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://localhost:%d/index.php HTTP/1.1
-Host: localhost:%d
-
-GET /index2.php HTTP/1.1
-Host: localhost:%d
-
-GET /index.php): Failed to open stream: HTTP wrapper full URI path does not allow CR or LF characters in %s on line %d
+Warning: file_get_contents(): Failed to open stream: HTTP wrapper full URI path does not allow CR or LF characters in %s on line %d
diff --git a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt
index 471f44745ed..83363fbbcc2 100644
--- a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt
+++ b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt
@@ -41,7 +41,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 --EXPECTF--
 Found the mime-type: text/html

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
 bool(false)
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt
index 67ce5517ce3..db89ebb1d9e 100644
--- a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt
+++ b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt
@@ -41,7 +41,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 --EXPECTF--
 Found the mime-type: text/html

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (space in header name)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (space in header name)! in %s
 bool(false)
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt
index e6382420954..358a85ce0f7 100644
--- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt
+++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt
@@ -40,7 +40,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 ?>
 --EXPECTF--

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (folding header at the start)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid response format (folding header at the start)! in %s
 bool(false)
 array(1) {
   [0]=>
diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt
index c0ee0167146..457681ab294 100644
--- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt
+++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt
@@ -40,7 +40,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
 ?>
 --EXPECTF--

-Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid header name (cannot start with CR character)! in %s
+Warning: file_get_contents(): Failed to open stream: HTTP invalid header name (cannot start with CR character)! in %s
 bool(false)
 array(1) {
   [0]=>
diff --git a/ext/standard/tests/http/http_response_header_03.phpt b/ext/standard/tests/http/http_response_header_03.phpt
index 5bddc304c72..bdd5c69aba5 100644
--- a/ext/standard/tests/http/http_response_header_03.phpt
+++ b/ext/standard/tests/http/http_response_header_03.phpt
@@ -30,7 +30,7 @@
 Deprecated: The predefined locally scoped $http_response_header variable is deprecated, call http_get_last_response_headers() instead in %s on line 16
 NULL

-Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a
 bool(false)
 array(5) {
   [0]=>
diff --git a/ext/standard/tests/http/ignore_errors.phpt b/ext/standard/tests/http/ignore_errors.phpt
index 9cd8cdc4509..86a68e40689 100644
--- a/ext/standard/tests/http/ignore_errors.phpt
+++ b/ext/standard/tests/http/ignore_errors.phpt
@@ -68,7 +68,7 @@ function do_test($context_options) {

 "

-Warning: fopen(http://%s:%d/foo/bar): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not found
+Warning: fopen(): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not found
  in %s on line %d
 bool(false)
 string(%d) "GET /foo/bar HTTP/1.1
diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt
index f6317db7405..7e848603e5d 100644
--- a/ext/standard/tests/image/getimagesize_variation3.phpt
+++ b/ext/standard/tests/image/getimagesize_variation3.phpt
@@ -43,10 +43,10 @@

 -- Non-existent file (nofile.ext) --

-Warning: getimagesize(%snofile.ext): Failed to open stream: No such file or directory in %s on line %d
+Warning: getimagesize(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

-Warning: getimagesize(%snofile.ext): Failed to open stream: No such file or directory in %s on line %d
+Warning: getimagesize(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 array(0) {
 }
diff --git a/ext/standard/tests/mail/gh7875.phpt b/ext/standard/tests/mail/gh7875.phpt
index 0a1a15ac116..1f8346a0715 100644
--- a/ext/standard/tests/mail/gh7875.phpt
+++ b/ext/standard/tests/mail/gh7875.phpt
@@ -46,5 +46,5 @@ function exception_error_handler($severity, $message, $file, $line) {
 @unlink(__DIR__ . "/gh7875.mail.out");
 ?>
 --EXPECTF--
-mail(%s): Failed to open stream: Permission denied
+mail(): Failed to open stream: Permission denied
 bool(false)
diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt
index 59eff72ad04..a8c5daf4b12 100644
--- a/ext/standard/tests/streams/bug72771.phpt
+++ b/ext/standard/tests/streams/bug72771.phpt
@@ -18,5 +18,5 @@
 var_dump($ds);
 ?>
 --EXPECTF--
-Warning: opendir(ftps://127.0.0.1:%d/): Failed to open directory: Server doesn't support FTPS. in %s on line %d
+Warning: opendir(): Failed to open directory: Server doesn't support FTPS. in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt
index 64b8bf6ac8e..f46a774484d 100644
--- a/ext/standard/tests/streams/bug73457.phpt
+++ b/ext/standard/tests/streams/bug73457.phpt
@@ -19,5 +19,5 @@
 var_dump($ds);
 ?>
 --EXPECTF--
-Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): Failed to open stream: Failed to set up data channel: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: Failed to set up data channel: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/bug74951.phpt b/ext/standard/tests/streams/bug74951.phpt
index 43d4f46bfbf..b30b5fe2824 100644
--- a/ext/standard/tests/streams/bug74951.phpt
+++ b/ext/standard/tests/streams/bug74951.phpt
@@ -10,4 +10,4 @@ public function n($_) {}
 $s=fopen('e0ploit://',0);
 ?>
 --EXPECTF--
-Warning: fopen(e0ploit://): Failed to open stream: operation failed in %s%ebug74951.php on line 7
+Warning: fopen(): Failed to open stream: operation failed in %s%ebug74951.php on line 7
diff --git a/ext/standard/tests/streams/glob-wrapper.phpt b/ext/standard/tests/streams/glob-wrapper.phpt
index 9be0fce6b71..6f5519c60be 100644
--- a/ext/standard/tests/streams/glob-wrapper.phpt
+++ b/ext/standard/tests/streams/glob-wrapper.phpt
@@ -27,7 +27,7 @@

 Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5

-Warning: opendir(%s): Failed to open directory: %r(Operation not permitted|Insufficient privileges)%r in %s%eglob-wrapper.php on line 5
+Warning: opendir(): Failed to open directory: %r(Operation not permitted|Insufficient privileges)%r in %s%eglob-wrapper.php on line 5
 Failed to open %s
 ** Opening glob://%s
 No files in glob://%s
diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt
index 7fa9bbfd7b1..c5459f0ab47 100644
--- a/ext/standard/tests/streams/opendir-001.phpt
+++ b/ext/standard/tests/streams/opendir-001.phpt
@@ -15,6 +15,6 @@
 var_dump(opendir($path));
 ?>
 --EXPECTF--
-Warning: opendir(ftp://localhost:%d/bogusdir): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory
+Warning: opendir(): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory
  in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt
index d79d43b1f12..51676b8dcfe 100644
--- a/ext/standard/tests/streams/opendir-003.phpt
+++ b/ext/standard/tests/streams/opendir-003.phpt
@@ -20,6 +20,6 @@
 var_dump(opendir($path, $context));
 ?>
 --EXPECTF--
-Warning: opendir(ftps://127.0.0.1:%d/bogusdir): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory
+Warning: opendir(): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory
  in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/stream_errors_error_has_code.phpt b/ext/standard/tests/streams/stream_errors_error_has_code.phpt
index 6cd6b70411a..b8bbe012c8e 100644
--- a/ext/standard/tests/streams/stream_errors_error_has_code.phpt
+++ b/ext/standard/tests/streams/stream_errors_error_has_code.phpt
@@ -27,4 +27,4 @@
 ?>
 --EXPECT--
 Got most recent error
-Param contains 'nonexistent2': yes
+Param contains 'nonexistent2': no
diff --git a/ext/standard/tests/streams/stream_errors_invalid_types.phpt b/ext/standard/tests/streams/stream_errors_invalid_types.phpt
index 1b3ab5e8931..09a1d8f90e3 100644
--- a/ext/standard/tests/streams/stream_errors_invalid_types.phpt
+++ b/ext/standard/tests/streams/stream_errors_invalid_types.phpt
@@ -30,8 +30,8 @@
 ?>
 --EXPECTF--

-Warning: fopen(php://nonexistent): Failed to open stream: operation failed in %s on line %d
+Warning: fopen(): Failed to open stream: operation failed in %s on line %d
 Caught TypeError for error_mode

-Warning: fopen(php://nonexistent): Failed to open stream: operation failed in %s on line %d
+Warning: fopen(): Failed to open stream: operation failed in %s on line %d
 Caught TypeError for error_store
diff --git a/ext/standard/tests/streams/stream_errors_silent_with_handler.phpt b/ext/standard/tests/streams/stream_errors_silent_with_handler.phpt
index 456575affc3..387939a1063 100644
--- a/ext/standard/tests/streams/stream_errors_silent_with_handler.phpt
+++ b/ext/standard/tests/streams/stream_errors_silent_with_handler.phpt
@@ -32,6 +32,6 @@
 Wrapper: PHP
 Code: OpenFailed
 Message: Failed to open stream: operation failed
-Param: php://nonexistent
+Param: null
 Terminating: yes
 bool(true)
diff --git a/ext/standard/tests/streams/stream_errors_standard_error.phpt b/ext/standard/tests/streams/stream_errors_standard_error.phpt
index 42de8cc3b17..93b66b329d9 100644
--- a/ext/standard/tests/streams/stream_errors_standard_error.phpt
+++ b/ext/standard/tests/streams/stream_errors_standard_error.phpt
@@ -16,5 +16,5 @@

 ?>
 --EXPECTF--
-Warning: fopen(php://nonexistent): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt
index dabed24c578..207afd7c525 100644
--- a/ext/standard/tests/strings/006.phpt
+++ b/ext/standard/tests/strings/006.phpt
@@ -10,7 +10,7 @@

 ?>
 --EXPECTF--
-Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): Failed to open stream: %s006.php on line %d
+Warning: highlight_file(): Failed to open stream: %s006.php on line %d

 Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt
index 9fe9e482139..ce6a0bd7e4d 100644
--- a/ext/standard/tests/strings/007-win32.phpt
+++ b/ext/standard/tests/strings/007-win32.phpt
@@ -11,6 +11,6 @@

 ?>
 --EXPECTF--
-Warning: php_strip_whitespace(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: php_strip_whitespace(): Failed to open stream: No such file or directory in %s on line %d
 string(0) ""
 bool(false)
diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt
index 69140715b45..5d3c4b04505 100644
--- a/ext/standard/tests/strings/007.phpt
+++ b/ext/standard/tests/strings/007.phpt
@@ -11,6 +11,6 @@

 ?>
 --EXPECTF--
-Warning: php_strip_whitespace(%s): Failed to open stream: File%Sname too long in %s007.php on line %d
+Warning: php_strip_whitespace(): Failed to open stream: File%Sname too long in %s007.php on line %d
 string(0) ""
 bool(false)
diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt
index 95d7f970010..4abb3580157 100644
--- a/ext/standard/tests/strings/bug68996.phpt
+++ b/ext/standard/tests/strings/bug68996.phpt
@@ -8,4 +8,4 @@
 ?>
 --EXPECTF--
 <br />
-<b>Warning</b>:  fopen(�c): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>2</b><br />
+<b>Warning</b>:  fopen(): Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>2</b><br />
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
index 048399216c9..07983b79b61 100644
--- a/ext/standard/tests/strings/highlight_file.phpt
+++ b/ext/standard/tests/strings/highlight_file.phpt
@@ -38,7 +38,7 @@ public function bar() { var_dump(test::foo()); }
 --EXPECTF--
 Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0

-Warning: highlight_file(%shighlight_file.dat): Failed to open stream: No such file or directory in %s on line %d
+Warning: highlight_file(): Failed to open stream: No such file or directory in %s on line %d

 Warning: highlight_file(): Failed opening '%shighlight_file.dat' for highlighting in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt
index 1eb9b2654ad..a6fba9ea038 100644
--- a/ext/standard/tests/strings/md5_file.phpt
+++ b/ext/standard/tests/strings/md5_file.phpt
@@ -66,10 +66,10 @@
 *** Testing for error conditions ***
 Path must not be empty

-Warning: md5_file(aZrq16u): Failed to open stream: No such file or directory in %s on line %d
+Warning: md5_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

-Warning: md5_file(12): Failed to open stream: No such file or directory in %s on line %d
+Warning: md5_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 *** Hexadecimal Output for Empty file as Argument ***
diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt
index 9f22daa9eb4..a3a811fe488 100644
--- a/ext/standard/tests/strings/php_strip_whitespace.phpt
+++ b/ext/standard/tests/strings/php_strip_whitespace.phpt
@@ -39,7 +39,7 @@ function foo () /* {{{ */
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: php_strip_whitespace(%sphp_strip_whitespace.dat): Failed to open stream: No such file or directory in %s on line %d
+Warning: php_strip_whitespace(): Failed to open stream: No such file or directory in %s on line %d
 string(0) ""
 string(18) "/* test comment */"
 string(9) "<?php  ?>"
diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt
index 1fea3566b5f..e88edb5acd9 100644
--- a/ext/standard/tests/strings/sha1.phpt
+++ b/ext/standard/tests/strings/sha1.phpt
@@ -47,5 +47,5 @@
 string(20) "%a"
 string(20) "%a"

-Warning: sha1_file(%ssha1.dat): Failed to open stream: No such file or directory in %s on line %d
+Warning: sha1_file(): Failed to open stream: No such file or directory in %s on line %d
 Done
diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt
index 60d6ad808f8..2014eabb98f 100644
--- a/ext/standard/tests/strings/sha1_file.phpt
+++ b/ext/standard/tests/strings/sha1_file.phpt
@@ -78,12 +78,12 @@

 -- invalid filename --

-Warning: sha1_file(rewncwYcn89q): Failed to open stream: No such file or directory in %s on line %d
+Warning: sha1_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- Scalar value as filename --

-Warning: sha1_file(12): Failed to open stream: No such file or directory in %s on line %d
+Warning: sha1_file(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

 -- NULL as filename --
diff --git a/ext/zend_test/tests/gh17797.phpt b/ext/zend_test/tests/gh17797.phpt
index 271841b4389..23bc217aef2 100644
--- a/ext/zend_test/tests/gh17797.phpt
+++ b/ext/zend_test/tests/gh17797.phpt
@@ -17,7 +17,7 @@

 Deprecated: zend_test_compile_string(): Passing null to parameter #3 ($position) of type int is deprecated in %s on line %d

-Warning: require(sumfile.php): Failed to open stream: No such file or directory in <?php
+Warning: require(): Failed to open stream: No such file or directory in <?php
 require("sumfile.php");
 ?> on line %d

diff --git a/ext/zend_test/tests/gh17899.phpt b/ext/zend_test/tests/gh17899.phpt
index 184fe0b2aa3..58f445a3b7b 100644
--- a/ext/zend_test/tests/gh17899.phpt
+++ b/ext/zend_test/tests/gh17899.phpt
@@ -19,7 +19,7 @@

 Deprecated: zend_test_compile_string(): Passing null to parameter #3 ($position) of type int is deprecated in %s on line %d

-Warning: require(sumfile.php): Failed to open stream: No such file or directory in <?php
+Warning: require(): Failed to open stream: No such file or directory in <?php
 require("sumfile.php");
 ?> on line %d

diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt
index 914b0b8440c..ddffff39354 100644
--- a/ext/zip/tests/bug53603.phpt
+++ b/ext/zip/tests/bug53603.phpt
@@ -28,5 +28,5 @@ function url_stat($path, $flags) {
 var_dump($a);
 ?>
 --EXPECTF--
-Warning: ZipArchive::extractTo(teststream://test/foo): Failed to open stream: "TestStream::stream_open" is not implemented in %s on line %d
+Warning: ZipArchive::extractTo(): Failed to open stream: "TestStream::stream_open" is not implemented in %s on line %d
 bool(false)
diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt
index f5207e30759..448979b5e53 100644
--- a/ext/zip/tests/oo_encryption.phpt
+++ b/ext/zip/tests/oo_encryption.phpt
@@ -60,7 +60,7 @@
 == Stream
 string(3) "foo"

-Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d
+Warning: file_get_contents(): Failed to open stream: operation failed in %s on line %d
 bool(false)
 string(3) "bar"
 == Done
diff --git a/ext/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt
index ca221c12cff..e95443ce267 100644
--- a/ext/zlib/tests/gzfile_variation7.phpt
+++ b/ext/zlib/tests/gzfile_variation7.phpt
@@ -11,8 +11,8 @@
 var_dump(gzfile($filename, true));
 ?>
 --EXPECTF--
-Warning: gzfile(nonexistent_file_gzfile.txt.gz): Failed to open stream: No such file or directory in %s on line %d
+Warning: gzfile(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

-Warning: gzfile(nonexistent_file_gzfile.txt.gz): Failed to open stream: No such file or directory in %s on line %d
+Warning: gzfile(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt
index f9ac099dc25..0118dd3ea13 100644
--- a/ext/zlib/tests/gzopen_variation9.phpt
+++ b/ext/zlib/tests/gzopen_variation9.phpt
@@ -38,6 +38,6 @@

 mode=e

-Warning: gzopen(%s/test.txt.gz): Failed to open stream: %s in %s on line %d
+Warning: gzopen(): Failed to open stream: %s in %s on line %d
 gzopen=bool(false)

diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt
index 6f201abe236..a90feb9b200 100644
--- a/ext/zlib/tests/readgzfile_variation7.phpt
+++ b/ext/zlib/tests/readgzfile_variation7.phpt
@@ -10,8 +10,8 @@
 var_dump(readgzfile($file, true));
 ?>
 --EXPECTF--
-Warning: readgzfile(unknown_file.txt.gz): Failed to open stream: No such file or directory in %s on line %d
+Warning: readgzfile(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

-Warning: readgzfile(unknown_file.txt.gz): Failed to open stream: No such file or directory in %s on line %d
+Warning: readgzfile(): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
index 683e87b8eff..c551e0684f9 100644
--- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
@@ -15,6 +15,6 @@
 bool(false)
 bool(false)

-Warning: opendir(compress.zlib://%s/dir.gz): Failed to open directory: not implemented in %s on line %d
+Warning: opendir(): Failed to open directory: not implemented in %s on line %d
 bool(false)
 bool(false)
diff --git a/main/streams/php_stream_errors.h b/main/streams/php_stream_errors.h
index 438397a24de..b21f4750524 100644
--- a/main/streams/php_stream_errors.h
+++ b/main/streams/php_stream_errors.h
@@ -141,11 +141,11 @@ PHPAPI void php_stream_wrapper_log_error(const php_stream_wrapper *wrapper,
 		ZEND_ATTRIBUTE_FORMAT(printf, 7, 8);

 PHPAPI void php_stream_display_wrapper_name_errors(const char *wrapper_name,
-		php_stream_context *context, zend_enum_StreamErrorCode code, const char *path,
+		php_stream_context *context, zend_enum_StreamErrorCode code,
 		const char *caption);

 PHPAPI void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper,
-		php_stream_context *context, zend_enum_StreamErrorCode code, const char *path,
+		php_stream_context *context, zend_enum_StreamErrorCode code,
 		const char *caption);

 PHPAPI void php_stream_tidy_wrapper_name_error_log(const char *wrapper_name);
diff --git a/main/streams/stream_errors.c b/main/streams/stream_errors.c
index 70c06b70182..2fa2cc64663 100644
--- a/main/streams/stream_errors.c
+++ b/main/streams/stream_errors.c
@@ -723,7 +723,7 @@ static zend_llist *php_stream_get_wrapper_errors_list(const char *wrapper_name)
 }

 PHPAPI void php_stream_display_wrapper_name_errors(const char *wrapper_name,
-		php_stream_context *context, zend_enum_StreamErrorCode code, const char *path,
+		php_stream_context *context, zend_enum_StreamErrorCode code,
 		const char *caption)
 {
 	char *msg;
@@ -734,7 +734,6 @@ PHPAPI void php_stream_display_wrapper_name_errors(const char *wrapper_name,
 		return;
 	}

-	char *tmp = estrdup(path);
 	if (strcmp(wrapper_name, PHP_STREAM_ERROR_WRAPPER_DEFAULT_NAME)) {
 		zend_llist *err_list = php_stream_get_wrapper_errors_list(wrapper_name);
 		if (err_list) {
@@ -783,12 +782,10 @@ PHPAPI void php_stream_display_wrapper_name_errors(const char *wrapper_name,
 		msg = "no suitable wrapper could be found";
 	}

-	php_strip_url_passwd(tmp);
-
 	zend_string *message = strpprintf(0, "%s: %s", caption, msg);

 	php_stream_wrapper_error_internal(wrapper_name, context, NULL, REPORT_ERRORS, E_WARNING, true,
-			code, tmp, message);
+			code, NULL, message);

 	if (free_msg) {
 		efree(msg);
@@ -796,12 +793,12 @@ PHPAPI void php_stream_display_wrapper_name_errors(const char *wrapper_name,
 }

 PHPAPI void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper,
-		php_stream_context *context, zend_enum_StreamErrorCode code, const char *path,
+		php_stream_context *context, zend_enum_StreamErrorCode code,
 		const char *caption)
 {
 	if (wrapper) {
 		const char *wrapper_name = PHP_STREAM_ERROR_WRAPPER_NAME(wrapper);
-		php_stream_display_wrapper_name_errors(wrapper_name, context, code, path, caption);
+		php_stream_display_wrapper_name_errors(wrapper_name, context, code, caption);
 	}
 }

diff --git a/main/streams/streams.c b/main/streams/streams.c
index c3bde0a8b10..453c61b56a2 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2148,7 +2148,7 @@ PHPAPI php_stream *_php_stream_opendir(const char *path, int options,
 	}
 	if (stream == NULL && (options & REPORT_ERRORS)) {
 		php_stream_display_wrapper_errors(wrapper, context, PHP_STREAM_EC(OpenFailed),
-				path, "Failed to open directory");
+				"Failed to open directory");
 	}
 	php_stream_tidy_wrapper_error_log(wrapper);

@@ -2323,7 +2323,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(const char *path, const char *mod

 	if (stream == NULL && (options & REPORT_ERRORS)) {
 		php_stream_display_wrapper_name_errors(wrapper_name, context, PHP_STREAM_EC(OpenFailed),
-				path, "Failed to open stream");
+				"Failed to open stream");
 		if (opened_path && *opened_path) {
 			zend_string_release_ex(*opened_path, 0);
 			*opened_path = NULL;
diff --git a/sapi/cli/tests/bug69655.phpt b/sapi/cli/tests/bug69655.phpt
index 4ab53bcbaae..d13f67f5f12 100644
--- a/sapi/cli/tests/bug69655.phpt
+++ b/sapi/cli/tests/bug69655.phpt
@@ -17,11 +17,11 @@
 }
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
  in %s on line %d

-Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
  in %s on line %d

-Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
  in %s on line %d
diff --git a/sapi/cli/tests/bug70264.phpt b/sapi/cli/tests/bug70264.phpt
index e1b0ee8fe8b..4de5b72ffb0 100644
--- a/sapi/cli/tests/bug70264.phpt
+++ b/sapi/cli/tests/bug70264.phpt
@@ -14,8 +14,8 @@
 echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/..%5CCREDITS");
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://%s/..\CREDITS): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
  in %sbug70264.php on line %d

-Warning: file_get_contents(http://%s/..%5CCREDITS): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
  in %sbug70264.php on line %d
diff --git a/sapi/cli/tests/bug73630a.phpt b/sapi/cli/tests/bug73630a.phpt
index 45880c6cda0..33576a9e2b1 100644
--- a/sapi/cli/tests/bug73630a.phpt
+++ b/sapi/cli/tests/bug73630a.phpt
@@ -21,5 +21,5 @@
 var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "$path"));
 ?>
 --EXPECTF--
-Warning: file_get_contents(http://%s//example.com): Failed to open stream: HTTP request failed! in %s on line %d
+Warning: file_get_contents(): Failed to open stream: HTTP request failed! in %s on line %d
 bool(false)
diff --git a/sapi/phpdbg/tests/bug78297.phpt b/sapi/phpdbg/tests/bug78297.phpt
index 196736bb003..52552ee17c9 100644
--- a/sapi/phpdbg/tests/bug78297.phpt
+++ b/sapi/phpdbg/tests/bug78297.phpt
@@ -10,7 +10,7 @@
 --EXPECTF--
 [Successful compilation of %s]
 prompt>
-Warning: include(%s): Failed to open stream: No such file or directory in %s on line %d
+Warning: include(): Failed to open stream: No such file or directory in %s on line %d

 Warning: include(): Failed opening 'does_not_exist.php' for inclusion (include_path=%s) in %s on line %d
 [Script ended normally]
diff --git a/tests/lang/bug28213.phpt b/tests/lang/bug28213.phpt
index abd965cbb93..1b75a669441 100644
--- a/tests/lang/bug28213.phpt
+++ b/tests/lang/bug28213.phpt
@@ -7,7 +7,7 @@ class FooBar { static function error() { debug_print_backtrace(); } }
 include('foobar.php');
 ?>
 --EXPECTF--
-#0 %s(%d): FooBar::error(2, 'include(foobar....', '%s', 4)
+#0 %s(%d): FooBar::error(2, 'include(): Fail...', '%s', 4)
 #1 %s(%d): include()
 #0 %s(%d): FooBar::error(2, 'include(): Fail...', '%s', 4)
 #1 %s(%d): include()
diff --git a/tests/lang/bug35176.phpt b/tests/lang/bug35176.phpt
index 67c9324edd8..926f788de05 100644
--- a/tests/lang/bug35176.phpt
+++ b/tests/lang/bug35176.phpt
@@ -10,7 +10,7 @@
 ?>
 --EXPECTF--
 <br />
-<b>Warning</b>:  require_once(nonexistent.php) [<a href='/function.require-once.html'>function.require-once.html</a>]: Failed to open stream: No such file or directory in <b>%sbug35176.php</b> on line <b>2</b><br />
+<b>Warning</b>:  require_once() [<a href='/function.require-once.html'>function.require-once.html</a>]: Failed to open stream: No such file or directory in <b>%sbug35176.php</b> on line <b>2</b><br />
 <br />
 <b>Fatal error</b>:  Uncaught Error: Failed opening required 'nonexistent.php' (include_path='%s') in %s:%d
 Stack trace:
diff --git a/tests/lang/bug43958.phpt b/tests/lang/bug43958.phpt
index 7f0c1b7487a..47fa7f27623 100644
--- a/tests/lang/bug43958.phpt
+++ b/tests/lang/bug43958.phpt
@@ -12,6 +12,6 @@ static public function loadCode($p) {
 MyClass::loadCode('file-which-does-not-exist-on-purpose.php');
 ?>
 --EXPECTF--
-Warning: include(file-which-does-not-exist-on-purpose.php): Failed to open stream: No such file or directory in %sbug43958.php on line 5
+Warning: include(): Failed to open stream: No such file or directory in %sbug43958.php on line 5

 Warning: include(): Failed opening 'file-which-does-not-exist-on-purpose.php' for inclusion (include_path='%s') in %sbug43958.php on line 5
diff --git a/tests/output/bug75236.phpt b/tests/output/bug75236.phpt
index bee4732cb2c..ac41721fddc 100644
--- a/tests/output/bug75236.phpt
+++ b/tests/output/bug75236.phpt
@@ -14,5 +14,5 @@
 --EXPECTF--
 before getfilecontent
 <br />
-<b>Warning</b>:  file_get_contents(no/suchfile): Failed to open stream: No such file or directory in <b>%s</b> on line <b>7</b><br />
+<b>Warning</b>:  file_get_contents(): Failed to open stream: No such file or directory in <b>%s</b> on line <b>7</b><br />
 after getfilecontent
diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt
index 82806b8fb82..3282d1f4289 100644
--- a/tests/security/open_basedir_copy.phpt
+++ b/tests/security/open_basedir_copy.phpt
@@ -35,42 +35,42 @@

 Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(..): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(/): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/.): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/./bad.txt): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(./../.): Failed to open stream: %s in %s on line %d
+Warning: copy(): Failed to open stream: %s in %s on line %d
 bool(false)
 bool(true)
 bool(true)
diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt
index 10181c3efa7..0e5a3eff627 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -30,42 +30,42 @@

 Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(..): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(/): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/.): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: dir(): Failed to open directory: %s in %s on line %d
 bool(false)
 object(Directory)#%d (2) {
   ["path"]=>
diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt
index 4a7b14b0044..bbbb307ff24 100644
--- a/tests/security/open_basedir_error_log_variation.phpt
+++ b/tests/security/open_basedir_error_log_variation.phpt
@@ -32,17 +32,17 @@

 Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: error_log(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: error_log(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: error_log(): Failed to open stream: %s in %s on line %d
 bool(false)
 bool(true)
 *** Finished testing open_basedir configuration [error_log] ***
diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt
index e3d2a5d8a6f..24bec56a9a1 100644
--- a/tests/security/open_basedir_file.phpt
+++ b/tests/security/open_basedir_file.phpt
@@ -31,42 +31,42 @@

 Warning: file(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(..): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(/): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/.): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file(): Failed to open stream: %s in %s on line %d
 bool(false)
 array(1) {
   [0]=>
diff --git a/tests/security/open_basedir_file_get_contents.phpt b/tests/security/open_basedir_file_get_contents.phpt
index 91a3eb09804..c017dc83578 100644
--- a/tests/security/open_basedir_file_get_contents.phpt
+++ b/tests/security/open_basedir_file_get_contents.phpt
@@ -31,42 +31,42 @@

 Warning: file_get_contents(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(..): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(/): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/.): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_get_contents(): Failed to open stream: %s in %s on line %d
 bool(false)
 string(12) "Hello World!"
 string(12) "Hello World!"
diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt
index b7536d973a1..63a2020c896 100644
--- a/tests/security/open_basedir_file_put_contents.phpt
+++ b/tests/security/open_basedir_file_put_contents.phpt
@@ -31,26 +31,26 @@

 Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_put_contents(): open_basedir restriction in effect. File(.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(.././bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_put_contents(): open_basedir restriction in effect. File(./.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(./.././bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents%s/test/bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: file_put_contents(): Failed to open stream: %s in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [file_put_contents] ***
diff --git a/tests/security/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt
index cd4a644edc5..614444595a8 100644
--- a/tests/security/open_basedir_fopen.phpt
+++ b/tests/security/open_basedir_fopen.phpt
@@ -40,42 +40,42 @@

 Warning: fopen(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/bad.txt): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(..): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(/): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/.): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/./bad.txt): Failed to open stream: %s in %s on line 12
+Warning: fopen(): Failed to open stream: %s in %s on line 12
 bool(false)

 Warning: fopen(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(./../.): Failed to open stream: %s in %s on line %d
+Warning: fopen(): Failed to open stream: %s in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
index caf5a71bece..030a7c59a80 100644
--- a/tests/security/open_basedir_opendir.phpt
+++ b/tests/security/open_basedir_opendir.phpt
@@ -29,42 +29,42 @@

 Warning: opendir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(..): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(/): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/.): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)

 Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: opendir(): Failed to open directory: %s in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt
index 7c9cbd8d122..2867d01df78 100644
--- a/tests/security/open_basedir_parse_ini_file.phpt
+++ b/tests/security/open_basedir_parse_ini_file.phpt
@@ -39,36 +39,36 @@

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 6

-Warning: parse_ini_file(%stest\bad): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 6
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 6
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 7

-Warning: parse_ini_file(%stest\bad\bad.txt): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 7
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 7
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 8

-Warning: parse_ini_file(%stest): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 8
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 8
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 9

-Warning: parse_ini_file(%stest): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 9
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 9
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 10

-Warning: parse_ini_file(%stest\bad): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 10
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 10
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 11

-Warning: parse_ini_file(%stest\bad\bad.txt): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 11
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 11
 bool(false)

 Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 12

-Warning: parse_ini_file(%stest): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12
+Warning: parse_ini_file(): Failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12
 bool(false)
 *** Finished testing open_basedir configuration [parse_ini_file] ***
diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt
index 0a629cb9e7c..d5e68527774 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -29,56 +29,56 @@

 Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(..): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(/): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/.): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)

 Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/../bad/bad.txt): Failed to open directory: %s in %s on line %d
+Warning: scandir(): Failed to open directory: %s in %s on line %d

 Warning: scandir(): (errno 1): %s in %s on line %d
 bool(false)