Skip to content

Commit 9125984

Browse files
nikicnikic
committed
Test fixes
1 parent 4f4d2be commit 9125984

14 files changed

+65
-65
lines changed

‎Zend/tests/compare_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int(0) == string(0) ""
134134
int(0) != int(1)
135135
int(0) != float(2.5)
136136
int(0) == int(0)
137-
int(0) == string(6) "string"
137+
int(0) != string(6) "string"
138138
int(0) != string(3) "123"
139139
int(0) != string(3) "2.5"
140140
int(0) == NULL
@@ -156,7 +156,7 @@ string(6) "string" != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" != string(0) ""
157157
string(6) "string" != int(1)
158158
string(6) "string" != float(2.5)
159-
string(6) "string" == int(0)
159+
string(6) "string" != int(0)
160160
string(6) "string" == string(6) "string"
161161
string(6) "string" != string(3) "123"
162162
string(6) "string" != string(3) "2.5"

‎Zend/tests/compare_001_64bit.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int(0) == string(0) ""
134134
int(0) != int(1)
135135
int(0) != float(2.5)
136136
int(0) == int(0)
137-
int(0) == string(6) "string"
137+
int(0) != string(6) "string"
138138
int(0) != string(3) "123"
139139
int(0) != string(3) "2.5"
140140
int(0) == NULL
@@ -156,7 +156,7 @@ string(6) "string" != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" != string(0) ""
157157
string(6) "string" != int(1)
158158
string(6) "string" != float(2.5)
159-
string(6) "string" == int(0)
159+
string(6) "string" != int(0)
160160
string(6) "string" == string(6) "string"
161161
string(6) "string" != string(3) "123"
162162
string(6) "string" != string(3) "2.5"

‎Zend/tests/compare_003_64bit.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int(1) > string(0) ""
8888
int(1) <= int(1)
8989
int(1) <= float(2.5)
9090
int(1) > int(0)
91-
int(1) > string(6) "string"
91+
int(1) <= string(6) "string"
9292
int(1) <= string(3) "123"
9393
int(1) <= string(3) "2.5"
9494
int(1) > NULL
@@ -111,7 +111,7 @@ float(2.5) > string(0) ""
111111
float(2.5) > int(1)
112112
float(2.5) <= float(2.5)
113113
float(2.5) > int(0)
114-
float(2.5) > string(6) "string"
114+
float(2.5) <= string(6) "string"
115115
float(2.5) <= string(3) "123"
116116
float(2.5) <= string(3) "2.5"
117117
float(2.5) > NULL
@@ -154,9 +154,9 @@ int(0) > int(-9223372036854775808)
154154
int(0) > string(20) "-9223372036854775808"
155155
string(6) "string" <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" > string(0) ""
157-
string(6) "string" <= int(1)
158-
string(6) "string" <= float(2.5)
159-
string(6) "string" <= int(0)
157+
string(6) "string" > int(1)
158+
string(6) "string" > float(2.5)
159+
string(6) "string" > int(0)
160160
string(6) "string" <= string(6) "string"
161161
string(6) "string" > string(3) "123"
162162
string(6) "string" > string(3) "2.5"

‎Zend/tests/compare_004_64bit.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int(1) >= string(0) ""
8888
int(1) >= int(1)
8989
int(1) < float(2.5)
9090
int(1) >= int(0)
91-
int(1) >= string(6) "string"
91+
int(1) < string(6) "string"
9292
int(1) < string(3) "123"
9393
int(1) < string(3) "2.5"
9494
int(1) >= NULL
@@ -111,7 +111,7 @@ float(2.5) >= string(0) ""
111111
float(2.5) >= int(1)
112112
float(2.5) >= float(2.5)
113113
float(2.5) >= int(0)
114-
float(2.5) >= string(6) "string"
114+
float(2.5) < string(6) "string"
115115
float(2.5) < string(3) "123"
116116
float(2.5) >= string(3) "2.5"
117117
float(2.5) >= NULL
@@ -134,7 +134,7 @@ int(0) >= string(0) ""
134134
int(0) < int(1)
135135
int(0) < float(2.5)
136136
int(0) >= int(0)
137-
int(0) >= string(6) "string"
137+
int(0) < string(6) "string"
138138
int(0) < string(3) "123"
139139
int(0) < string(3) "2.5"
140140
int(0) >= NULL
@@ -154,8 +154,8 @@ int(0) >= int(-9223372036854775808)
154154
int(0) >= string(20) "-9223372036854775808"
155155
string(6) "string" < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" >= string(0) ""
157-
string(6) "string" < int(1)
158-
string(6) "string" < float(2.5)
157+
string(6) "string" >= int(1)
158+
string(6) "string" >= float(2.5)
159159
string(6) "string" >= int(0)
160160
string(6) "string" >= string(6) "string"
161161
string(6) "string" >= string(3) "123"

