Attempt to bless tests (ext/standard/tests/file)

I'm applying the needed test output changes to a limited set of tests to
see what needs to be changed with bless, and what output needs to be
fixed with bless.

Some issues I remember fixing:

- the fscanf tests pass format strings that now become visible as
  function parameters in the expect section, so i had to manually change
  these to %s
- some tests have output that could be either, bless changed to only the
  specific output i got (change it back)
- some cases of filenames outside the function params occuring that bless
  missed, cleaned those up

Author: NattyNarwhal

ext/standard/tests/file/005_error.phpt

@@ -18,16 +18,16 @@ echo "\nDone";
 *** Testing error conditions ***
 
 -- Testing with  Non-existing files --
-Warning: fileatime(): stat failed for /no/such/file/or/dir in %s on line %d
+Warning: fileatime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
 bool(false)
 
-Warning: filemtime(): stat failed for /no/such/file/or/dir in %s on line %d
+Warning: filemtime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
 bool(false)
 
-Warning: filectime(): stat failed for /no/such/file/or/dir in %s on line %d
+Warning: filectime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
 bool(false)
 
-Warning: touch(): Unable to create file /no/such/file/or/dir because No such file or directory in %s on line %d
+Warning: touch('%s', 10): Unable to create file /no/such/file/or/dir because No such file or directory in %s on line %d
 bool(false)
 
 Done

ext/standard/tests/file/006_error.phpt

@@ -32,18 +32,18 @@ echo "\n*** Done ***\n";
 --EXPECTF--
 *** Testing error conditions for fileperms(), chmod() ***
 
-Warning: chmod(): %s in %s on line %d
+Warning: chmod('/etc/passwd', 511): Operation not permitted in %s on line %d
 bool(false)
 100%d44
 
-Warning: chmod(): %s in %s on line %d
+Warning: chmod('/etc', 511): Operation not permitted in %s on line %d
 bool(false)
 40755
 
-Warning: chmod(): No such file or directory in %s on line %d
+Warning: chmod('%s', 511): No such file or directory in %s on line %d
 bool(false)
 
-Warning: fileperms(): stat failed for /no/such/file/dir in %s on line %d
+Warning: fileperms('%s'): stat failed for /no/such/file/dir in %s on line %d
 bool(false)
 
 

ext/standard/tests/file/007_variation1.phpt

@@ -38,7 +38,7 @@ string(20) "line
 line of text
 li"
 
-Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fwrite(Resource id #%d, 'abcdefghij\nmnop...'): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 bool(true)
 string(7) "Unknown"

ext/standard/tests/file/007_variation11.phpt

@@ -56,7 +56,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation13.phpt

@@ -46,7 +46,7 @@ resource(%d) of type (stream)
 string(6) "stream"
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation15.phpt

@@ -48,7 +48,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation17.phpt

@@ -38,7 +38,7 @@ string(20) "line
 line of text
 li"
 
-Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fwrite(Resource id #%d, 'abcdefghij\nmnop...'): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 bool(true)
 string(7) "Unknown"

ext/standard/tests/file/007_variation19.phpt

@@ -51,7 +51,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation21.phpt

@@ -41,7 +41,7 @@ resource(%d) of type (stream)
 string(6) "stream"
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation23.phpt

@@ -39,7 +39,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation3.phpt

@@ -51,7 +51,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation5.phpt

@@ -41,7 +41,7 @@ resource(%d) of type (stream)
 string(6) "stream"
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation7.phpt

@@ -39,7 +39,7 @@ int(0)
 int(37)
 int(37)
 
-Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation9.phpt

@@ -38,7 +38,7 @@ string(20) "line
 line of text
 li"
 
-Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fwrite(Resource id #%d, 'abcdefghij\nmnop...'): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
 bool(false)
 bool(true)
 string(7) "Unknown"

ext/standard/tests/file/bug35781.phpt

@@ -19,7 +19,7 @@ var_dump(file_get_contents($filename));
 echo "Done\n";
 ?>
 --EXPECTF--
-Notice: fpassthru(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
+Notice: fpassthru(Resource id #%d): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
 string(15) "Guvf vf n grfg
 "
 Done

ext/standard/tests/file/bug43353.phpt

@@ -16,5 +16,5 @@ bool(false)
 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/pl...'): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/standard/tests/file/bug45303.phpt

@@ -9,5 +9,5 @@ var_dump(fseek($fd, 1024*1024, SEEK_SET));
 --EXPECTF--
 resource(%d) of type (stream)
 
-Warning: fseek(): Stream does not support seeking in %s
+Warning: fseek(Resource id #%d, 1048576, 0): Stream does not support seeking in %s on line %d
 int(-1)

ext/standard/tests/file/bug52624.phpt

@@ -9,6 +9,6 @@ echo tempnam("directory_that_not_exists", "prefix_");
 
 ?>
 --EXPECTF--
-Notice: tempnam(): file created in the system's temporary directory in %sbug52624.php on line %d
+Notice: tempnam('directory_that_...', 'prefix_'): file created in the system's temporary directory in %s on line %d
 
-Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d
+Warning: tempnam('directory_that_...', 'prefix_'): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d

ext/standard/tests/file/bug71287.phpt

@@ -18,4 +18,4 @@ stream_wrapper_register('test', Stream::class);
 file_put_contents('test://file.txt', 'foobarbaz');
 ?>
 --EXPECTF--
-Warning: file_put_contents(): Only 7 of 9 bytes written, possibly out of free disk space in %sbug71287.php on line %d
+Warning: file_put_contents('test://file.txt', 'foobarbaz'): Only 7 of 9 bytes written, possibly out of free disk space in %s on line %d

ext/standard/tests/file/chgrp.phpt

@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECTF--
-Warning: chgrp(): No such file or directory in %s on line %d
+Warning: chgrp('sjhgfskhagkfdgs...', 0): No such file or directory in %s on line %d

ext/standard/tests/file/chmod_error.phpt

@@ -12,5 +12,5 @@ var_dump(chmod($filename, 0777));
 --EXPECTF--
 *** Testing chmod() : error conditions ***
 
-Warning: chmod(): No such file or directory in %s on line %d
+Warning: chmod('___nonExisiting...', 511): No such file or directory in %s on line %d
 bool(false)

ext/standard/tests/file/chmod_variation2.phpt

@@ -70,7 +70,7 @@ bool(true)
 chmod() on a path containing .. with invalid directories
 bool(true)
 
-Warning: chmod(): No such file or directory in %s on line %d
+Warning: chmod('./chmod_variati...', 493): No such file or directory in %s on line %d
 bool(false)
 777
 

ext/standard/tests/file/chown.phpt

@@ -11,5 +11,5 @@ chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", 0);
 echo "ALIVE\n";
 ?>
 --EXPECTF--
-Warning: chown(): No such file or directory in %s on line %d
+Warning: chown('sjhgfskhagkfdgs...', 0): No such file or directory in %s on line %d
 ALIVE

ext/standard/tests/file/copy_error.phpt

@@ -11,6 +11,6 @@ echo "*** Done ***\n";
 --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('/no/file', 'file'): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 *** Done ***

ext/standard/tests/file/copy_variation12.phpt

@@ -33,11 +33,11 @@ rmdir(__DIR__."/copy_variation12");
 --EXPECTF--
 *** Test copy() function: Trying to create a copy of an existing dir ***
 
-Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation12.php on line %d
+Warning: copy('%s'): The first argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 bool(false)
 int(%d)
 
-Warning: filesize(): stat failed for %scopy_copy_variation12 in %scopy_variation12.php on line %d
+Warning: filesize('%s'): stat failed for %scopy_copy_variation12 in %s on line %d
 bool(false)
 *** Done ***

ext/standard/tests/file/copy_variation13.phpt

@@ -37,7 +37,7 @@ rmdir(__DIR__."/copy_variation13");
 *** Test copy() function: Trying to copy dir to file ***
 *** Testing copy() in copying dir to file ***
 
-Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation13.php on line %d
+Warning: copy('%s'): The first argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 bool(true)
 bool(true)

ext/standard/tests/file/copy_variation4.phpt

@@ -84,7 +84,7 @@ Size of the source file before copy operation => int(1500)
 -- Iteration 1 --
 Existence of destination file before copy => bool(true)
 Copy operation => 
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
+Warning: copy('%s'): The second argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 Existence of destination file => bool(true)
 Destination file name => %s/
@@ -96,7 +96,7 @@ Warning: unlink(%s): %s
 -- Iteration 2 --
 Existence of destination file before copy => bool(true)
 Copy operation => 
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
+Warning: copy('%s'): The second argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 Existence of destination file => bool(true)
 Destination file name => %s/
@@ -108,7 +108,7 @@ Warning: unlink(%s): %s
 -- Iteration 3 --
 Existence of destination file before copy => bool(true)
 Copy operation => 
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
+Warning: copy('%s'): The second argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 Existence of destination file => bool(true)
 Destination file name => %s/
@@ -120,7 +120,7 @@ Warning: unlink(%s): %s
 -- Iteration 4 --
 Existence of destination file before copy => bool(true)
 Copy operation => 
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
+Warning: copy('%s'): The second argument to copy() function cannot be a directory in %s on line %d
 bool(false)
 Existence of destination file => bool(true)
 Destination file name => %s/

ext/standard/tests/file/disk.phpt

@@ -25,17 +25,17 @@ var_dump(disk_total_space("/some/path/here"));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: disk_free_space(): No such file or directory in %s on line %d
+Warning: disk_free_space('-1'): No such file or directory in %s on line %d
 bool(false)
 
-Warning: disk_total_space(): No such file or directory in %s on line %d
+Warning: disk_total_space('-1'): No such file or directory in %s on line %d
 bool(false)
 float(%f)
 float(%f)
 
-Warning: disk_free_space(): No such file or directory in %s on line %d
+Warning: disk_free_space('/some/path/here'): No such file or directory in %s on line %d
 bool(false)
 
-Warning: disk_total_space(): No such file or directory in %s on line %d
+Warning: disk_total_space('/some/path/here'): No such file or directory in %s on line %d
 bool(false)
 Done

ext/standard/tests/file/disk_free_space_error.phpt

@@ -30,10 +30,10 @@ unlink($file_path."/disk_free_space.tmp");
 --EXPECTF--
 *** Testing error conditions ***
 
-Warning: disk_free_space(): No such file or directory in %s on line %d
+Warning: disk_free_space('%s'): No such file or directory in %s on line %d
 bool(false)
 
-Warning: diskfreespace(): No such file or directory in %s on line %d
+Warning: diskfreespace('%s'): No such file or directory in %s on line %d
 bool(false)
 float(%f)
 float(%f)

ext/standard/tests/file/disk_total_space_error.phpt

@@ -29,7 +29,7 @@ unlink($file_path."/disk_total_space.tmp");
 --EXPECTF--
 *** Testing error conditions ***
 
-Warning: disk_total_space(): No such file or directory in %s on line %d
+Warning: disk_total_space('%s'): No such file or directory in %s on line %d
 bool(false)
 float(%f)
 

ext/standard/tests/file/fdatasync.phpt

@@ -67,7 +67,7 @@ bool(false)
 
 *** Testing fdatasync(): for non-file stream ***
 
-Warning: fdatasync(): Can't fsync this stream! in %s on line %d
+Warning: fdatasync(Resource id #%d): Can't fsync this stream! in %s on line %d
 bool(false)
 
 *** Done ***