Merge branch 'PHP-7.4'

23 files changed, 136 insertions, 109 deletions

diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt
index 6ae441f61e..c05ca6fdf0 100644
--- a/ext/standard/tests/file/007_variation1.phpt
+++ b/ext/standard/tests/file/007_variation1.phpt
@@ -32,7 +32,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( ftell($file_handle) );  //Initial position of file pointer
 var_dump( fread($file_handle, 100) );  //Check for read operation
-var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
+var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 echo "*** Done ***\n";
@@ -48,7 +48,7 @@ int(0)
 string(20) "line
 line of text
 li"
-int(0)
+bool(false)
 bool(true)
 string(7) "Unknown"
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt
index b0d84dfe93..c2e42f68d2 100644
--- a/ext/standard/tests/file/007_variation11-win32-mb.phpt
+++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt
@@ -40,7 +40,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -68,7 +68,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt
index 436b22f8eb..7b6ae81465 100644
--- a/ext/standard/tests/file/007_variation11-win32.phpt
+++ b/ext/standard/tests/file/007_variation11-win32.phpt
@@ -40,7 +40,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -66,7 +66,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt
index 9c6bff1417..3748f6f962 100644
--- a/ext/standard/tests/file/007_variation11.phpt
+++ b/ext/standard/tests/file/007_variation11.phpt
@@ -40,7 +40,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -66,7 +66,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt
index 12484cfcde..72292d057f 100644
--- a/ext/standard/tests/file/007_variation13-win32.phpt
+++ b/ext/standard/tests/file/007_variation13-win32.phpt
@@ -37,7 +37,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -56,7 +56,7 @@ unlink(__DIR__."/007_variation13.tmp");
 resource(%d) of type (stream)
 string(6) "stream"
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt
index 98be673d8a..a35b244c93 100644
--- a/ext/standard/tests/file/007_variation13.phpt
+++ b/ext/standard/tests/file/007_variation13.phpt
@@ -37,7 +37,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -56,7 +56,7 @@ unlink(__DIR__."/007_variation13.tmp");
 resource(%d) of type (stream)
 string(6) "stream"
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 39a7e506e5..41fa58f02c 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -32,7 +32,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -49,7 +49,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt
index d468ad0452..780ea96365 100644
--- a/ext/standard/tests/file/007_variation17.phpt
+++ b/ext/standard/tests/file/007_variation17.phpt
@@ -32,7 +32,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( ftell($file_handle) );  //Initial position of file pointer
 var_dump( fread($file_handle, 100) );  //Check for read operation
-var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
+var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 echo "*** Done ***\n";
@@ -48,7 +48,7 @@ int(0)
 string(20) "line
 line of text
 li"
-int(0)
+bool(false)
 bool(true)
 string(7) "Unknown"
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt
index d6d3a3d761..b10b4b5069 100644
--- a/ext/standard/tests/file/007_variation19.phpt
+++ b/ext/standard/tests/file/007_variation19.phpt
@@ -35,7 +35,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -61,7 +61,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt
index 92d8f1dee7..fec0db24e4 100644
--- a/ext/standard/tests/file/007_variation21.phpt
+++ b/ext/standard/tests/file/007_variation21.phpt
@@ -32,7 +32,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -51,7 +51,7 @@ unlink(__DIR__."/007_variation21.tmp");
 resource(%d) of type (stream)
 string(6) "stream"
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index c4b4aa86a5..81060fa1b1 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -32,7 +32,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -49,7 +49,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt
index 344a774f87..3572ca746f 100644
--- a/ext/standard/tests/file/007_variation3.phpt
+++ b/ext/standard/tests/file/007_variation3.phpt
@@ -35,7 +35,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -61,7 +61,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt
index 1c50e96f71..40f0794c8b 100644
--- a/ext/standard/tests/file/007_variation5.phpt
+++ b/ext/standard/tests/file/007_variation5.phpt
@@ -32,7 +32,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -51,7 +51,7 @@ unlink(__DIR__."/007_variation5.tmp");
 resource(%d) of type (stream)
 string(6) "stream"
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 974bfe0c8c..322e1ee44c 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -32,7 +32,7 @@ var_dump( ftell($file_handle) );  //Initial file pointer position, expected at t
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
-var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: false
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
@@ -49,7 +49,7 @@ string(6) "stream"
 int(0)
 int(37)
 int(37)
