felipe          Thu Jan  8 18:47:27 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/file    007_error.phpt 
                                        file_get_contents_variation8.phpt 
                                        file_variation2.phpt 
                                        readfile_error.phpt 
                                        readfile_variation10.phpt 
  Log:
  - MFH: Fixed tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.1.2.1.2.3&r2=1.1.2.1.2.4&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.1.2.3 
php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.4
--- php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.3  Wed Nov 26 
10:10:17 2008
+++ php-src/ext/standard/tests/file/007_error.phpt      Thu Jan  8 18:47:26 2009
@@ -164,6 +164,8 @@
 Warning: feof() expects parameter 1 to be resource, object given in %s on line 
%d
 bool(false)
 -- Iteration 7 --
+
+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
@@ -172,6 +174,8 @@
 Warning: feof() expects parameter 1 to be resource, null given in %s on line %d
 bool(false)
 -- Iteration 8 --
+
+Warning: fopen(): Filename cannot be empty in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, string given in %s on 
line %d
@@ -179,4 +183,3 @@
 
 Warning: feof() expects parameter 1 to be resource, string given in %s on line 
%d
 bool(false)
-
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8.phpt?r1=1.1.4.2&r2=1.1.4.3&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.4.2 
php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.1.4.2   
Wed Nov 26 10:10:16 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation8.phpt   Thu Jan 
 8 18:47:26 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 --
 
@@ -69,11 +77,11 @@
 NULL
 -- Iteration 8 --
 
-Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such 
file or directory in %s on line %d
+Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s 
on line %d
 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: No such file or 
directory 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.4.2&r2=1.1.4.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.1.4.2 
php-src/ext/standard/tests/file/file_variation2.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/file_variation2.phpt:1.1.4.2        Wed Jun 
11 12:38:56 2008
+++ php-src/ext/standard/tests/file/file_variation2.phpt        Thu Jan  8 
18:47:26 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,16 +181,19 @@
 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--
-Error: 2 - file(Class A object): failed to open stream: No such file or 
directory, %s(%d)
+Error: 2 - file(Class A object): failed to open stream: %s, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
@@ -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/readfile_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&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.1.2.1
--- 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 18:47:26 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/readfile_variation10.phpt
diff -u php-src/ext/standard/tests/file/readfile_variation10.phpt:1.1.4.2 
php-src/ext/standard/tests/file/readfile_variation10.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/readfile_variation10.phpt:1.1.4.2   Wed Nov 
26 10:10:19 2008
+++ php-src/ext/standard/tests/file/readfile_variation10.phpt   Thu Jan  8 
18:47:26 2009
@@ -53,20 +53,15 @@
 
 Warning: readfile(1): failed to open stream: No such file or directory in %s 
on line %d
 -- testing '' --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
 -- testing '' --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
 -- testing '' --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
 -- testing ' ' --
 
 Warning: readfile( ): failed to open stream: No such file or directory in %s 
on line %d
--- testing '%s' --
--- testing 'Array' --
-
-Warning: readfile() expects parameter 1 to be string, array given in %s on 
line %d
--- testing '/no/such/file/dir' --
-
-Warning: readfile(/no/such/file/dir): failed to open stream: No such file or 
directory in %s on line %d
--- testing 'php/php' --
-
-Warning: readfile(php/php): failed to open stream: %s directory in %s on line 
%d
-
-*** Done ***
\ No newline at end of file
+-- testing '



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

Reply via email to