- Fix tests for \0 patch in PHP 5.3.

- Fix constants_error_004.phpt (closes bug #51901)

ext/standard/tests/file/disk_free_space_variation.phpt

@@ -105,19 +105,19 @@ float(%d)
 float(%d)
 
 -- Iteration 9 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
 
 -- Iteration 10 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
 
 -- Iteration 11 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
 
 -- Iteration 12 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
 
 --- Done ---

ext/standard/tests/file/file_get_contents_variation8-win32.phpt

@@ -76,8 +76,6 @@ Warning: file_get_contents( ): failed to open stream: Permission denied in %s on
 bool(false)
 
 -- Filename: \0 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
 bool(false)
 
 -- Filename: array() --

ext/standard/tests/file/file_get_contents_variation8.phpt

@@ -68,8 +68,6 @@ bool(false)
 Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 6 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
 bool(false)
 -- Iteration 7 --
 

ext/standard/tests/file/filegroup_variation3.phpt

@@ -74,8 +74,8 @@ bool(false)
 Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+bool(false)
 - Iteration 8 -
-int(%d)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/fileinode_variation3.phpt

@@ -75,8 +75,8 @@ bool(false)
 Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+bool(false)
 - Iteration 8 -
-int(%d)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/fileowner_variation3.phpt

@@ -75,8 +75,8 @@ bool(false)
 Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+bool(false)
 - Iteration 8 -
-int(%d)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/fileperms_variation3.phpt

@@ -74,8 +74,8 @@ bool(false)
 Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+bool(false)
 - Iteration 8 -
-int(%d)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/fnmatch_variation.phpt

@@ -259,21 +259,21 @@ bool(true)
 --- With Strings ---
 -- Iteration 0 --
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 bool(false)
 bool(false)
 bool(true)
 -- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
 bool(false)
 bool(false)
-bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
 -- Iteration 2 --
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 bool(false)
 bool(false)
@@ -282,7 +282,7 @@ bool(true)
 bool(false)
 bool(false)
 bool(false)
-bool(true)
+bool(false)
 bool(false)
 bool(false)
 -- Iteration 4 --
@@ -294,7 +294,7 @@ bool(true)
 bool(false)
 -- Iteration 5 --
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 bool(false)
 bool(false)
@@ -397,28 +397,28 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+bool(false)
 bool(false)
 bool(false)
 -- Iteration 1 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+bool(false)
 bool(false)
 bool(false)
 -- Iteration 2 --
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+bool(false)
 bool(false)
 bool(false)
 -- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
 bool(false)
 bool(false)
 -- Iteration 4 --

ext/standard/tests/file/glob_variation.phpt

@@ -325,20 +325,12 @@ array(0) {
 }
 
 -- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/glob_variation/WONDER5"
-}
-array(0) {
-}
-array(0) {
-}
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
 
 -- Iteration 9 --
 array(0) {
@@ -441,8 +433,7 @@ array(1) {
 array(0) {
 }
 -- Iteration 8 --
-array(0) {
-}
+bool(false)
 -- Iteration 9 --
 array(0) {
 }

ext/standard/tests/file/is_dir_variation4.phpt

@@ -77,9 +77,9 @@ bool(true)
 bool(false)
 
 -- Iteration 9 --
-bool(true)
+bool(false)
 
 -- Iteration 10 --
-bool(true)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/is_executable_variation1.phpt

@@ -76,9 +76,9 @@ bool(false)
 -- Iteration 5 --
 bool(false)
 -- Iteration 6 --
-bool(true)
+bool(false)
 -- Iteration 7 --
-bool(true)
+bool(false)
 -- Iteration 8 --
 bool(false)
 -- Iteration 9 --

ext/standard/tests/file/is_file_variation4.phpt

@@ -67,8 +67,8 @@ bool(false)
 - Iteration 6 -
 bool(false)
 - Iteration 7 -
-bool(true)
+bool(false)
 - Iteration 8 -
-bool(true)
+bool(false)
 
 *** Done ***

ext/standard/tests/file/is_readable_variation1.phpt

@@ -87,11 +87,11 @@ bool(false)
 -- Iteration 6 --
 bool(false)
 -- Iteration 7 --
-bool(true)
+bool(false)
 -- Iteration 8 --
-bool(true)
+bool(false)
 -- Iteration 9 --
-bool(true)
+bool(false)
 -- Iteration 10 --
 bool(true)
 -- Iteration 11 --

ext/standard/tests/file/is_writable_variation1.phpt

@@ -96,14 +96,14 @@ bool(false)
 bool(false)
 bool(false)
 -- Iteration 7 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 -- Iteration 8 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 -- Iteration 9 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 -- Iteration 10 --
 bool(true)
 bool(true)

ext/standard/tests/file/mkdir_rmdir_variation2.phpt

@@ -64,8 +64,8 @@ Warning: rmdir(%s/mkdir_variation2/): %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 
 *** Testing mkdir() with miscelleneous input ***
 bool(true)

ext/standard/tests/file/readfile_variation10-win32.phpt

@@ -37,7 +37,7 @@ $names_arr = array(
 
 foreach($names_arr as $key => $value) {
       echo "\n-- Filename: $key --\n";
-      readfile($value);
+      var_dump(readfile($value));
 };
 
 ?>
@@ -48,40 +48,48 @@ foreach($names_arr as $key => $value) {
 -- Filename: -1 --
 
 Warning: readfile(-1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
 
 -- Filename: TRUE --
 
 Warning: readfile(1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
 
 -- Filename: FALSE --
 
 Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
 
 -- Filename: NULL --
 
 Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
 
 -- Filename: "" --
 
 Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
 
 -- Filename: " " --
 
 Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
+bool(false)
 
 -- Filename: \0 --
-
-Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
 
 -- Filename: array() --
 
 Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
 
 -- Filename: /no/such/file/dir --
 
 Warning: readfile(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
+bool(false)
 
 -- Filename: php/php --
 
 Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
+bool(false)
 ===Done===

ext/standard/tests/file/rename_variation13.phpt

@@ -98,11 +98,7 @@ bool(true)
 Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
 bool(false)
 -- testing '%s' --
-
-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
 bool(false)
-
-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
 bool(false)
 -- testing 'Array' --
 

ext/standard/tests/file/stream_rfc2397_006.phpt

@@ -21,8 +21,8 @@ foreach($streams as $stream)
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-string(0) ""
-string(6) "foobar"
+bool(false)
+bool(false)
 string(13) "foobar foobar"
 
 Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d

ext/standard/tests/file/tempnam_variation3-win32.phpt

@@ -31,8 +31,8 @@ $names_arr = array(
 	NULL,
 	"",
 	" ",
-	"\0",
 	/* Invalid args */ 
+	"\0",
 	array(),
 
 	/* Valid args*/ 
@@ -102,7 +102,8 @@ OK
 Failed, not created in the correct directory %s vs %s
 0
 -- Iteration 6 --
-OK
+Failed, not created in the correct directory %s vs %s
+0
 -- Iteration 7 --
 
 Warning: tempnam() expects parameter 2 to be string, array given in %s\ext\standard\tests\file\tempnam_variation3-win32.php on line %d

ext/standard/tests/file/tempnam_variation3.phpt

@@ -100,9 +100,9 @@ File name is => %s/%s
 File permissions are => 100600
 File created in => directory specified
 -- Iteration 6 --
-File name is => %s/%s
-File permissions are => 100600
-File created in => directory specified
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 7 --
 
 Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d

ext/standard/tests/file/tempnam_variation7-win32.phpt

@@ -89,9 +89,9 @@ 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
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 7 --
 
 Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d

ext/standard/tests/file/tempnam_variation7.phpt

@@ -94,9 +94,9 @@ 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
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 7 --
 
 Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d

tests/classes/constants_error_004.phpt

@@ -10,4 +10,4 @@ Class constant whose initial value refereces a non-existent class
   $a = new C();
 ?>
 --EXPECTF--
-Fatal error: Undefined class constant 'D::hello' in %s on line %d
+Fatal error: Class 'D' not found in %s on line %d