From: Felipe Pena <felipe@php.net>
Date: Tue, 7 Jun 2011 02:29:03 +0000 (+0000)
Subject: - Test fixes
X-Git-Tag: php-5.4.0alpha1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a641ccb774743a4a95a6c58830fa665208cc69c9;p=php

- Test fixes
---

diff --git a/ext/standard/tests/file/glob_variation.phpt b/ext/standard/tests/file/glob_variation.phpt
index 52c0dc8e47..01a955dc14 100755
--- a/ext/standard/tests/file/glob_variation.phpt
+++ b/ext/standard/tests/file/glob_variation.phpt
@@ -325,20 +325,24 @@ array(0) {
 }
 
 -- 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(1) {
 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) {
 }
diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index 2df297843b..579c70a01b 100644
--- a/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@ -42,7 +42,7 @@ bool(false)
 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)
diff --git a/ext/standard/tests/file/is_dir_variation4.phpt b/ext/standard/tests/file/is_dir_variation4.phpt
index a68fe0b005..0867d1b605 100644
--- a/ext/standard/tests/file/is_dir_variation4.phpt
+++ b/ext/standard/tests/file/is_dir_variation4.phpt
@@ -77,9 +77,13 @@ bool(true)
 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 ***
diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt
index 9969911ee1..2e579ccff6 100644
--- a/ext/standard/tests/file/is_executable_variation1.phpt
+++ b/ext/standard/tests/file/is_executable_variation1.phpt
@@ -76,9 +76,13 @@ bool(false)
 -- 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 --
diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt
index 634ce1f40c..0a1f3823b9 100644
--- a/ext/standard/tests/file/is_executable_variation3.phpt
+++ b/ext/standard/tests/file/is_executable_variation3.phpt
@@ -62,7 +62,7 @@ bool(false)
 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
diff --git a/ext/standard/tests/file/is_file_error.phpt b/ext/standard/tests/file/is_file_error.phpt
index 711d761763..6c481f0fdb 100644
--- a/ext/standard/tests/file/is_file_error.phpt
+++ b/ext/standard/tests/file/is_file_error.phpt
@@ -45,7 +45,7 @@ Warning: is_file() expects exactly 1 parameter, 2 given in %s on line %d
 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 ***
diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index 917fa5acc8..e11c862ea3 100644
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -51,7 +51,7 @@ bool(false)
 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)
diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt
index 55aeedfaad..11ca5d5558 100644
--- a/ext/standard/tests/file/is_file_variation4.phpt
+++ b/ext/standard/tests/file/is_file_variation4.phpt
@@ -67,8 +67,12 @@ bool(false)
 - 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 ***
diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt
index a1310327b8..e9f168a8e1 100644
--- a/ext/standard/tests/file/is_readable_variation1.phpt
+++ b/ext/standard/tests/file/is_readable_variation1.phpt
@@ -87,11 +87,17 @@ bool(false)
 -- 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 --
diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt
index dde47cc3b5..782c4bc07e 100644
--- a/ext/standard/tests/file/is_readable_variation3.phpt
+++ b/ext/standard/tests/file/is_readable_variation3.phpt
@@ -61,7 +61,7 @@ bool(false)
 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
diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt
index bf3e7e1171..524684dea8 100644
--- a/ext/standard/tests/file/is_writable_variation1.phpt
+++ b/ext/standard/tests/file/is_writable_variation1.phpt
@@ -96,18 +96,30 @@ bool(false)
 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
diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt
index 4c5bfa9082..25aa9c0433 100644
--- a/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@ -67,10 +67,10 @@ bool(false)
 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)
diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index 1e0356569c..72f1052183 100644
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -67,10 +67,10 @@ bool(true)
 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
diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt
index 2a220084a4..d7ee41f9ae 100644
--- a/ext/standard/tests/file/lstat_stat_error.phpt
+++ b/ext/standard/tests/file/lstat_stat_error.phpt
@@ -51,7 +51,7 @@ bool(false)
 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 @@ bool(false)
 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
diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt
index 46d45af48e..d8ce01dbce 100644
--- a/ext/standard/tests/file/parse_ini_file_variation4.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -145,19 +145,19 @@ Error: 2 - parse_ini_file(0.5): failed to open stream: No such file or directory
 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 @@ Error: 2 - parse_ini_file(Class A object): failed to open stream: No such file o
 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--
diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index 18d074d28d..e76e1f0c6a 100644
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -94,21 +94,23 @@ File name is => %s%etempnam_variation3.tmp%s
 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