Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unnecessary whitespace sensitivtiy from some tests

diff --cc ext/standard/tests/strings/vfprintf_variation10.phpt
index 91bb67ef6efe56b7888b23c8bf8322957ff26b2f,ed9b53def621ba8111d34a4d6931d8bc040ed030..e3e6a5188054549de27033dd2a521bea4886c0a7
Binary files differ

diff --cc ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation18.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation4.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation6.phpt
Simple merge

diff --cc ext/standard/tests/strings/vfprintf_variation8.phpt
index b32dfbc54f06bdd0ebbadfd2c80191152d600270,0005ed2e60fe28d4ef50d0c775b9cf54e85cad28..ebf894f5e63c728231ae2f59e547facd00952b54
--- 1/ext/standard/tests/strings/vfprintf_variation8.phpt
--- 2/ext/standard/tests/strings/vfprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation8.phpt
@@@ -78,47 -80,12 +78,47 @@@ echo "\n"
  unlink($data_file);
  
  ?>
 -===DONE===
 ---EXPECT--
 +--EXPECTF--
  *** Testing vfprintf() : string formats and non-string values ***
  
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
  -- Iteration 1 --
- 2.2 0.2 10.2 
+ 2.2 0.2 10.2
     123456.234 s -1234.6789 1234.6789
           2123 2765       -27654321000 1234
     12.000000011111 -12.00000111111 -123456.234 3.33

diff --cc ext/standard/tests/strings/vsprintf_variation8.phpt
index 17eb80fa2118a8233c53dd2697e506a50ce79d60,a3856bc38b6a2fe76e04c7fa516bc3ff69cba18e..5eba007423848b040baf4efbfd7ef29e3165b854
--- 1/ext/standard/tests/strings/vsprintf_variation8.phpt
--- 2/ext/standard/tests/strings/vsprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation8.phpt
@@@ -85,43 -88,7 +85,43 @@@ string(129) "2 -2 
     2 123456 2 -2"
  
  -- Iteration 3 --
- string(129) "Array Array Array 
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
 +
 +Warning: Array to string conversion in %s on line %d
+ string(128) "Array Array Array
     Array Array Array
           Arra Arra       Array Arra
     Array Array Array Array