-string(0) ""
+bool(false)
 int(0)
 bool(true)
 string(7) "Unknown"
diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt
index cd0fd63c75..a730240fa3 100644
--- a/ext/standard/tests/file/007_variation9.phpt
+++ b/ext/standard/tests/file/007_variation9.phpt
@@ -32,7 +32,7 @@ var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
 var_dump( ftell($file_handle) );  //Initial position of file pointer
 var_dump( fread($file_handle, 100) );  //Check for read operation
-var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
+var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 echo "*** Done ***\n";
@@ -48,7 +48,7 @@ int(0)
 string(20) "line
 line of text
 li"
-int(0)
+bool(false)
 bool(true)
 string(7) "Unknown"
 *** Done ***
diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt
index b4454906f5..abc794de34 100644
--- a/ext/standard/tests/file/fputcsv_variation14.phpt
+++ b/ext/standard/tests/file/fputcsv_variation14.phpt
@@ -89,7 +89,7 @@ echo "Done\n";
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -99,7 +99,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -109,7 +109,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -119,7 +119,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -129,7 +129,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -139,7 +139,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -149,7 +149,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -159,7 +159,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -169,7 +169,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -179,7 +179,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -189,7 +189,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -199,7 +199,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -209,7 +209,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -219,7 +219,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -229,7 +229,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -239,7 +239,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -249,7 +249,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -259,7 +259,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -269,7 +269,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -279,7 +279,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -289,7 +289,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -299,7 +299,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -309,7 +309,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -319,7 +319,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -329,7 +329,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -339,7 +339,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
@@ -349,7 +349,7 @@ string(0) ""
 Notice: fputcsv(): delimiter must be a single character in %s on line %d
 
 Notice: fputcsv(): enclosure must be a single character in %s on line %d
-int(0)
+bool(false)
 int(0)
 bool(false)
 string(0) ""
diff --git a/ext/standard/tests/file/fwrite.phpt b/ext/standard/tests/file/fwrite.phpt
index 4cd8a2f08a..c3a475942b 100644
--- a/ext/standard/tests/file/fwrite.phpt
+++ b/ext/standard/tests/file/fwrite.phpt
@@ -26,7 +26,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 int(0)
-int(0)
+bool(false)
 int(0)
 int(4)
 int(0)
diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
index a472dfb2a8..ec3cdd756a 100644
--- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
@@ -84,11 +84,11 @@ echo "Done\n";
 -- Testing fwrite() with file having content of type numeric --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -96,11 +96,11 @@ int(1024)
 string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -108,11 +108,11 @@ int(1024)
 string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -122,11 +122,11 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Testing fwrite() with file having content of type text --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -134,11 +134,11 @@ int(1024)
 string(32) "e486000c4c8452774f746a27658d87fa"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -146,11 +146,11 @@ int(1024)
 string(32) "e486000c4c8452774f746a27658d87fa"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -160,11 +160,11 @@ string(32) "e486000c4c8452774f746a27658d87fa"
 -- Testing fwrite() with file having content of type text_with_new_line --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -172,11 +172,11 @@ int(1024)
 string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -184,11 +184,11 @@ int(1024)
 string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -198,11 +198,11 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Testing fwrite() with file having content of type alphanumeric --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -210,11 +210,11 @@ int(1024)
 string(32) "3fabd48d8eaa65c14e0d93d6880c560c"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -222,11 +222,11 @@ int(1024)
 string(32) "3fabd48d8eaa65c14e0d93d6880c560c"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt
index 22e0f6823f..c141aa5880 100644
--- a/ext/standard/tests/file/fwrite_variation1.phpt
+++ b/ext/standard/tests/file/fwrite_variation1.phpt
@@ -76,11 +76,11 @@ echo "Done\n";
 -- Testing fwrite() with file having content of type numeric --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -88,11 +88,11 @@ int(1024)
 string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -100,11 +100,11 @@ int(1024)
 string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -114,11 +114,11 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6"
 -- Testing fwrite() with file having content of type text --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -126,11 +126,11 @@ int(1024)
 string(32) "e486000c4c8452774f746a27658d87fa"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -138,11 +138,11 @@ int(1024)
 string(32) "e486000c4c8452774f746a27658d87fa"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -152,11 +152,11 @@ string(32) "e486000c4c8452774f746a27658d87fa"
 -- Testing fwrite() with file having content of type text_with_new_line --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -164,11 +164,11 @@ int(1024)
 string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -176,11 +176,11 @@ int(1024)
 string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -190,11 +190,11 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb"
 -- Testing fwrite() with file having content of type alphanumeric --
 -- Opening file in r --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -202,11 +202,11 @@ int(1024)
 string(32) "3fabd48d8eaa65c14e0d93d6880c560c"
 -- Opening file in rb --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
@@ -214,11 +214,11 @@ int(1024)
 string(32) "3fabd48d8eaa65c14e0d93d6880c560c"
 -- Opening file in rt --
 int(0)
-int(0)
+bool(false)
 int(0)
 bool(false)
 int(2)
-int(0)
+bool(false)
 int(2)
 bool(false)
 bool(true)
diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt
index 8d97f5f6e8..260878d474 100644
--- a/ext/standard/tests/network/bug20134.phpt
+++ b/ext/standard/tests/network/bug20134.phpt
@@ -21,4 +21,4 @@ else {
 ?>
 --EXPECT--
 int(1)
-string(0) ""
+bool(false)
diff --git a/ext/standard/tests/streams/bug44818.phpt b/ext/standard/tests/streams/bug44818.phpt
index 7bd9fe5168..0446dfd3be 100644
--- a/ext/standard/tests/streams/bug44818.phpt
+++ b/ext/standard/tests/streams/bug44818.phpt
@@ -17,7 +17,7 @@ test("php://temp","w");
 --EXPECTF--
 php://memory, r
 resource(%d) of type (stream)
-int(0)
+bool(false)
 int(0)
 string(0) ""
 php://memory, r+
@@ -27,7 +27,7 @@ int(0)
 string(3) "foo"
 php://temp, r
 resource(%d) of type (stream)
-int(0)
+bool(false)
 int(0)
 string(0) ""
 php://temp, w
diff --git a/ext/standard/tests/streams/eagain_is_not_an_error.phpt b/ext/standard/tests/streams/eagain_is_not_an_error.phpt
new file mode 100644
index 0000000000..7bc50dc9b7
--- /dev/null
+++ b/ext/standard/tests/streams/eagain_is_not_an_error.phpt
@@ -0,0 +1,16 @@
+--TEST--
+EAGAIN/EWOULDBLOCK on a non-blocking socket should not result in an error return value
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip not for Windows');
+?>
+--FILE--
+<?php
+
+$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
+stream_set_blocking($sockets[0], false);
+var_dump(fread($sockets[0], 100));
+
+?>
+--EXPECT--
+string(0) ""
diff --git a/ext/standard/tests/streams/nonblocking_stdin.phpt b/ext/standard/tests/streams/nonblocking_stdin.phpt
new file mode 100644
index 0000000000..0e22190fb7
--- /dev/null
+++ b/ext/standard/tests/streams/nonblocking_stdin.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Read from non-blocking stdio stream should not error
+--FILE--
+<?php
+
+stream_set_blocking(STDIN, false);
+var_dump(fread(STDIN, 1));
+
+?>
+--EXPECT--
+string(0) ""