Merge branch 'PHP-7.4'

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

Author: nikic

ext/standard/tests/strings/vfprintf_variation10.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vfprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
 $formats =
-  '%o %+o %-o 
+  '%o %+o %-o
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
    %\'#2o %\'2o %\'$2o %\'_2o
@@ -92,31 +92,31 @@ unlink($data_file);
 *** Testing vfprintf() : octal formats and non-octal values ***
 
 -- Iteration 1 --
-2 0 12 
+2 0 12
    361100 o 1777777777777777775456 2322
 
    30071 14 1777777777777777777764 1777777777777777416700
    12 361100 2 0
 -- Iteration 2 --
-2 1777777777777777777776 2 
+2 1777777777777777777776 2
    361100 o 1777777777777720715133 57062645
 
    57060664 4475347 1777777777777721631371 1777777777777720717336
    2 361100 2 1777777777777777777776
 -- Iteration 3 --
-0 0 0 
+0 0 0
    173 o 1777777777777777777605 173 
 
    2322 0 $0 _0
    0 173 0 0
 -- Iteration 4 --
-1 1 1 
+1 1 1
    1 o    1 1   
 
    #1 1 $1 _1
    1 1 1 1
 -- Iteration 5 --
-1 1 0 
+1 1 0
    1 o    0 1   
 
    #0 1 $1 _0

ext/standard/tests/strings/vfprintf_variation12_64bit.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
 $formats =
-  '%x %+x %-x 
+  '%x %+x %-x
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
    %\'#2x %\'2x %\'$2x %\'_2x
@@ -92,31 +92,31 @@ unlink($data_file);
 *** Testing vfprintf() : hexa formats and non-hexa values ***
 
 -- Iteration 1 --
-2 0 a 
+2 0 a
    1e240 x fffffffffffffb2e 4d2 
 
    3039 c fffffffffffffff4 fffffffffffe1dc0
    a 1e240 2 0
 -- Iteration 2 --
-2 fffffffffffffffe 2 
+2 fffffffffffffffe 2
    1e240 x ffffffffff439a5b bc65a5
 
    bc61b4 127ae7 ffffffffff4732f9 ffffffffff439ede
    2 1e240 2 fffffffffffffffe
 -- Iteration 3 --
-0 0 0 
+0 0 0
    7b x ffffffffffffff85 7b  
 
    4d2 0 $0 _0
    0 7b 0 0
 -- Iteration 4 --
-1 1 1 
+1 1 1
    1 x    1 1   
 
    #1 1 $1 _1
    1 1 1 1
 -- Iteration 5 --
-1 1 0 
+1 1 0
    1 x    0 1   
 
    #0 1 $1 _0

ext/standard/tests/strings/vfprintf_variation14_64bit.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vfprintf() : unsigned formats and signed & other types of valu
 
 // defining array of unsigned formats
 $formats =
-  '%u %+u %-u 
+  '%u %+u %-u
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
    %\'#2u %\'2u %\'$2u %\'_2u
@@ -85,25 +85,25 @@ unlink($data_file);
 *** Testing vfprintf() : unsigned formats and signed & other types of values ***
 
 -- Iteration 1 --
-2 0 10 
+2 0 10
    123456 u 1234 20000000000
    2000000000000 22000000000000 12345 
    12 18446744073709551604 18446744073709428160 _3
    10 123456 2 0
 -- Iteration 2 --
-0 0 0 
+0 0 0
    123 u 18446744073709551493 123 
             0 0          0 
    1234 0 $0 _0
    0 123 0 0
 -- Iteration 3 --
-1 1 1 
+1 1 1
    1 u    1 1   
             1 1          1 
    #1 1 $1 _1
    1 1 1 1
 -- Iteration 4 --
-1 1 0 
+1 1 0
    1 u    0 1   
             1 1          0 
    #0 1 $1 _0

ext/standard/tests/strings/vfprintf_variation16_64bit.phpt

@@ -16,7 +16,7 @@ echo "*** Testing vfprintf() : scientific formats and non-scientific values ***\
 
 // defining array of non-scientific formats
 $formats =
-  '%e %+e %-e 
+  '%e %+e %-e
    %le %Le %4e %-4e
    %10.4e %-10.4e %04e %04.4e
    %\'#2e %\'2e %\'$2e %\'_2e
@@ -80,25 +80,25 @@ unlink($data_file);
 *** Testing vfprintf() : scientific formats and non-scientific values ***
 
 -- Iteration 1 --
