From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 28 May 2019 09:15:37 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b66563eee2e524a3a6d779f2679c473e522bc03;p=php

Merge branch 'PHP-7.4'
---

0b66563eee2e524a3a6d779f2679c473e522bc03
diff --cc ext/standard/tests/array/array_merge.phpt
index 98cb3a318f,0afc2084af..08ecbf7147
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@@ -78,13 -78,14 +78,8 @@@ var_dump(array_merge($begin_array[6]))
  echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
  var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
  
- echo "\n*** Testing error conditions ***\n";
 -echo "\n*** Testing error conditions ***";
--/* Invalid arguments */
- try {
-     var_dump(array_merge());
- } catch (TypeError $e) {
-     echo $e->getMessage(), "\n";
- }
 -var_dump(array_merge(100, 200));
 -var_dump(array_merge($begin_array[0], $begin_array[1], 100));
 -var_dump(array_merge($begin_array[0], $begin_array[1], $arr4));
 -
+ echo "\n*** Testing array_merge without any arguments ***\n";
+ var_dump(array_merge());
  
  echo "Done\n";
  ?>
@@@ -746,6 -747,19 +741,7 @@@ array(7) 
    float(12.34)
  }
  
--*** Testing error conditions ***
- array_merge() expects at least 1 parameter, 0 given
 -Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d
 -NULL
 -
 -Warning: array_merge(): Expected parameter 3 to be an array, int given in %s on line %d
 -NULL
 -
 -Notice: Undefined variable: arr4 in %s on line %d
 -
 -Warning: array_merge(): Expected parameter 3 to be an array, null given in %s on line %d
 -NULL
 -
+ *** Testing array_merge without any arguments ***
+ array(0) {
+ }
  Done