felipe                                   Tue, 07 Jun 2011 02:29:03 +0000

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

Log:
- Test fixes

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
    U   php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt
    U   php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt
    U   php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt
    U   php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -325,21 +325,25 @@
 }

 -- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/glob_variation/WONDER5"
-}
-array(0) {
-}
-array(0) {
-}

+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 9 --
 array(0) {
 }
@@ -441,8 +445,9 @@
 array(0) {
 }
 -- Iteration 8 --
-array(0) {
-}
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
 array(0) {
 }

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -42,7 +42,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -77,9 +77,13 @@
 bool(false)

 -- Iteration 9 --
-bool(true)

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

+Warning: is_dir() 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/is_executable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -76,9 +76,13 @@
 -- Iteration 5 --
 bool(false)
 -- Iteration 6 --
-bool(true)
+
+Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 7 --
-bool(true)
+
+Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
 bool(false)
 -- Iteration 9 --

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -62,7 +62,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -45,7 +45,7 @@
 NULL
 bool(false)

-Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d
+Warning: is_file() 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/is_file_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -51,7 +51,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,8 +67,12 @@
 - Iteration 6 -
 bool(false)
 - Iteration 7 -
-bool(true)
+
+Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-bool(true)

+Warning: is_file() 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/is_readable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -87,11 +87,17 @@
 -- Iteration 6 --
 bool(false)
 -- Iteration 7 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 10 --
 bool(true)
 -- Iteration 11 --

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -61,7 +61,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -96,18 +96,30 @@
 bool(false)
 bool(false)
 -- Iteration 7 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 10 --
 bool(true)
 bool(true)
 -- Iteration 11 --
 bool(true)
 bool(true)
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,10 +67,10 @@
 bool(false)
 bool(false)

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

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,10 +67,10 @@
 Warning: lchown(): No such file or directory in %s on line %d
 bool(false)

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

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

 Warning: lchown(): Operation not permitted in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -51,7 +51,7 @@
 Warning: lstat(): Lstat failed for 22 in %s on line %d
 bool(false)

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

 *** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@
 Warning: stat(): stat failed for 22 in %s on line %d
 bool(false)

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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -145,19 +145,19 @@
 bool(false)

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

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

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

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

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

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

 --undefined var--

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -94,21 +94,23 @@
 File permissions are => 100600
 File created in => temp dir
 -- Iteration 6 --
-File name is => %s%etempnam_variation3.tmp%s
-File permissions are => 100600
-File created in => temp dir
+
+Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
+-- File is not created --
+
+Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 7 --

-Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
+Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
 -- File is not created --

-Warning: unlink(): %s in %s on line %d
+Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 8 --
-File name is => %s%etempnam_variation3.tmp%s
+File name is => /tmp/tempnam_variation3.tmp%s
 File permissions are => 100600
 File created in => temp dir
 -- Iteration 9 --
-File name is => %s%etempnam_variation3.tmp%s
+File name is => /tmp/tempnam_variation3.tmp%s
 File permissions are => 100600
 File created in => temp dir


Modified: php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -325,21 +325,25 @@
 }

 -- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/glob_variation/WONDER5"
-}
-array(0) {
-}
-array(0) {
-}

+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
 -- Iteration 9 --
 array(0) {
 }
@@ -441,8 +445,9 @@
 array(0) {
 }
 -- Iteration 8 --
-array(0) {
-}
+
+Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
 array(0) {
 }

Modified: php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -42,7 +42,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -77,9 +77,13 @@
 bool(false)

 -- Iteration 9 --
-bool(true)

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

+Warning: is_dir() 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/is_executable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -76,9 +76,13 @@
 -- Iteration 5 --
 bool(false)
 -- Iteration 6 --
-bool(true)
+
+Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 7 --
-bool(true)
+
+Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
 bool(false)
 -- Iteration 9 --

Modified: php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -62,7 +62,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -45,7 +45,7 @@
 NULL
 bool(false)

-Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d
+Warning: is_file() 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/is_file_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -51,7 +51,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,8 +67,12 @@
 - Iteration 6 -
 bool(false)
 - Iteration 7 -
-bool(true)
+
+Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-bool(true)

+Warning: is_file() 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/is_readable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -87,11 +87,17 @@
 -- Iteration 6 --
 bool(false)
 -- Iteration 7 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
-bool(true)
+
+Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 10 --
 bool(true)
 -- Iteration 11 --

Modified: php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -61,7 +61,7 @@
 bool(false)
 bool(false)

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

Modified: php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -96,18 +96,30 @@
 bool(false)
 bool(false)
 -- Iteration 7 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 8 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 9 --
-bool(true)
-bool(true)
+
+Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 -- Iteration 10 --
 bool(true)
 bool(true)
 -- Iteration 11 --
 bool(true)
 bool(true)
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,10 +67,10 @@
 bool(false)
 bool(false)

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

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

Modified: php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -67,10 +67,10 @@
 Warning: lchown(): No such file or directory in %s on line %d
 bool(false)

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

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

 Warning: lchown(): Operation not permitted in %s on line %d

Modified: php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -51,7 +51,7 @@
 Warning: lstat(): Lstat failed for 22 in %s on line %d
 bool(false)

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

 *** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@
 Warning: stat(): stat failed for 22 in %s on line %d
 bool(false)

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

Modified: php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -145,19 +145,19 @@
 bool(false)

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

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

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

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

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

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

 --undefined var--

Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-07 01:58:56 UTC (rev 311875)
+++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-07 02:29:03 UTC (rev 311876)
@@ -94,21 +94,23 @@
 File permissions are => 100600
 File created in => temp dir
 -- Iteration 6 --
-File name is => %s%etempnam_variation3.tmp%s
-File permissions are => 100600
-File created in => temp dir
+
+Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
+-- File is not created --
+
+Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 7 --

-Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
+Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
 -- File is not created --

-Warning: unlink(): %s in %s on line %d
+Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 8 --
-File name is => %s%etempnam_variation3.tmp%s
+File name is => /tmp/tempnam_variation3.tmp%s
 File permissions are => 100600
 File created in => temp dir
 -- Iteration 9 --
-File name is => %s%etempnam_variation3.tmp%s
+File name is => /tmp/tempnam_variation3.tmp%s
 File permissions are => 100600
 File created in => temp dir

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

Reply via email to