Merge branch 'PHP-7.4'

diff --cc ext/standard/tests/file/filegroup_variation2.phpt
index ee232e421458d495b4d90b1f6f845345c355020b,030f97a0f8bc98f6a83d0fafcaaaf72bb84ef486..6c8b1826c3ec06aa4bc372a5b715f11ef31ae289
--- 1/ext/standard/tests/file/filegroup_variation2.phpt
--- 2/ext/standard/tests/file/filegroup_variation2.phpt
+++ b/ext/standard/tests/file/filegroup_variation2.phpt
@@@ -32,8 -36,7 +34,6 @@@ foreach( $filenames as $filename ) 
    var_dump( filegroup($filename) );
    clearstatcache();
  }
- 
- echo "\n*** Done ***";
 -fclose($file_handle);
  ?>
  --CLEAN--
  <?php

diff --cc ext/standard/tests/file/fileinode_variation2.phpt
index f86a0b89a6b4b0cc42d02dcd0f4141390051501d,71cdc395a663b9cf7ce8387c16c81ad2d3cf2220..07b76bb62c98c4edf775cf3a66f2119548b01c51
--- 1/ext/standard/tests/file/fileinode_variation2.phpt
--- 2/ext/standard/tests/file/fileinode_variation2.phpt
+++ b/ext/standard/tests/file/fileinode_variation2.phpt
@@@ -33,8 -37,7 +35,6 @@@ foreach( $filenames as $filename ) 
    var_dump( fileinode($filename) );
    clearstatcache();
  }
- 
- echo "\n*** Done ***";
 -fclose($file_handle);
  ?>
  --CLEAN--
  <?php

diff --cc ext/standard/tests/file/fileowner_variation2.phpt
index b6d5afaee84ecae477f32630069e29783892ae34,4be8f58682e96cb95e63cd63c2a127ab255befda..8de42cb494c682e307faef3e896f160b03858477
--- 1/ext/standard/tests/file/fileowner_variation2.phpt
--- 2/ext/standard/tests/file/fileowner_variation2.phpt
+++ b/ext/standard/tests/file/fileowner_variation2.phpt
@@@ -33,8 -37,7 +35,6 @@@ foreach( $filenames as $filename ) 
    var_dump( fileowner($filename) );
    clearstatcache();
  }
- 
- echo "\n*** Done ***";
 -fclose($file_handle);
  ?>
  --CLEAN--
  <?php

diff --cc ext/standard/tests/file/fileperms_variation2.phpt
index e626eab361ef59d619c754f7c954cfb538823dba,d45da017cc87f307780b3220c877e8a0571d05d3..4eee45d8692c970b085865ed5d18c1ea27c6c3ce
--- 1/ext/standard/tests/file/fileperms_variation2.phpt
--- 2/ext/standard/tests/file/fileperms_variation2.phpt
+++ b/ext/standard/tests/file/fileperms_variation2.phpt
@@@ -32,8 -36,7 +34,6 @@@ foreach( $filenames as $filename ) 
    var_dump( fileperms($filename) );
    clearstatcache();
  }
- 
- echo "\n*** Done ***";
 -fclose($file_handle);
  ?>
  --CLEAN--
  <?php

