felipe Thu Jan 8 20:03:32 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file 007_error.phpt
file_get_contents_variation8.phpt
file_variation2.phpt
parse_ini_file_variation4.phpt
readfile_error.phpt
Log:
- MFH: Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/007_error.phpt
diff -u php-src/ext/standard/tests/file/007_error.phpt:1.1.2.2
php-src/ext/standard/tests/file/007_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/007_error.phpt:1.1.2.2 Tue Nov 25
11:31:25 2008
+++ php-src/ext/standard/tests/file/007_error.phpt Thu Jan 8 20:03:32 2009
@@ -74,7 +74,7 @@
Warning: fopen() expects at least 2 parameters, 0 given in %s on line %d
bool(false)
-Warning: fclose(): %d is not a valid stream resource in %s on line %d
+Warning: fclose(): 5 is not a valid stream resource in %s on line %d
bool(false)
Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
@@ -83,7 +83,7 @@
Warning: Wrong parameter count for fclose() in %s on line %d
NULL
-Warning: feof(): %d is not a valid stream resource in %s on line %d
+Warning: feof(): 5 is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
@@ -162,6 +162,8 @@
Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
bool(false)
-- Iteration 7 --
+
+Warning: fopen(): Filename cannot be empty in %s on line %d
bool(false)
Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
@@ -170,6 +172,8 @@
Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
bool(false)
-- Iteration 8 --
+
+Warning: fopen(): Filename cannot be empty in %s on line %d
bool(false)
Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_variation8.phpt
diff -u
php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.1.2.1
php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.1.2.1
Tue Nov 25 11:31:24 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation8.phpt Thu Jan
8 20:03:32 2009
@@ -52,16 +52,24 @@
Warning: file_get_contents(1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
-- Iteration 2 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 3 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 4 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 5 --
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(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 7 --
@@ -73,7 +81,7 @@
bool(false)
-- Iteration 9 --
-Warning: file_get_contents(php/php): failed to open stream: %s directory in %s
on line %d
+Warning: file_get_contents(php/php): failed to open stream: %s in %s on line %d
bool(false)
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/file_variation2.phpt
diff -u php-src/ext/standard/tests/file/file_variation2.phpt:1.1.2.1
php-src/ext/standard/tests/file/file_variation2.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/file_variation2.phpt:1.1.2.1 Wed Jun
11 12:38:02 2008
+++ php-src/ext/standard/tests/file/file_variation2.phpt Thu Jan 8
20:03:32 2009
@@ -161,9 +161,11 @@
NULL
--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--
@@ -171,6 +173,7 @@
bool(false)
--lowercase false--
+Error: 2 - file(): Filename cannot be empty, %s(%d)
bool(false)
--uppercase TRUE--
@@ -178,12 +181,15 @@
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--
@@ -195,8 +201,10 @@
NULL
--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===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt
diff -u php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.1.2.1
php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.1.2.1
Tue Nov 25 11:31:25 2008
+++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt Thu Jan
8 20:03:32 2009
@@ -165,9 +165,11 @@
bool(false)
--uppercase NULL--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--lowercase null--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--lowercase true--
@@ -175,6 +177,7 @@
bool(false)
--lowercase false--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--uppercase TRUE--
@@ -182,12 +185,15 @@
bool(false)
--uppercase FALSE--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--empty string DQ--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--empty string SQ--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--instance of classWithToString--
@@ -201,8 +207,10 @@
bool(false)
--undefined var--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
--unset var--
+Error: 2 - parse_ini_file(): Filename cannot be empty, %s(%d)
bool(false)
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_error.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readfile_error.phpt
diff -u php-src/ext/standard/tests/file/readfile_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/readfile_error.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readfile_error.phpt:1.1.2.1 Fri Jul 20
18:07:02 2007
+++ php-src/ext/standard/tests/file/readfile_error.phpt Thu Jan 8 20:03:32 2009
@@ -38,8 +38,14 @@
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, string given in %s on
line %d
@@ -50,6 +56,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(%s/non_existent_file.tmp): failed to open stream: No such
file or directory in %s on line %d
bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
