From: Pierre Joye <pajoye@php.net>
Date: Mon, 5 Sep 2011 10:29:12 +0000 (+0000)
Subject: - update test to the zeng arg path argument
X-Git-Tag: php-5.5.0alpha1~1342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ecaee20e9b595c7b7b20d6f7724df25f21a6ed5;p=php

- update test to the zeng arg path argument
---

diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
index 1609b10e12..92fe7b3d6a 100644
--- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
@@ -78,12 +78,12 @@ Failed to write data to: " "
 
 -- Filename: \0 --
 
-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: \0
 
 -- Filename: array() --
 
-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()
 
 -- Filename: /no/such/file/dir --
@@ -95,4 +95,4 @@ Failed to write data to: /no/such/file/dir
 
 Warning: file_put_contents(php/php): failed to open stream: %s in %s on line %d
 Failed to write data to: php/php
-===Done===
\ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/file/glob_variation-win32.phpt b/ext/standard/tests/file/glob_variation-win32.phpt
index f3a3ff0e81..5027ac03e6 100644
--- a/ext/standard/tests/file/glob_variation-win32.phpt
+++ b/ext/standard/tests/file/glob_variation-win32.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 a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php 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 a valid path, string given in %sglob_variation-win32.php on line %d
+NULL
 -- Iteration 9 --
 array(0) {
 }
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
index 6453b9808d..61f6aba7a5 100644
--- a/ext/standard/tests/file/readfile_variation10-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -71,11 +71,11 @@ Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
 
 -- Filename: \0 --
 
-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
 
 -- Filename: 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
 
 -- Filename: /no/such/file/dir --
 
@@ -84,4 +84,4 @@ Warning: readfile(/no/such/file/dir): failed to open stream: No such file or dir
 -- Filename: php/php --
 
 Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
-===Done===
\ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
index a86025889d..c0388fd300 100644
Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ
diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt
index c15ef58dd8..1b69da8bf5 100644
--- a/ext/standard/tests/file/stat_error-win32.phpt
+++ b/ext/standard/tests/file/stat_error-win32.phpt
@@ -49,7 +49,7 @@ 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 a valid path, array given in %s on line %d
 NULL
 Done
 
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
index 34e352a497..2572f65d02 100644
--- a/ext/standard/tests/file/tempnam_variation7-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -89,15 +89,17 @@ File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
 -- Iteration 6 --
-File name is => %s%et%s
-File permissions are => 100666
-File created in => temp dir
+
+Warning: tempnam() expects parameter 1 to be a valid path, string given in %stempnam_variation7-win32.php on line %d
+-- File is not created --
+
+Warning: unlink(): Invalid argument in %stempnam_variation7-win32.php 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 a 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 %stempnam_variation7-win32.php on line %d
 -- Iteration 8 --
 File name is => %s%et%s
 File permissions are => 100666