-2.200000e+0 +2.000000e-1 1.020000e+1 
+2.200000e+0 +2.000000e-1 1.020000e+1
    1.234562e+5 e -1.234679e+3 1.234679e+3
     2.0000e+1 2.1220e+2  -4.110000e+11 2.2120e+3
    1.234578e+4 1.200000e+1 -1.200000e+1 -1.234562e+5
    1.020000e+1 1.234562e+5 2.200000e+0 2.000000e-1
 -- Iteration 2 --
-0.000000e+0 +0.000000e+0 0.000000e+0 
+0.000000e+0 +0.000000e+0 0.000000e+0
    1.230000e+2 e -1.230000e+2 1.230000e+2
     0.0000e+0 0.0000e+0  1.234560e+5 0.0000e+0
    1.234000e+3 0.000000e+0 0.000000e+0 0.000000e+0
    0.000000e+0 1.230000e+2 0.000000e+0 0.000000e+0
 -- Iteration 3 --
-1.000000e+0 +1.000000e+0 1.000000e+0 
+1.000000e+0 +1.000000e+0 1.000000e+0
    1.000000e+0 e 1.000000e+0 1.000000e+0
     1.0000e+0 1.0000e+0  1.000000e+0 1.0000e+0
    1.000000e+0 1.000000e+0 1.000000e+0 1.000000e+0
    1.000000e+0 1.000000e+0 1.000000e+0 1.000000e+0
 -- Iteration 4 --
-1.000000e+0 +1.000000e+0 0.000000e+0 
+1.000000e+0 +1.000000e+0 0.000000e+0
    1.000000e+0 e 0.000000e+0 1.000000e+0
     1.0000e+0 0.0000e+0  1.000000e+0 0.0000e+0
    0.000000e+0 1.000000e+0 1.000000e+0 0.000000e+0

ext/standard/tests/strings/vfprintf_variation18.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vfprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
 $formats =
-  '%d %+d %-d 
+  '%d %+d %-d
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
    %\'#2d %\'2d %\'$2d %\'_2d

ext/standard/tests/strings/vfprintf_variation4.phpt

@@ -16,7 +16,7 @@ echo "*** Testing vfprintf() : float formats and non-float values ***\n";
 
 // defining array of float formats
 $formats =
-  '%f %+f %-f 
+  '%f %+f %-f
    %lf %Lf %4f %-4f
    %10.4f %-10.4f %04f %04.4f
    %\'#2f %\'2f %\'$2f %\'_2f
@@ -81,25 +81,25 @@ unlink($data_file);
 *** Testing vfprintf() : float formats and non-float values ***
 
 -- Iteration 1 --
-2.000000 -2.000000 2.000000 
+2.000000 -2.000000 2.000000
    123456.000000 f -12346789.000000 12346789.000000
    123200.0000 20000.0000 -40000.000000 22212.0000
    12345780.000000 1211111.000000 -12111111.000000 -12345634.000000
    2.000000 123456.000000 2.000000 -2.000000
 -- Iteration 2 --
-0.000000 +0.000000 0.000000 
+0.000000 +0.000000 0.000000
    123.000000 f -123.000000 123.000000
        0.0000 0.0000     123456.000000 0.0000
    1234.000000 0.000000 0.000000 0.000000
    0.000000 123.000000 0.000000 0.000000
 -- Iteration 3 --
-1.000000 +1.000000 1.000000 
+1.000000 +1.000000 1.000000
    1.000000 f 1.000000 1.000000
        1.0000 1.0000     1.000000 1.0000
    1.000000 1.000000 1.000000 1.000000
    1.000000 1.000000 1.000000 1.000000
 -- Iteration 4 --
-1.000000 +1.000000 0.000000 
+1.000000 +1.000000 0.000000
    1.000000 f 0.000000 1.000000
        1.0000 0.0000     1.000000 0.0000
    0.000000 1.000000 1.000000 0.000000

ext/standard/tests/strings/vfprintf_variation6.phpt

@@ -16,7 +16,7 @@ echo "*** Testing vfprintf() : string formats and non-string values ***\n";
 
 // defining array of string formats
 $formats =
-  '%s %+s %-s 
+  '%s %+s %-s
    %ls %Ls %4s %-4s
    %10.4s %-10.4s %04s %04.4s
    %\'#2s %\'2s %\'$2s %\'_2s
@@ -118,25 +118,25 @@ 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
    10.2 123456.234 2.2 0.2
 -- Iteration 2 --
-2 -2 2 
+2 -2 2
    123456 s -12346789 12346789
          1232 2000       -40000 2221
    12345780 1211111 -12111111 -12345634
    2 123456 2 -2
 -- Iteration 3 --