diff --cc ext/standard/tests/file/flock_error.phpt
index 470c6a536fbccbf6bd15e511a1d1102317894d72,d6f1b3f59b41097e514fdfa560411a4e0de0732b..4069dd2aa01698bae75564daad329342c6395c39
--- 1/ext/standard/tests/file/flock_error.phpt
--- 2/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@@ -41,13 -39,16 +43,11 @@@ foreach($operations as $operation) 
  /* Invalid arguments */
  $fp = fopen($file, "w");
  fclose($fp);
 -var_dump(flock($fp, LOCK_SH|LOCK_NB));
 -
 -var_dump(flock("", "", $var));
 -
 -/* No.of args leass than expected */
 -var_dump(flock());
 -var_dump(flock($fp));
 -
 -/* No.of args greater than expected */
 -var_dump(flock($fp, "", $var, ""));
 +try {
 +    var_dump(flock($fp, LOCK_SH|LOCK_NB));
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
- 
- echo "\n*** Done ***\n";
  ?>
  --CLEAN--
  <?php
@@@ -74,19 -75,36 +74,17 @@@ Warning: flock(): Illegal operation arg
  bool(false)
  
  --- Iteration 4 ---
 -Warning: flock() expects parameter 2 to be int, array given in %s on line %d
 -NULL
 +flock() expects parameter 2 to be int, array given
  
  --- Iteration 5 ---
 -Warning: flock() expects parameter 2 to be int, array given in %s on line %d
 -NULL
 +flock() expects parameter 2 to be int, array given
  
  --- Iteration 6 ---
 -Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 -NULL
 +flock() expects parameter 2 to be int, string given
  
  --- Iteration 7 ---
 -Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 -NULL
 +flock() expects parameter 2 to be int, string given
  
  --- Iteration 8 ---
 -Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 -NULL
 -
 -Warning: flock(): supplied resource is not a valid stream resource in %s on line %d
 -bool(false)
 -
 -Warning: flock() expects parameter 1 to be resource, string given in %s on line %d
 -NULL
 -
 -Warning: flock() expects at least 2 parameters, 0 given in %s on line %d
 -NULL
 -
 -Warning: flock() expects at least 2 parameters, 1 given in %s on line %d
 -NULL
 -
 -Warning: flock() expects at most 3 parameters, 4 given in %s on line %d
 -NULL
 +flock() expects parameter 2 to be int, string given
 +flock(): supplied resource is not a valid stream resource
- 
- *** Done ***

diff --cc ext/standard/tests/file/is_dir_variation3.phpt
index 060739ff3decb77c02e715715fc069e41c8c8369,3f9d196e64dc86746f5dcfb7f9c8d1e14d01720c..e82d9ae034256da4374968eaa1060a4228ca010d
--- 1/ext/standard/tests/file/is_dir_variation3.phpt
--- 2/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@@ -27,8 -32,7 +29,6 @@@ $dirnames = array
  foreach($dirnames as $dirname) {
    var_dump( is_dir($dirname) );
  }
- 
- echo "\n*** Done ***";
 -closedir($dir_handle);
  ?>
  --EXPECTF--
  *** Testing is_dir() with Invalid arguments: expected bool(false) ***
@@@ -37,7 -41,8 +37,5 @@@ bool(false
  bool(false)
  bool(false)
  bool(false)
 -
 -Warning: is_dir() expects parameter 1 to be a valid path, resource given in %s on line %d
 -NULL
  bool(false)
  bool(false)
- 
- *** Done ***

diff --cc ext/standard/tests/file/is_file_variation3.phpt
Simple merge

diff --cc ext/standard/tests/file/is_writable_variation3.phpt
index b55a193fce327a480facafe8f1b23bb765bf392b,e49270bcf4e55bf77607bf74c569f04319d6831d..c5843a5abfb8a3efd0b3b4ac747f3a11c12ad17c
--- 1/ext/standard/tests/file/is_writable_variation3.phpt
--- 2/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@@ -55,6 -56,11 +55,5 @@@ bool(false
  bool(false)
  bool(false)
  bool(false)
 -
 -Warning: is_writable() expects parameter 1 to be a valid path, array given in %s on line %d
 -NULL
 -
 -Warning: is_writeable() expects parameter 1 to be a valid path, array given in %s on line %d
 -NULL
  bool(false)
  bool(false)
- Done

diff --cc ext/standard/tests/file/readfile_variation10-win32.phpt
Simple merge

diff --cc ext/standard/tests/file/readfile_variation10.phpt
index 5a0070c04fb167351b46450b5ceaccd38e0c17cb,e9655377a3c14a2ddc567e5d7249a4ecb427d1c9..351b03d565aa195544db5e39452f4ac6bc89b541
Binary files differ

diff --cc ext/standard/tests/file/readlink_variation1.phpt
index 2971c1e146a94677a62ba65688f6a1bf4e53e9ad,d641f20f26036e8c3c1c7267dd4c7c1dd64e4c82..276f894432005d13640bb896d41418227d953e6a
--- 1/ext/standard/tests/file/readlink_variation1.phpt
--- 2/ext/standard/tests/file/readlink_variation1.phpt
+++ b/ext/standard/tests/file/readlink_variation1.phpt
@@@ -30,8 -34,7 +32,6 @@@ foreach( $filenames as $filename ) 
    var_dump( readlink($filename) );
    clearstatcache();
  }
- 
- echo "\n*** Done ***";
 -fclose($file_handle);
  ?>
  --CLEAN--
  <?php

diff --cc ext/standard/tests/file/rename_variation13-win32.phpt
index c0299c27ab7fbfed09103329db80aa37a48087c1,965a0dac251be55c9fce8e08d821f2d44f8199e5..83a4a88b29bc050cd8d0067cf4c2fb41d11108c7
Binary files differ

diff --cc ext/standard/tests/file/rename_variation13.phpt
Simple merge

diff --cc ext/standard/tests/file/tempnam_variation3-win32.phpt
Simple merge

diff --cc ext/standard/tests/file/tempnam_variation3.phpt
Simple merge

diff --cc ext/standard/tests/file/tempnam_variation7-win32.phpt
Simple merge

diff --cc ext/standard/tests/file/tempnam_variation7.phpt
Simple merge