From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Wed, 13 Nov 2019 20:15:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d65e59de9b61761c9839ea6379285b10936e03e1;p=php

Merge branch 'PHP-7.4'
---

d65e59de9b61761c9839ea6379285b10936e03e1
diff --cc ext/standard/tests/file/filegroup_variation2.phpt
index ee232e4214,030f97a0f8..6c8b1826c3
--- a/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 f86a0b89a6,71cdc395a6..07b76bb62c
--- a/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 b6d5afaee8,4be8f58682..8de42cb494
--- a/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 e626eab361,d45da017cc..4eee45d869
--- a/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 470c6a536f,d6f1b3f59b..4069dd2aa0
--- a/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 060739ff3d,3f9d196e64..e82d9ae034
--- a/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_writable_variation3.phpt
index b55a193fce,e49270bcf4..c5843a5abf
--- a/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.phpt
index 5a0070c04f,e9655377a3..351b03d565
Binary files differ
diff --cc ext/standard/tests/file/readlink_variation1.phpt
index 2971c1e146,d641f20f26..276f894432
--- a/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 c0299c27ab,965a0dac25..83a4a88b29
Binary files differ