felipe          Thu Jan  8 18:46:55 2009 UTC

  Modified files:              
    /php-src/ext/standard/tests/file    007_error.phpt 
                                        file_variation2.phpt 
                                        readfile_error.phpt 
  Log:
  - Fixed tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.7&r2=1.8&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.7 
php-src/ext/standard/tests/file/007_error.phpt:1.8
--- php-src/ext/standard/tests/file/007_error.phpt:1.7  Wed Nov 26 17:48:40 2008
+++ php-src/ext/standard/tests/file/007_error.phpt      Thu Jan  8 18:46:55 2009
@@ -81,28 +81,28 @@
 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 @@
 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 @@
 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation2.phpt?r1=1.2&r2=1.3&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.2 
php-src/ext/standard/tests/file/file_variation2.phpt:1.3
--- php-src/ext/standard/tests/file/file_variation2.phpt:1.2    Wed Jun 11 
12:40:34 2008
+++ php-src/ext/standard/tests/file/file_variation2.phpt        Thu Jan  8 
18:46:55 2009
@@ -165,9 +165,11 @@
 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 @@
 bool(false)
 
 --lowercase false--
+Error: 2 - file(): Filename cannot be empty, %s(%d)
 bool(false)
 
 --uppercase TRUE--
@@ -182,12 +185,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--
@@ -201,8 +207,10 @@
 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===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_error.phpt?r1=1.3&r2=1.4&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.3 
php-src/ext/standard/tests/file/readfile_error.phpt:1.4
--- php-src/ext/standard/tests/file/readfile_error.phpt:1.3     Tue May 27 
09:34:54 2008
+++ php-src/ext/standard/tests/file/readfile_error.phpt Thu Jan  8 18:46:55 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, Unicode string given 
in %s on line %d



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to