Improved number to string comparison semantics

RFC: https://wiki.php.net/rfc/string_to_number_comparison

Closes GH-3886.

8 files changed, 41 insertions, 41 deletions

diff --git a/tests/lang/operators/operator_equals_basic.phpt b/tests/lang/operators/operator_equals_basic.phpt
index 08bb9accbe..3f179a0a4c 100644
--- a/tests/lang/operators/operator_equals_basic.phpt
+++ b/tests/lang/operators/operator_equals_basic.phpt
@@ -8,17 +8,17 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 
 $int1 = 679;
 $int2 = -67835;
-$valid_int1 = array("679", "679abc", " 679", "679  ", 679.0, 6.79E2, "+679", +679);
-$valid_int2 = array("-67835", "-67835abc", " -67835", "-67835  ", -67835.000, -6.7835E4);
-$invalid_int1 = array("6 7 9", "6y79", 678);
-$invalid_int2 = array("- 67835", "-67,835", "-67 835", "-678y35", -76834);
+$valid_int1 = array("679", " 679", 679.0, 6.79E2, "+679", +679);
+$valid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4);
+$invalid_int1 = array("679abc", "679  ", "6 7 9", "6y79", 678);
+$invalid_int2 = array("-67835abc", "-67835  ", "- 67835", "-67,835", "-67 835", "-678y35", -76834);
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
-$valid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", 5.738545835e4);
-$valid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", -6.734576567E4);
-$invalid_float1 = array("57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
-$invalid_float2 = array("- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
+$valid_float1 = array("57385.45835", "  57385.45835", 5.738545835e4);
+$valid_float2 = array("-67345.76567", "  -67345.76567", -6.734576567E4);
+$invalid_float1 = array("57385.45835aaa", "57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
+$invalid_float2 = array("-67345.76567aaa", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
 
 
 $toCompare = array(
diff --git a/tests/lang/operators/operator_gt_basic.phpt b/tests/lang/operators/operator_gt_basic.phpt
index 10e711a5a5..70b8fbcdd9 100644
--- a/tests/lang/operators/operator_gt_basic.phpt
+++ b/tests/lang/operators/operator_gt_basic.phpt
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 $int1 = 679;
 $int2 = -67835;
 $valid_int1 = array("678", "678abc", " 678", "678  ", 678.0, 6.789E2, "+678", +678);
-$valid_int2 = array("-67836", "-67836abc", " -67836", "-67836  ", -67835.0001, -6.78351E4);
+$valid_int2 = array("-67836", " -67836", -67835.0001, -6.78351E4);
 $invalid_int1 = array(679, "679");
-$invalid_int2 = array(-67835, "-67835");
+$invalid_int2 = array(-67835, "-67835", "-67836abc", "-67836  ");
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
 $valid_float1 = array("57385.45834",  "57385.45834aaa", "  57385.45834", 5.738545834e4);
-$valid_float2 = array("-67345.76568", "-67345.76568aaa", "  -67345.76568", -6.734576568E4);
+$valid_float2 = array("-67345.76568", "  -67345.76568", -6.734576568E4);
 $invalid_float1 = array(57385.45835, 5.738545835e4);
-$invalid_float2 = array(-67345.76567, -6.734576567E4);
+$invalid_float2 = array(-67345.76567, -6.734576567E4, "-67345.76568aaa");
 
 
 $toCompare = array(
diff --git a/tests/lang/operators/operator_gt_or_equal_basic.phpt b/tests/lang/operators/operator_gt_or_equal_basic.phpt
index 98f7aa543a..442e721659 100644
--- a/tests/lang/operators/operator_gt_or_equal_basic.phpt
+++ b/tests/lang/operators/operator_gt_or_equal_basic.phpt
@@ -7,17 +7,17 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 
 $int1 = 679;
 $int2 = -67835;
-$valid_int1 = array("679", "679abc", " 679", 679.0, 6.79E2, "678", "678abc", " 678", 678.0, 6.78E2, 6.789E2, "+678", +678);
-$valid_int2 = array("-67835", "-67835abc", " -67835", -67835.000, -6.7835E4, "-67836", "-67836abc". " -67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
-$invalid_int1 = array(680, "680");
-$invalid_int2 = array(-67834, "-67834");
+$valid_int1 = array("679", " 679", 679.0, 6.79E2, "678", "678abc", " 678", 678.0, 6.78E2, 6.789E2, "+678", +678);
+$valid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4, "-67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
+$invalid_int1 = array(680, "680", "679abc");
+$invalid_int2 = array(-67834, "-67834", "-67835abc", "-67836abc". " -67836");
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
-$valid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", 5.738545835e4, "57385.45834",  "57385.45834aaa", "  57385.45834", 5.738545834e4);
-$valid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", -6.734576567E4, "-67345.76568", "-67345.76568aaa", "  -67345.76568", -6.734576568E4);
-$invalid_float1 = array(57385.45836, 5.738545836e4);
-$invalid_float2 = array(-67345.76564, -6.734576564E4);
+$valid_float1 = array("57385.45835", "  57385.45835", 5.738545835e4, "57385.45834",  "57385.45834aaa", "  57385.45834", 5.738545834e4);
+$valid_float2 = array("-67345.76567", "  -67345.76567", -6.734576567E4, "-67345.76568", "  -67345.76568", -6.734576568E4);
+$invalid_float1 = array(57385.45836, 5.738545836e4, "57385.45835aaa");
+$invalid_float2 = array(-67345.76564, -6.734576564E4, "-67345.76567aaa", "-67345.76568aaa");
 
 $toCompare = array(
 
diff --git a/tests/lang/operators/operator_lt_basic.phpt b/tests/lang/operators/operator_lt_basic.phpt
index 3893a4c152..98685506c7 100644
--- a/tests/lang/operators/operator_lt_basic.phpt
+++ b/tests/lang/operators/operator_lt_basic.phpt
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 $int1 = 677;
 $int2 = -67837;
 $valid_int1 = array("678", "678abc", " 678", "678  ", 678.0, 6.789E2, "+678", +678);
-$valid_int2 = array("-67836", "-67836abc", " -67836", "-67836  ", -67835.0001, -6.78351E4);
+$valid_int2 = array("-67836", " -67836", -67835.0001, -6.78351E4);
 $invalid_int1 = array(676, "676");
-$invalid_int2 = array(-67837, "-67837");
+$invalid_int2 = array(-67837, "-67837", "-67836abc", "-67836  ");
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
 $valid_float1 = array("57385.45836",  "57385.45836aaa", "  57385.45836", 5.738545836e4);
-$valid_float2 = array("-67345.76566", "-67345.76566aaa", "  -67345.76566", -6.734576566E4);
+$valid_float2 = array("-67345.76566", "  -67345.76566", -6.734576566E4);
 $invalid_float1 = array(57385.45835, 5.738545835e4);
-$invalid_float2 = array(-67345.76567, -6.734576567E4);
+$invalid_float2 = array(-67345.76567, -6.734576567E4, "-67345.76566aaa");
 
 
 $toCompare = array(
diff --git a/tests/lang/operators/operator_lt_or_equal_basic.phpt b/tests/lang/operators/operator_lt_or_equal_basic.phpt
index db09d38776..bc8b1f31fe 100644
--- a/tests/lang/operators/operator_lt_or_equal_basic.phpt
+++ b/tests/lang/operators/operator_lt_or_equal_basic.phpt
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 $int1 = 678;
 $int2 = -67836;
 $valid_int1 = array("679", "679abc", " 679", 679.0, 6.79E2, "678", "678abc", " 678", 678.0, 6.78E2, 6.789E2, "+678", +678);
-$valid_int2 = array("-67835", "-67835abc", " -67835", -67835.000, -6.7835E4, "-67836", "-67836abc". " -67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
+$valid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4, "-67836", "-67836abc". " -67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
 $invalid_int1 = array(677, "677");
-$invalid_int2 = array(-67874, "-67837");
+$invalid_int2 = array(-67874, "-67837", "-67835abc");
 
 $float1 = 57385.45834;
 $float2 = -67345.76568;
 $valid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", 5.738545835e4, "57385.45834",  "57385.45834aaa", "  57385.45834", 5.738545834e4);
-$valid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", -6.734576567E4, "-67345.76568", "-67345.76568aaa", "  -67345.76568", -6.734576568E4);
+$valid_float2 = array("-67345.76567", "  -67345.76567", -6.734576567E4, "-67345.76568", "-67345.76568aaa", "  -67345.76568", -6.734576568E4);
 $invalid_float1 = array(57385.45833, 5.738545833e4);
-$invalid_float2 = array(-67345.76569, -6.734576569E4);
+$invalid_float2 = array(-67345.76569, -6.734576569E4, "-67345.76567aaa");
 
 $toCompare = array(
   true, $valid_true, $valid_false,
diff --git a/tests/lang/operators/operator_notequals_basic.phpt b/tests/lang/operators/operator_notequals_basic.phpt
index b1202d0938..b254e6e90c 100644
--- a/tests/lang/operators/operator_notequals_basic.phpt
+++ b/tests/lang/operators/operator_notequals_basic.phpt
@@ -8,17 +8,17 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 
 $int1 = 679;
 $int2 = -67835;
-$valid_int1 = array("6 7 9", "6y79", 678);
-$valid_int2 = array("- 67835", "-67,835", "-67 835", "-678y35", -76834);
-$invalid_int1 = array("679", "679abc", " 679", "679  ", 679.0, 6.79E2, "+679", +679);
-$invalid_int2 = array("-67835", "-67835abc", " -67835", "-67835  ", -67835.000, -6.7835E4);
+$valid_int1 = array("679abc", "679  ", "6 7 9", "6y79", 678);
+$valid_int2 = array("-67835abc", "-67835  ", "- 67835", "-67,835", "-67 835", "-678y35", -76834);
+$invalid_int1 = array("679", " 679", 679.0, 6.79E2, "+679", +679);
+$invalid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4);
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
-$valid_float1 = array("57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
-$valid_float2 = array("- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
-$invalid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", 5.738545835e4);
-$invalid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", -6.734576567E4);
+$valid_float1 = array("57385.45835aaa", "57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
+$valid_float2 = array("-67345.76567aaa", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
+$invalid_float1 = array("57385.45835", "  57385.45835", 5.738545835e4);
+$invalid_float2 = array("-67345.76567", "  -67345.76567", -6.734576567E4);
 
 
 $toCompare = array(
diff --git a/tests/lang/operators/operator_spaceship_basic.phpt b/tests/lang/operators/operator_spaceship_basic.phpt
index 650cf97482..1014c46191 100644
--- a/tests/lang/operators/operator_spaceship_basic.phpt
+++ b/tests/lang/operators/operator_spaceship_basic.phpt
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
 $int1 = 679;
 $int2 = -67835;
 $valid_int1 = array("678", "678abc", " 678", "678  ", 678.0, 6.789E2, "+678", +678);
-$valid_int2 = array("-67836", "-67836abc", " -67836", "-67836  ", -67835.0001, -6.78351E4);
+$valid_int2 = array("-67836", " -67836", -67835.0001, -6.78351E4);
 $invalid_int1 = array(679, "679");
-$invalid_int2 = array(-67835, "-67835");
+$invalid_int2 = array(-67835, "-67835", "-67836abc", "-67836  ");
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
 $valid_float1 = array("57385.45834",  "57385.45834aaa", "  57385.45834", 5.738545834e4);
-$valid_float2 = array("-67345.76568", "-67345.76568aaa", "  -67345.76568", -6.734576568E4);
+$valid_float2 = array("-67345.76568", "  -67345.76568", -6.734576568E4);
 $invalid_float1 = array(57385.45835, 5.738545835e4);
-$invalid_float2 = array(-67345.76567, -6.734576567E4);
+$invalid_float2 = array(-67345.76567, -6.734576567E4, "-67345.76568aaa");
 
 
 $toCompare = array(
diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt
index c82e1e8ee9..2d01fce6a5 100644
--- a/tests/lang/string_decimals_001.phpt
+++ b/tests/lang/string_decimals_001.phpt
@@ -24,7 +24,7 @@ bool(false)
 --> Testing .9.:
 int(0)
 float(0.9)
-bool(true)
+bool(false)
 
 --> Testing 9..:
 int(9)