From: Nikita Popov Date: Fri, 10 Jan 2020 16:38:39 +0000 (+0100) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddc5553ecde273315c105745fbf8292cdf41fcb3;p=php Merge branch 'PHP-7.4' * PHP-7.4: Remove unnecessary whitespace sensitivtiy from some tests --- ddc5553ecde273315c105745fbf8292cdf41fcb3 diff --cc ext/standard/tests/strings/vfprintf_variation10.phpt index 91bb67ef6e,ed9b53def6..e3e6a51880 Binary files differ diff --cc ext/standard/tests/strings/vfprintf_variation8.phpt index b32dfbc54f,0005ed2e60..ebf894f5e6 --- a/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 17eb80fa21,a3856bc38b..5eba007423 --- a/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 -- + +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(129) "Array Array Array + string(128) "Array Array Array Array Array Array Arra Arra Array Arra Array Array Array Array