‎Zend/tests/compare_005_64bit.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int(1) >= string(0) ""
8888
int(1) >= int(1)
8989
int(1) < float(2.5)
9090
int(1) >= int(0)
91-
int(1) >= string(6) "string"
91+
int(1) < string(6) "string"
9292
int(1) < string(3) "123"
9393
int(1) < string(3) "2.5"
9494
int(1) >= NULL
@@ -111,7 +111,7 @@ float(2.5) >= string(0) ""
111111
float(2.5) >= int(1)
112112
float(2.5) >= float(2.5)
113113
float(2.5) >= int(0)
114-
float(2.5) >= string(6) "string"
114+
float(2.5) < string(6) "string"
115115
float(2.5) < string(3) "123"
116116
float(2.5) >= string(3) "2.5"
117117
float(2.5) >= NULL
@@ -134,7 +134,7 @@ int(0) >= string(0) ""
134134
int(0) < int(1)
135135
int(0) < float(2.5)
136136
int(0) >= int(0)
137-
int(0) >= string(6) "string"
137+
int(0) < string(6) "string"
138138
int(0) < string(3) "123"
139139
int(0) < string(3) "2.5"
140140
int(0) >= NULL
@@ -154,8 +154,8 @@ int(0) >= int(-9223372036854775808)
154154
int(0) >= string(20) "-9223372036854775808"
155155
string(6) "string" < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" >= string(0) ""
157-
string(6) "string" < int(1)
158-
string(6) "string" < float(2.5)
157+
string(6) "string" >= int(1)
158+
string(6) "string" >= float(2.5)
159159
string(6) "string" >= int(0)
160160
string(6) "string" >= string(6) "string"
161161
string(6) "string" >= string(3) "123"

‎Zend/tests/compare_006_64bit.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int(1) > string(0) ""
8888
int(1) <= int(1)
8989
int(1) <= float(2.5)
9090
int(1) > int(0)
91-
int(1) > string(6) "string"
91+
int(1) <= string(6) "string"
9292
int(1) <= string(3) "123"
9393
int(1) <= string(3) "2.5"
9494
int(1) > NULL
@@ -111,7 +111,7 @@ float(2.5) > string(0) ""
111111
float(2.5) > int(1)
112112
float(2.5) <= float(2.5)
113113
float(2.5) > int(0)
114-
float(2.5) > string(6) "string"
114+
float(2.5) <= string(6) "string"
115115
float(2.5) <= string(3) "123"
116116
float(2.5) <= string(3) "2.5"
117117
float(2.5) > NULL
@@ -154,9 +154,9 @@ int(0) > int(-9223372036854775808)
154154
int(0) > string(20) "-9223372036854775808"
155155
string(6) "string" <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)}
156156
string(6) "string" > string(0) ""
157-
string(6) "string" <= int(1)
158-
string(6) "string" <= float(2.5)
159-
string(6) "string" <= int(0)
157+
string(6) "string" > int(1)
158+
string(6) "string" > float(2.5)
159+
string(6) "string" > int(0)
160160
string(6) "string" <= string(6) "string"
161161
string(6) "string" > string(3) "123"
162162
string(6) "string" > string(3) "2.5"

‎tests/lang/operators/operator_equals_basic.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ $valid_false = array(0, "", 0.0, array(), NULL);
88

99
$int1 = 679;
1010
$int2 = -67835;
11-
$valid_int1 = array("679", "679abc", " 679", "679 ", 679.0, 6.79E2, "+679", +679);
12-
$valid_int2 = array("-67835", "-67835abc", " -67835", "-67835 ", -67835.000, -6.7835E4);
13-
$invalid_int1 = array("6 7 9", "6y79", 678);
14-
$invalid_int2 = array("- 67835", "-67,835", "-67 835", "-678y35", -76834);
11+
$valid_int1 = array("679", " 679", 679.0, 6.79E2, "+679", +679);
12+
$valid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4);
13+
$invalid_int1 = array("679abc", "679 ", "6 7 9", "6y79", 678);
14+
$invalid_int2 = array("-67835abc", "-67835 ", "- 67835", "-67,835", "-67 835", "-678y35", -76834);
1515

