Fixed tests (mostly MFB)

Author: arnaud-lb

ext/pcre/tests/invalid_utf8_offset.phpt

@@ -9,13 +9,13 @@ if (@preg_match('/./u', '') === false) {
 --FILE--
 <?php
 
-$string = "\xc3\xa9 uma string utf8 bem formada";
+$string = b"\xc3\xa9 uma string utf8 bem formada";
 
-var_dump(preg_match('~.*~u', $string, $m, 0, 1));
+var_dump(preg_match(b'~.*~u', $string, $m, 0, 1));
 var_dump($m);
 var_dump(preg_last_error() == PREG_BAD_UTF8_OFFSET_ERROR);
 
-var_dump(preg_match('~.*~u', $string, $m, 0, 2));
+var_dump(preg_match(b'~.*~u', $string, $m, 0, 2));
 var_dump($m);
 var_dump(preg_last_error() == PREG_NO_ERROR);
 
@@ -29,7 +29,7 @@ bool(true)
 int(1)
 array(1) {
   [0]=>
-  unicode(28) " uma string utf8 bem formada"
+  string(28) " uma string utf8 bem formada"
 }
 bool(true)
 Done

ext/standard/tests/file/007_variation11.phpt

@@ -62,14 +62,14 @@ unlink(dirname(__FILE__)."/007_variation11.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'wt' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(37)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation13.phpt

@@ -54,12 +54,12 @@ unlink(dirname(__FILE__)."/007_variation13.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'at' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(57)
 bool(true)
 *** Done ***

ext/standard/tests/file/007_variation15.phpt

@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation15.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'xt' mode ***\n";
@@ -45,16 +45,14 @@ unlink(dirname(__FILE__)."/007_variation15.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xt' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 
-Warning: fopen(%s): failed to open stream: File exists in %s on line %d
+Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***

ext/standard/tests/file/007_variation19.phpt

@@ -25,7 +25,7 @@ require($file_path."/file.inc");
 
 create_files($file_path, 1, "text_with_new_line", 0755, 20, "wb", "007_variation", 19, "bytes");
 $file = $file_path."/007_variation19.tmp";
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 
 echo "*** Test fopen() & fclose() functions:  with 'wb' mode ***\n";
 $file_handle = fopen($file, "wb");  //opening the file "wb" mode
@@ -57,16 +57,14 @@ unlink(dirname(__FILE__)."/007_variation19.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'wb' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(37)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation21.phpt

@@ -24,7 +24,7 @@ require($file_path."/file.inc");
 
 create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 21, "bytes");
 $file = $file_path."/007_variation21.tmp";
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 
 echo "*** Test fopen() & fclose() functions:  with 'ab' mode ***\n";
 $file_handle = fopen($file, "ab");  //opening the file "ab" mode
@@ -49,14 +49,12 @@ unlink(dirname(__FILE__)."/007_variation21.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'ab' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
+%unicode|string%(6) "stream"
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(57)
 bool(true)
 *** Done ***

ext/standard/tests/file/007_variation23.phpt

@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation23.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'xb' mode ***\n";
@@ -45,16 +45,14 @@ unlink(dirname(__FILE__)."/007_variation23.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xb' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 
-Warning: fopen(%s): failed to open stream: File exists in %s on line %d
+Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***

ext/standard/tests/file/007_variation3.phpt

@@ -25,7 +25,7 @@ require($file_path."/file.inc");
 
 create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 3, "bytes");
 $file = $file_path."/007_variation3.tmp";
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 
 echo "*** Test fopen() & fclose() functions:  with 'w' mode ***\n";
 $file_handle = fopen($file, "w");  //opening the file "w" mode
@@ -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: bool(false)
+var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining 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
@@ -57,16 +57,14 @@ unlink(dirname(__FILE__)."/007_variation3.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'w' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(37)
 int(0)
 bool(true)

ext/standard/tests/file/007_variation5.phpt

@@ -24,7 +24,7 @@ require($file_path."/file.inc");
 
 create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 5, "bytes");
 $file = $file_path."/007_variation5.tmp";
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 
 echo "*** Test fopen() & fclose() functions:  with 'a' mode ***\n";
 $file_handle = fopen($file, "a");  //opening the file "a" mode
@@ -49,14 +49,12 @@ unlink(dirname(__FILE__)."/007_variation5.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'a' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
+%unicode|string%(6) "stream"
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 int(57)
 bool(true)
 *** Done ***

ext/standard/tests/file/007_variation7.phpt

@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "x" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation7.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'x' mode ***\n";
@@ -45,16 +45,14 @@ unlink(dirname(__FILE__)."/007_variation7.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'x' mode ***
 resource(%d) of type (stream)
-unicode(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
-
-Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 int(37)
 int(37)
-bool(false)
+string(0) ""
 int(0)
 bool(true)
-unicode(7) "Unknown"
+%unicode|string%(7) "Unknown"
 
-Warning: fopen(%s): failed to open stream: File exists in %s on line %d
+Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***

ext/standard/tests/file/bug27508.phpt

@@ -46,7 +46,7 @@ stream_wrapper_register("myFile", "FileStream")
     or die("Failed to register protocol");
 
 $tmp_dir = __DIR__;
-$tn = tempnam($tmp_dir, 'foo');
+$tn = (binary) tempnam($tmp_dir, 'foo');
 if (!$tn) {
   die("tempnam failed");
 }

ext/standard/tests/file/bug46347.phpt

@@ -17,8 +17,8 @@ var_dump(parse_ini_file($file));
 <?php
 unlink(__DIR__.'/parse.ini');
 ?>
---EXPECT--
+--EXPECTF--
 array(1) {
-  ["part1.*.part2"]=>
-  string(1) "1"
+  [%u|b%"part1.*.part2"]=>
+  %unicode|string%(1) "1"
 }

ext/standard/tests/file/copy_variation9.phpt

@@ -56,7 +56,7 @@ echo "*** Done ***\n";
 unlink(dirname(__FILE__)."/copy_copy_variation9.tmp");
 unlink(dirname(__FILE__)."/copy_variation9.tmp");
 ?>
---EXPECT--
+--EXPECTF--
 *** Test copy() function: destination with/without write permissions ***
 
 -- With write permissions --

ext/standard/tests/file/file_get_contents_variation5.phpt

@@ -25,7 +25,7 @@ set_error_handler('test_error_handler');
 $filename = 'FileGetContentsVar5.tmp';
 $absFile = dirname(__FILE__).'/'.$filename;
 $h = fopen($absFile,"w");
-fwrite($h, "contents read");
+fwrite($h, b"contents read");
 fclose($h);
 
 
@@ -183,27 +183,27 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --instance of classWithToString--

ext/standard/tests/file/file_get_contents_variation8.phpt

@@ -52,31 +52,38 @@ bool(false)
 Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 -- Iteration 2 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
 bool(false)
 -- Iteration 3 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
 bool(false)
 -- Iteration 4 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
 bool(false)
 -- Iteration 5 --
 
 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 --
 
-Notice: Array to string conversion in %s on line %d
+Notice: Array to string conversion in %s
 
-Warning: file_get_contents(Array): failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(Array): failed to open stream: No such file or directory in %s
 bool(false)
 -- Iteration 8 --
 
-Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
+Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d
 bool(false)
 -- Iteration 9 --
 
 Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
 *** Done ***
-

ext/standard/tests/file/file_get_contents_variation9.phpt

@@ -25,7 +25,7 @@ $chainlink = dirname(__FILE__).'/fileGetContentsVar9.ChainLink';
 $h = fopen($filename,"w");
 //Data should be more than the size of a link.
 for ($i = 1; $i <= 10; $i++) {
-   fwrite($h, "Here is a repeated amount of data");
+   fwrite($h, b"Here is a repeated amount of data");
 }
 fclose($h);