felipe                                   Mon, 06 Jun 2011 22:36:54 +0000

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

Log:
- Test fixes

Changed paths:
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/007_error.phpt
    U   php/php-src/trunk/ext/standard/tests/file/bug39863.phpt
    U   php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt
    U   
php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt
    U   php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -201,7 +201,7 @@

 -- Iteration 18 --

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

 -- Iteration 19 --
@@ -230,6 +230,6 @@

 -- Iteration 25 --

-Warning: chdir() expects parameter 1 to be string, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be valid path, resource given in %s on line %d
 bool(false)
 ===DONE===

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -205,7 +205,7 @@

 -- Iteration 18 --

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

 -- Iteration 19 --
@@ -248,6 +248,6 @@

 -- Iteration 25 --

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -145,7 +145,7 @@
 bool(false)
 -- Iteration 5 --

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

 Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@
 bool(false)
 -- Iteration 6 --

-Warning: fopen() expects parameter 1 to be string, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
 bool(false)

 Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -16,7 +16,8 @@
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
 PASS
 ===DONE===


Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -143,19 +143,19 @@
 bool(false)

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

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

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

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

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

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

 --undefined var--

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -105,19 +105,35 @@
 float(%d)

 -- Iteration 9 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 10 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 11 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 12 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 --- Done ---

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -99,17 +99,25 @@
 float(%d)

 -- Iteration 9 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 10 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 11 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 12 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 *** Testing with Binary Input ***
-float(%d)
+float(64246190080)

 --- Done ---

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -58,7 +58,7 @@
 bool(false)
 bool(false)

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

 Warning: filegroup(): stat failed for 1234 in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -74,8 +74,12 @@
 Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -59,7 +59,7 @@
 bool(false)
 bool(false)

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

 Warning: fileinode(): stat failed for 1234 in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -75,8 +75,12 @@
 Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -59,7 +59,7 @@
 bool(false)
 bool(false)

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

 Warning: fileowner(): stat failed for 1234 in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -75,8 +75,12 @@
 Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -58,7 +58,7 @@
 bool(false)
 bool(false)

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

 Warning: fileperms(): stat failed for 1234 in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -74,8 +74,12 @@
 Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -201,7 +201,7 @@

 -- Iteration 18 --

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

 -- Iteration 19 --
@@ -230,6 +230,6 @@

 -- Iteration 25 --

-Warning: chdir() expects parameter 1 to be string, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be valid path, resource given in %s on line %d
 bool(false)
 ===DONE===

Modified: php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -205,7 +205,7 @@

 -- Iteration 18 --

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

 -- Iteration 19 --
@@ -248,6 +248,6 @@

 -- Iteration 25 --

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

Modified: php/php-src/trunk/ext/standard/tests/file/007_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/007_error.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/007_error.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -145,7 +145,7 @@
 bool(false)
 -- Iteration 5 --

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

 Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@
 bool(false)
 -- Iteration 6 --

-Warning: fopen() expects parameter 1 to be string, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
 bool(false)

 Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/bug39863.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/bug39863.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/bug39863.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -16,7 +16,8 @@
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
 PASS
 ===DONE===


Modified: php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -143,19 +143,19 @@
 bool(false)

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

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

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

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

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

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

 --undefined var--

Modified: php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -105,19 +105,35 @@
 float(%d)

 -- Iteration 9 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 10 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 11 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 12 --
-float(%d)
-float(%d)

+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 --- Done ---

Modified: php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -99,17 +99,25 @@
 float(%d)

 -- Iteration 9 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 10 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 11 --
-float(%d)

+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 12 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 *** Testing with Binary Input ***
-float(%d)
+float(64246190080)

 --- Done ---

Modified: php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -58,7 +58,7 @@
 bool(false)
 bool(false)

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

 Warning: filegroup(): stat failed for 1234 in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -74,8 +74,12 @@
 Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -59,7 +59,7 @@
 bool(false)
 bool(false)

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

 Warning: fileinode(): stat failed for 1234 in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -75,8 +75,12 @@
 Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -59,7 +59,7 @@
 bool(false)
 bool(false)

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

 Warning: fileowner(): stat failed for 1234 in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -75,8 +75,12 @@
 Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -58,7 +58,7 @@
 bool(false)
 bool(false)

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

 Warning: fileperms(): stat failed for 1234 in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-06 21:42:05 UTC (rev 311871)
+++ php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-06 22:36:54 UTC (rev 311872)
@@ -74,8 +74,12 @@
 Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)

+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 *** Done ***
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to