Fix Warning messages in tests

Author: Girgias

Zend/tests/bug60909_1.phpt

@@ -13,7 +13,7 @@ require 'notfound.php';
 error(require(): failed to open stream (notfound.php): %s)
 Warning: Uncaught Exception: Foo in %sbug60909_1.php:5
 Stack trace:
-#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
+#0 %sbug60909_1.php(8): {closure}(2, 'require(): fail...', '%s', 8, Array)
 #1 %sbug60909_1.php(8): require()
 #2 {main}
   thrown in %sbug60909_1.php on line 5

ext/bz2/tests/001.phpt

@@ -37,7 +37,7 @@ bool(false)
 Warning: bzopen(): 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d
 bool(false)
 
-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): No such file or directory in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 Done

ext/bz2/tests/002.phpt

@@ -83,12 +83,12 @@ bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d
 
 Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
 bool(false)
 
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d
 
 Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
 bool(false)

ext/fileinfo/tests/finfo_file_001.phpt

@@ -24,5 +24,5 @@ Warning: finfo_file(): Empty filename or path in %s on line %d
 bool(false)
 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)

ext/fileinfo/tests/finfo_open_001.phpt

@@ -19,23 +19,23 @@ bool(false)
 resource(%d) of type (file_info)
 resource(%d) of type (file_info)
 
-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 (%s123): 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 (%s123): 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 (%s1): 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 (%s1): 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 (%sinexistent): 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 (%sinexistent): 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)

ext/fileinfo/tests/finfo_open_error.phpt

@@ -31,9 +31,9 @@ try {
 --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 12
+Warning: finfo_open(): failed to open stream (%sfoobarfile): No such file or directory in %sfinfo_open_error.php on line 12
 
-Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line 12
+Warning: finfo_open(): failed to open stream (%sfoobarfile): No such file or directory in %sfinfo_open_error.php on line 12
 
 Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line 12
 bool(false)

ext/fileinfo/tests/mime_content_type_001.phpt

@@ -23,7 +23,7 @@ Warning: mime_content_type(): Can only process string or stream arguments in %s
 
 Warning: mime_content_type(): Can only process string or stream arguments in %s on line %d
 
-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 (foo/inexistent): No such file or directory in %s on line %d
 
 Warning: mime_content_type(): Empty filename or path in %s on line %d
 

ext/gd/tests/001-mb.phpt

@@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file));
 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 (%s001私はガラスを食べられます.test): 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

ext/gd/tests/001.phpt

@@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file));
 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 (%s001.test): 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

ext/gd/tests/imageloadfont_error2.phpt

@@ -11,5 +11,5 @@ Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
 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 (\src\invalidfile.font): No such file or directory in %s on line %d
 bool(false)

ext/libxml/tests/bug61367-write.phpt

@@ -42,5 +42,5 @@ bool(true)
 
 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: Operation not permitted in %s on line %d
+Warning: DOMDocument::save(): failed to open stream (%s): Operation not permitted in %s on line %d
 bool(false)

ext/phar/tests/013.phpt

@@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a');
 --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://%s/a): phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d

ext/phar/tests/014.phpt

@@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a');
 --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://%s/a): phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d

ext/phar/tests/016.phpt

@@ -28,12 +28,12 @@ var_dump(file_get_contents($pname . '/d'));
 --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://%s/a): 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://%s/b): 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://%s/d): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d
 bool(false)

ext/phar/tests/016b.phpt

@@ -21,4 +21,4 @@ echo file_get_contents($pname . '/a');
 --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://%s/a): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d

ext/phar/tests/017.phpt

@@ -29,5 +29,5 @@ $dir = opendir('phar://hio');
 string(%d) "%s017.phar.php"
 bool(true)
 
