From: Felipe Pena Date: Thu, 8 Jan 2009 18:46:55 +0000 (+0000) Subject: - Fixed tests X-Git-Tag: php-5.4.0alpha1~191^2~4589 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2aae851d58a7164e6c94dcf12381e96339b2c616;p=php - Fixed tests --- diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 8f4b47ab7a..f451f2070a 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -81,28 +81,28 @@ Warning: fclose(): 5 is not a valid stream resource in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) +NULL Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) +NULL Warning: feof(): 5 is not a valid stream resource in %s on line %d bool(false) Warning: feof() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) +NULL Warning: feof() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) +NULL Warning: fopen() expects at most 4 parameters, 5 given in %s on line %d bool(false) Warning: fclose() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) +NULL Warning: feof() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) +NULL -- Testing fopen(), fclose() & feof() with invalid arguments -- -- Iteration 1 -- @@ -110,40 +110,40 @@ Warning: fopen(string): failed to open stream: No such file or directory in %s o bool(false) Warning: fclose() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) +NULL -- Iteration 2 -- Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, integer given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, integer given in %s on line %d -bool(false) +NULL -- Iteration 3 -- Warning: fopen(10.5): failed to open stream: No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, double given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, double given in %s on line %d -bool(false) +NULL -- Iteration 4 -- Warning: fopen(1): failed to open stream: No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, boolean given in %s on line %d -bool(false) +NULL -- Iteration 5 -- Notice: Array to string conversion in %s on line %d @@ -152,24 +152,27 @@ Warning: fopen() expects parameter 1 to be string, array given in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, array given in %s on line %d -bool(false) +NULL -- Iteration 6 -- + +Warning: fopen(): Filename cannot be empty in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, null given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, null given in %s on line %d -bool(false) +NULL -- Iteration 7 -- + +Warning: fopen(): Filename cannot be empty in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) +NULL Warning: feof() expects parameter 1 to be resource, Unicode string given in %s on line %d -bool(false) - +NULL diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt index 117a855690..018e691f8f 100644 --- a/ext/standard/tests/file/file_variation2.phpt +++ b/ext/standard/tests/file/file_variation2.phpt @@ -165,9 +165,11 @@ Error: 2 - file(Array): failed to open stream: No such file or directory, %s(%d) bool(false) --uppercase NULL-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --lowercase null-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --lowercase true-- @@ -175,6 +177,7 @@ Error: 2 - file(1): failed to open stream: No such file or directory, %s(%d) bool(false) --lowercase false-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --uppercase TRUE-- @@ -182,12 +185,15 @@ Error: 2 - file(1): failed to open stream: No such file or directory, %s(%d) bool(false) --uppercase FALSE-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --empty string DQ-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --empty string SQ-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --instance of classWithToString-- @@ -201,8 +207,10 @@ Error: 2 - file(Object): failed to open stream: No such file or directory, %s(%d bool(false) --undefined var-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) --unset var-- +Error: 2 - file(): Filename cannot be empty, %s(%d) bool(false) ===DONE=== diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt index 3bac452187..c6caec1bfb 100644 --- a/ext/standard/tests/file/readfile_error.phpt +++ b/ext/standard/tests/file/readfile_error.phpt @@ -38,8 +38,14 @@ Warning: readfile() expects at most 3 parameters, 4 given in %s on line %d bool(false) -- Testing readfile() with invalid arguments -- + +Warning: readfile(): Filename cannot be empty in %s on line %d bool(false) + +Warning: readfile(): Filename cannot be empty in %s on line %d bool(false) + +Warning: readfile(): Filename cannot be empty in %s on line %d bool(false) Warning: readfile() expects parameter 3 to be resource, Unicode string given in %s on line %d