-Array Array Array 
+Array Array Array
    Array s Array Array
          Arra Arra       Array Arra
    Array Array Array Array
    Array Array Array Array
 -- Iteration 4 --
-1 1  
+1 1 
    1 s      1   
             1            0001 0000
    #0 1 $1 _0

ext/standard/tests/strings/vfprintf_variation8.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vsprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
 $formats =
-  '%o %+o %-o 
+  '%o %+o %-o
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
    %\'#2o %\'2o %\'$2o %\'_2o
@@ -82,35 +82,35 @@ echo "Done";
 *** Testing vsprintf() : octal formats and non-octal values ***
 
 -- Iteration 1 --
-string(149) "2 0 12 
+string(148) "2 0 12
    361100 o 1777777777777777775456 2322
 
    30071 14 1777777777777777777764 1777777777777777416700
    12 361100 2 0"
 
 -- Iteration 2 --
-string(201) "2 1777777777777777777776 2 
+string(200) "2 1777777777777777777776 2
    361100 o 1777777777777720715133 57062645
 
    57060664 4475347 1777777777777721631371 1777777777777720717336
    2 361100 2 1777777777777777777776"
 
 -- Iteration 3 --
-string(99) "0 0 0 
+string(98) "0 0 0
    173 o 1777777777777777777605 173 
 
    2322 0 $0 _0
    0 173 0 0"
 
 -- Iteration 4 --
-string(75) "1 1 1 
+string(74) "1 1 1
    1 o    1 1   
 
    #1 1 $1 _1
    1 1 1 1"
 
 -- Iteration 5 --
-string(75) "1 1 0 
+string(74) "1 1 0
    1 o    0 1   
 
    #0 1 $1 _0

ext/standard/tests/strings/vsprintf_variation10.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
 $formats =
-  '%x %+x %-x 
+  '%x %+x %-x
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
    %\'#2x %\'2x %\'$2x %\'_2x
@@ -83,35 +83,35 @@ echo "Done";
 *** Testing vsprintf() : hexa formats and non-hexa values ***
 
 -- Iteration 1 --
-string(125) "2 0 a 
+string(124) "2 0 a
    1e240 x fffffffffffffb2e 4d2 
 
    3039 c fffffffffffffff4 fffffffffffe1dc0
    a 1e240 2 0"
 
 -- Iteration 2 --
-string(164) "2 fffffffffffffffe 2 
+string(163) "2 fffffffffffffffe 2
    1e240 x ffffffffff439a5b bc65a5
 
    bc61b4 127ae7 ffffffffff4732f9 ffffffffff439ede
    2 1e240 2 fffffffffffffffe"
 
 -- Iteration 3 --
-string(90) "0 0 0 
+string(89) "0 0 0
    7b x ffffffffffffff85 7b  
 
    4d2 0 $0 _0
    0 7b 0 0"
 
 -- Iteration 4 --
-string(75) "1 1 1 
+string(74) "1 1 1
    1 x    1 1   
 
    #1 1 $1 _1
    1 1 1 1"
 
 -- Iteration 5 --
-string(75) "1 1 0 
+string(74) "1 1 0
    1 x    0 1   
 
    #0 1 $1 _0

ext/standard/tests/strings/vsprintf_variation12_64bit.phpt

@@ -20,7 +20,7 @@ echo "*** Testing vsprintf() : unsigned formats and signed & other types of valu
 
 // defining array of unsigned formats
 $formats =
-  '%u %+u %-u 
+  '%u %+u %-u
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
    %\'#2u %\'2u %\'$2u %\'_2u
@@ -75,28 +75,28 @@ echo "Done";
 *** Testing vsprintf() : unsigned formats and signed & other types of values ***
 
 -- Iteration 1 --
-string(143) "2 0 10 
+string(142) "2 0 10
    123456 u 1234 20000000000
    2000000000000 22000000000000 12345 
    12 18446744073709551604 18446744073709428160 _3
    10 123456 2 0"
 
 -- Iteration 2 --
-string(98) "0 0 0 
+string(97) "0 0 0
    123 u 18446744073709551493 123 
             0 0          0 
    1234 0 $0 _0
    0 123 0 0"
 
 -- Iteration 3 --
-string(76) "1 1 1 
+string(75) "1 1 1
    1 u    1 1   
             1 1          1 
    #1 1 $1 _1
    1 1 1 1"
 
 -- Iteration 4 --
-string(76) "1 1 0 
+string(75) "1 1 0
    1 u    0 1   
             1 1          0 
    #0 1 $1 _0