1616
$float1 = 57385.45835;
1717
$float2 = -67345.76567;
18-
$valid_float1 = array("57385.45835", "57385.45835aaa", " 57385.45835", 5.738545835e4);
19-
$valid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", -6.734576567E4);
20-
$invalid_float1 = array("57385. 45835", "57,385.45835", 57385.45834, 5.738545834e4);
21-
$invalid_float2 = array("- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
18+
$valid_float1 = array("57385.45835", " 57385.45835", 5.738545835e4);
19+
$valid_float2 = array("-67345.76567", " -67345.76567", -6.734576567E4);
20+
$invalid_float1 = array("57385.45835aaa", "57385. 45835", "57,385.45835", 57385.45834, 5.738545834e4);
21+
$invalid_float2 = array("-67345.76567aaa", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
2222

2323

2424
$toCompare = array(

‎tests/lang/operators/operator_gt_basic.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
88
$int1 = 679;
99
$int2 = -67835;
1010
$valid_int1 = array("678", "678abc", " 678", "678 ", 678.0, 6.789E2, "+678", +678);
11-
$valid_int2 = array("-67836", "-67836abc", " -67836", "-67836 ", -67835.0001, -6.78351E4);
11+
$valid_int2 = array("-67836", " -67836", -67835.0001, -6.78351E4);
1212
$invalid_int1 = array(679, "679");
13-
$invalid_int2 = array(-67835, "-67835");
13+
$invalid_int2 = array(-67835, "-67835", "-67836abc", "-67836 ");
1414

1515
$float1 = 57385.45835;
1616
$float2 = -67345.76567;
1717
$valid_float1 = array("57385.45834", "57385.45834aaa", " 57385.45834", 5.738545834e4);
18-
$valid_float2 = array("-67345.76568", "-67345.76568aaa", " -67345.76568", -6.734576568E4);
18+
$valid_float2 = array("-67345.76568", " -67345.76568", -6.734576568E4);
1919
$invalid_float1 = array(57385.45835, 5.738545835e4);
20-
$invalid_float2 = array(-67345.76567, -6.734576567E4);
20+
$invalid_float2 = array(-67345.76567, -6.734576567E4, "-67345.76568aaa");
2121

2222

2323
$toCompare = array(

‎tests/lang/operators/operator_gt_or_equal_basic.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ $valid_false = array(0, "", 0.0, array(), NULL);
77

88
$int1 = 679;
99
$int2 = -67835;
10-
$valid_int1 = array("679", "679abc", " 679", 679.0, 6.79E2, "678", "678abc", " 678", 678.0, 6.78E2, 6.789E2, "+678", +678);
11-
$valid_int2 = array("-67835", "-67835abc", " -67835", -67835.000, -6.7835E4, "-67836", "-67836abc". " -67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
12-
$invalid_int1 = array(680, "680");
13-
$invalid_int2 = array(-67834, "-67834");
10+
$valid_int1 = array("679", " 679", 679.0, 6.79E2, "678", "678abc", " 678", 678.0, 6.78E2, 6.789E2, "+678", +678);
11+
$valid_int2 = array("-67835", " -67835", -67835.000, -6.7835E4, "-67836", -67835.0001, -6.78351E4, "-67836", -67835.0001, -6.78351E4);
12+
$invalid_int1 = array(680, "680", "679abc");
13+
$invalid_int2 = array(-67834, "-67834", "-67835abc", "-67836abc". " -67836");
1414

1515
$float1 = 57385.45835;
1616
$float2 = -67345.76567;
17-
$valid_float1 = array("57385.45835", "57385.45835aaa", " 57385.45835", 5.738545835e4, "57385.45834", "57385.45834aaa", " 57385.45834", 5.738545834e4);
18-
$valid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", -6.734576567E4, "-67345.76568", "-67345.76568aaa", " -67345.76568", -6.734576568E4);
19-
$invalid_float1 = array(57385.45836, 5.738545836e4);
20-
$invalid_float2 = array(-67345.76564, -6.734576564E4);
17+
$valid_float1 = array("57385.45835", " 57385.45835", 5.738545835e4, "57385.45834", "57385.45834aaa", " 57385.45834", 5.738545834e4);
18+
$valid_float2 = array("-67345.76567", " -67345.76567", -6.734576567E4, "-67345.76568", " -67345.76568", -6.734576568E4);
19+
$invalid_float1 = array(57385.45836, 5.738545836e4, "57385.45835aaa");
20+
$invalid_float2 = array(-67345.76564, -6.734576564E4, "-67345.76567aaa", "-67345.76568aaa");
2121

2222
$toCompare = array(
2323

‎tests/lang/operators/operator_lt_basic.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ $valid_false = array(0, "", 0.0, array(), NULL);
88
$int1 = 677;
99
$int2 = -67837;
1010
$valid_int1 = array("678", "678abc", " 678", "678 ", 678.0, 6.789E2, "+678", +678);
11-
$valid_int2 = array("-67836", "-67836abc", " -67836", "-67836 ", -67835.0001, -6.78351E4);
11+
$valid_int2 = array("-67836", " -67836", -67835.0001, -6.78351E4);
1212
$invalid_int1 = array(676, "676");
13-
$invalid_int2 = array(-67837, "-67837");
13+
$invalid_int2 = array(-67837, "-67837", "-67836abc", "-67836 ");
1414

1515
$float1 = 57385.45835;
1616
$float2 = -67345.76567;
1717
$valid_float1 = array("57385.45836", "57385.45836aaa", " 57385.45836", 5.738545836e4);
18-
$valid_float2 = array("-67345.76566", "-67345.76566aaa", " -67345.76566", -6.734576566E4);
18+
$valid_float2 = array("-67345.76566", " -67345.76566", -6.734576566E4);
1919
$invalid_float1 = array(57385.45835, 5.738545835e4);
20-
$invalid_float2 = array(-67345.76567, -6.734576567E4);
20+
$invalid_float2 = array(-67345.76567, -6.734576567E4, "-67345.76566aaa");
2121

2222

2323
$toCompare = array(

0 commit comments

Comments
 (0)