Replace hardcoded resource ids with %d in fgetc() tests.

2 files changed, 109 insertions, 122 deletions

diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt
index d82110f784..7851e432f3 100644
--- a/ext/standard/tests/file/fgetc_basic.phpt
+++ b/ext/standard/tests/file/fgetc_basic.phpt
@@ -69,475 +69,475 @@ echo "Done\n";
 string(1) "2"
 int(1)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) "2"
 int(1)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) "2"
 int(1)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) "2"
 int(1)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 5 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+b mode --
 string(1) "2"
 int(1)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 6 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+t mode --
 string(1) "2"
 int(1)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(2)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(3)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(4)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(5)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 string(1) "2"
 int(6)
 bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
 --- Outerloop iteration 2 ---
 -- Innerloop iteration 1 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using r mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 5 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using r+b mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 6 of Outerloop Iteration 2 --
 -- Testing fgetc() : file opened using r+t mode --
 string(1) "t"
 int(1)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(2)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 string(1) "x"
 int(3)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(4)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 string(1) " "
 int(5)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 string(1) "t"
 int(6)
 bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
 --- Outerloop iteration 3 ---
 -- Innerloop iteration 1 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using r mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 5 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using r+b mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 6 of Outerloop Iteration 3 --
 -- Testing fgetc() : file opened using r+t mode --
 string(1) "l"
 int(1)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 string(1) "i"
 int(2)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 string(1) "n"
 int(3)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 string(1) "e"
 int(4)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 string(1) "
 "
 int(5)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 string(1) "l"
 int(6)
 bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt
index d733c29092..e7f22b3041 100644
--- a/ext/standard/tests/file/fgetc_variation2.phpt
+++ b/ext/standard/tests/file/fgetc_variation2.phpt
@@ -41,20 +41,7 @@ echo "Done";
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
-bool(false)
--- Testing fgetc() with unset handle --
-
-Notice: Undefined variable: file_handle in %s on line %d
-
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing fgetc() : usage variations ***
--- Testing fgetc() with closed handle --
-
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --