felipe                                   Sun, 19 Jun 2011 15:43:16 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312286

Log:
- Fix tests

Changed paths:
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_error.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13.phpt
    U   
php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8.phpt
    U   
php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8.phpt
    U   php/php-src/trunk/ext/standard/tests/file/file_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fnmatch_error.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fnmatch_variation.phpt
    U   php/php-src/trunk/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/readfile_variation10.phpt
    U   php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -69,15 +69,15 @@
 bool(false)
 -- Iteration 6 --

-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
-bool(false)
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 7 --

-Warning: file_get_contents() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d
+Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 9 --


Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -71,11 +71,11 @@
 9 bytes written to:
 -- Iteration 6 --

-Warning: file_put_contents(): Filename cannot be empty in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, string given in %s on line %d
 Failed to write data to: 
 -- Iteration 7 --

-Warning: file_put_contents() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, array given in %s on line %d
 Failed to write data to: Array
 -- Iteration 8 --


Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -145,19 +145,19 @@
 bool(false)

 --empty array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --int indexed array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --associative array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --nested arrays--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --uppercase NULL--
@@ -197,7 +197,7 @@
 bool(false)

 --instance of classWithoutToString--
-Error: 2 - file() expects parameter 1 to be string, object given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, object given, %s(%d)
 NULL

 --undefined var--

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_error.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_error.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -36,13 +36,13 @@
 ?>
 --EXPECTF--
 *** Testing error conditions for fnmatch() ***
-Warning: fnmatch() expects parameter 1 to be string, array given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL

-Warning: fnmatch() expects parameter 1 to be string, resource given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL

-Warning: fnmatch() expects parameter 1 to be string, object given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, object given in %s on line %d
 NULL

 Warning: fnmatch() expects at least 2 parameters, 1 given in %s on line %d%d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_variation.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_variation.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -134,7 +134,7 @@

 echo "\n*** Done ***\n";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing fnmatch() with file and various patterns ***
 -- Iteration 0 --
 bool(true)
@@ -183,9 +183,13 @@
 -- Iteration 22 --
 bool(false)
 -- Iteration 23 --
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 24 --
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 25 --
 bool(false)
 -- Iteration 26 --
@@ -259,45 +263,85 @@
 --- With Strings ---
 -- Iteration 0 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)
 -- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 2 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)
 -- Iteration 3 --
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 4 --
 bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
 bool(false)
 -- Iteration 5 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)

 --- With booleans ---
@@ -397,43 +441,65 @@
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 1 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 2 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 4 --
 bool(false)
 bool(false)
 bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
 bool(false)
 -- Iteration 5 --
 bool(false)
 bool(false)
 bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_rmdir_variation2.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_rmdir_variation2.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -64,13 +64,17 @@
 bool(false)

 *** Testing mkdir() and rmdir() for binary safe functionality ***
-bool(true)
-bool(true)

+Warning: mkdir() expects parameter 1 to be a valid path, string given in %s on line %d
+bool(false)
+
+Warning: rmdir(%s): No such file or directory in %s on line %d
+bool(false)
+
 *** Testing mkdir() with miscelleneous input ***
 bool(true)

-Warning: mkdir(): Permission denied in %sfile/mkdir_rmdir_variation2.php on line %d
+Warning: mkdir(): Permission denied in %s on line %d
 bool(false)
 bool(true)
 Done

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -66,10 +66,10 @@
 Warning: readfile( ): failed to open stream: %s in %s on line %d
 -- testing '' --

-Warning: readfile(): Filename cannot be empty in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, string given in %s on line %d
 -- testing 'Array' --

-Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, array given in %s on line %d
 -- testing '%sdir' --

 Warning: readfile(%sdir): failed to open stream: %s in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -99,19 +99,21 @@
 bool(false)
 -- testing '%s' --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename() %s in %s on line %d
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+
+Warning: rename() expects parameter 1 to be a valid path, string given in %s on line %d
 bool(false)
 -- testing 'Array' --

-Warning: rename() expects parameter 2 to be string, array given in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, array given in %s on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, array given in %s on line %d

-Warning: rename() expects parameter 1 to be string, array given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, array given in %s on line %d
 bool(false)
 -- testing '/no/such/file/dir' --


Modified: php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -69,15 +69,15 @@
 bool(false)
 -- Iteration 6 --

-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
-bool(false)
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 7 --

-Warning: file_get_contents() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d
+Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 9 --


Modified: php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -71,11 +71,11 @@
 9 bytes written to:
 -- Iteration 6 --

-Warning: file_put_contents(): Filename cannot be empty in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, string given in %s on line %d
 Failed to write data to: 
 -- Iteration 7 --

-Warning: file_put_contents() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, array given in %s on line %d
 Failed to write data to: Array
 -- Iteration 8 --


Modified: php/php-src/trunk/ext/standard/tests/file/file_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/file_variation2.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/file_variation2.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -145,19 +145,19 @@
 bool(false)

 --empty array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --int indexed array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --associative array--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --nested arrays--
-Error: 2 - file() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL

 --uppercase NULL--
@@ -197,7 +197,7 @@
 bool(false)

 --instance of classWithoutToString--
-Error: 2 - file() expects parameter 1 to be string, object given, %s(%d)
+Error: 2 - file() expects parameter 1 to be a valid path, object given, %s(%d)
 NULL

 --undefined var--

Modified: php/php-src/trunk/ext/standard/tests/file/fnmatch_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fnmatch_error.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/fnmatch_error.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -36,13 +36,13 @@
 ?>
 --EXPECTF--
 *** Testing error conditions for fnmatch() ***
-Warning: fnmatch() expects parameter 1 to be string, array given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL

-Warning: fnmatch() expects parameter 1 to be string, resource given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL

-Warning: fnmatch() expects parameter 1 to be string, object given in %s on line %d%d
+Warning: fnmatch() expects parameter 1 to be a valid path, object given in %s on line %d
 NULL

 Warning: fnmatch() expects at least 2 parameters, 1 given in %s on line %d%d

Modified: php/php-src/trunk/ext/standard/tests/file/fnmatch_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fnmatch_variation.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/fnmatch_variation.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -134,7 +134,7 @@

 echo "\n*** Done ***\n";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing fnmatch() with file and various patterns ***
 -- Iteration 0 --
 bool(true)
@@ -183,9 +183,13 @@
 -- Iteration 22 --
 bool(false)
 -- Iteration 23 --
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 24 --
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 25 --
 bool(false)
 -- Iteration 26 --
@@ -259,45 +263,85 @@
 --- With Strings ---
 -- Iteration 0 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)
 -- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 2 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)
 -- Iteration 3 --
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 4 --
 bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
 bool(false)
 -- Iteration 5 --
 bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)

 --- With booleans ---
@@ -397,43 +441,65 @@
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 1 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 2 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
 bool(false)
 -- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
+
+Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
 -- Iteration 4 --
 bool(false)
 bool(false)
 bool(false)
-bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(true)
 bool(false)
 -- Iteration 5 --
 bool(false)
 bool(false)
 bool(false)
+
+Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
 bool(false)
-bool(false)
 bool(true)

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/mkdir_rmdir_variation2.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/mkdir_rmdir_variation2.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -64,13 +64,17 @@
 bool(false)

 *** Testing mkdir() and rmdir() for binary safe functionality ***
-bool(true)
-bool(true)

+Warning: mkdir() expects parameter 1 to be a valid path, string given in %s on line %d
+bool(false)
+
+Warning: rmdir(%s): No such file or directory in %s on line %d
+bool(false)
+
 *** Testing mkdir() with miscelleneous input ***
 bool(true)

-Warning: mkdir(): Permission denied in %sfile/mkdir_rmdir_variation2.php on line %d
+Warning: mkdir(): Permission denied in %s on line %d
 bool(false)
 bool(true)
 Done

Modified: php/php-src/trunk/ext/standard/tests/file/readfile_variation10.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/readfile_variation10.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/readfile_variation10.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -66,10 +66,10 @@
 Warning: readfile( ): failed to open stream: %s in %s on line %d
 -- testing '' --

-Warning: readfile(): Filename cannot be empty in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, string given in %s on line %d
 -- testing 'Array' --

-Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, array given in %s on line %d
 -- testing '%sdir' --

 Warning: readfile(%sdir): failed to open stream: %s in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt	2011-06-19 14:50:44 UTC (rev 312285)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt	2011-06-19 15:43:16 UTC (rev 312286)
@@ -99,19 +99,21 @@
 bool(false)
 -- testing '%s' --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename() %s in %s on line %d
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+
+Warning: rename() expects parameter 1 to be a valid path, string given in %s on line %d
 bool(false)
 -- testing 'Array' --

-Warning: rename() expects parameter 2 to be string, array given in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, array given in %s on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, array given in %s on line %d

-Warning: rename() expects parameter 1 to be string, array given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, array given in %s on line %d
 bool(false)
 -- testing '/no/such/file/dir' --

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

Reply via email to