-Warning: opendir(phar://hio): failed to open dir: 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 dir (phar://hio): 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

ext/phar/tests/027.phpt

@@ -86,11 +86,11 @@ int(0)
 bool(false)
 opendir edge cases
 
-Warning: opendir(phar://): failed to open dir: 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 dir (phar://): 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 dir: phar error: invalid url or non-existent phar "phar://foo.phar/hi"
+Warning: opendir(): failed to open dir (phar://foo.phar/hi): 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)
 ===DONE===

ext/phar/tests/bug69720.phpt

@@ -24,7 +24,7 @@ try {
 --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://%s): phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d
 array(1) {
   ["whatever"]=>
   int(123)

ext/phar/tests/cache_list/frontcontroller22.phpt

@@ -17,6 +17,6 @@ Content-type: text/html; charset=UTF-8
 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 (./hi.php): 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

ext/phar/tests/create_new_phar_b.phpt

@@ -17,9 +17,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.ph
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.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://%screate_new_phar_b.phar.php/a.php): 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 (phar://%screate_new_phar_b.phar.php/a.php): %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
 

ext/phar/tests/create_path_error.phpt

@@ -66,17 +66,17 @@ foreach($checks as $check)
 --EXPECTF--
 string(5) "query"
 string(5) "query"
-1:Error: file_put_contents(phar://%s//): failed to open stream: phar error: file "" in phar "%s" cannot be empty
-2:Error: file_put_contents(phar://%s/.): failed to open stream: phar error: file "" in phar "%s" cannot be empty
-3:Error: file_put_contents(phar://%s/../): failed to open stream: phar error: file "" in phar "%s" cannot be empty
-4:Error: file_put_contents(phar://%s/a/..): failed to open stream: phar error: file "" in phar "%s" cannot be empty
+1:Error: file_put_contents(): failed to open stream (phar://%s//): phar error: file "" in phar "%s" cannot be empty
+2:Error: file_put_contents(): failed to open stream (phar://%s/.): phar error: file "" in phar "%s" cannot be empty
+3:Error: file_put_contents(): failed to open stream (phar://%s/../): phar error: file "" in phar "%s" cannot be empty
+4:Error: file_put_contents(): failed to open stream (phar://%s/a/..): phar error: file "" in phar "%s" cannot 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://%s): phar error: invalid path "%s" contains illegal character
+10:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character
+11:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character
+12:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character
+13:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character
 Error: Phar::offsetSet() expects parameter 1 to be a valid path, string given===DONE===

ext/phar/tests/delete.phpt

@@ -28,4 +28,4 @@ echo file_get_contents($pname . '/a') . "\n";
 --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://%sdelete.phar.php/a): phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16

ext/phar/tests/delete_in_phar.phpt

@@ -49,7 +49,7 @@ This is b/c
 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 (%sdelete_in_phar.phar.php/b/c.php): 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
 

ext/phar/tests/delete_in_phar_confirm.phpt

@@ -53,7 +53,7 @@ This is b/c
 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 (%sdelete_in_phar_confirm.phar.php/b/c.php): 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
 

ext/phar/tests/fgc_edgecases.phpt

@@ -79,7 +79,7 @@ echo file_get_contents("./hi");
 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://%sfgc_edgecases.phar.php/oops): 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

ext/phar/tests/fopen.phpt

@@ -38,5 +38,5 @@ include $fname;
 --EXPECTF--
 Warning: fopen() expects at least 2 parameters, 0 given in %sfopen.php on line %d
 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 (notfound.txt): No such file or directory in phar://%sfopen.phar.php/index.php on line %d
 ===DONE===

ext/phar/tests/fopen_edgecases.phpt

@@ -72,16 +72,16 @@ include $pname . '/test.php';
 <?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://%sfopen_edgecases.phar.php/b/c.php): 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://%sfopen_edgecases.phar.php.phar.gz): 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 (phar://%sfopen_edgecases.2.phar.php/hi): 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://): 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 (phar://foo.phar): %s in %sfopen_edgecases.php on line %d
 int(0)
 int(1)
 int(0)
@@ -119,6 +119,6 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/
 
 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 (./notfound.php): No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d
 
 ===DONE===

ext/phar/tests/fopen_edgecases2.phpt

@@ -39,5 +39,5 @@ Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_
 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://%sfopen_edgecases2.phar.php/oops): phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d
 ===DONE===