Skip to content

Commit 10c04ac

Browse files
author
Steph Fox
committed
- killed off UEXPECT
1 parent 6d87606 commit 10c04ac

File tree

236 files changed

+420
-2162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+420
-2162
lines changed

‎tests/basic/013.phpt

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ a[]=1
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(1) {
13-
[0]=>
14-
string(1) "1"
15-
}
16-
--UEXPECT--
1712
array(1) {
1813
[0]=>
1914
unicode(1) "1"

‎tests/basic/014.phpt

-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ a[]=1&a[]=1
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(2) {
13-
[0]=>
14-
string(1) "1"
15-
[1]=>
16-
string(1) "1"
17-
}
18-
--UEXPECT--
1912
array(2) {
2013
[0]=>
2114
unicode(1) "1"

‎tests/basic/015.phpt

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ a[]=1&a[0]=5
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(1) {
13-
[0]=>
14-
string(1) "5"
15-
}
16-
--UEXPECT--
1712
array(1) {
1813
[0]=>
1914
unicode(1) "5"

‎tests/basic/016.phpt

-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ a[a]=1&a[b]=3
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(2) {
13-
["a"]=>
14-
string(1) "1"
15-
["b"]=>
16-
string(1) "3"
17-
}
18-
--UEXPECT--
1912
array(2) {
2013
[u"a"]=>
2114
unicode(1) "1"

‎tests/basic/017.phpt

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ a[]=1&a[a]=1&a[b]=3
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(3) {
13-
[0]=>
14-
string(1) "1"
15-
["a"]=>
16-
string(1) "1"
17-
["b"]=>
18-
string(1) "3"
19-
}
20-
--UEXPECT--
2112
array(3) {
2213
[0]=>
2314
unicode(1) "1"

‎tests/basic/018.phpt

-25
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,6 @@ var_dump($_POST['a']);
1010
var_dump($_POST['b']);
1111
?>
1212
--EXPECT--
13-
array(2) {
14-
[0]=>
15-
array(1) {
16-
[0]=>
17-
string(1) "1"
18-
}
19-
[1]=>
20-
array(1) {
21-
[0]=>
22-
string(1) "3"
23-
}
24-
}
25-
array(1) {
26-
["a"]=>
27-
array(1) {
28-
["b"]=>
29-
array(2) {
30-
["c"]=>
31-
string(1) "1"
32-
["d"]=>
33-
string(1) "1"
34-
}
35-
}
36-
}
37-
--UEXPECT--
3813
array(2) {
3914
[0]=>
4015
array(1) {

‎tests/basic/019.phpt

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ a[]=1&a[]]=3&a[[]=4
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(3) {
13-
[0]=>
14-
string(1) "1"
15-
[1]=>
16-
string(1) "3"
17-
["["]=>
18-
string(1) "4"
19-
}
20-
--UEXPECT--
2112
array(3) {
2213
[0]=>
2314
unicode(1) "1"

‎tests/basic/020.phpt

-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ a[a[]]=1&a[b[]]=3
99
var_dump($_POST['a']);
1010
?>
1111
--EXPECT--
12-
array(2) {
13-
["a["]=>
14-
string(1) "1"
15-
["b["]=>
16-
string(1) "3"
17-
}
18-
--UEXPECT--
1912
array(2) {
2013
[u"a["]=>
2114
unicode(1) "1"

‎tests/basic/022.phpt

+1-24
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,12 @@
11
--TEST--
22
Cookies test#1
33
--COOKIE--
4-
cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=ţćö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10
4+
cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10
55
--FILE--
66
<?php
77
var_dump($_COOKIE);
88
?>
99
--EXPECT--
10-
array(10) {
11-
["cookie1"]=>
12-
string(6) "val1 "
13-
["cookie2"]=>
14-
string(5) "val2 "
15-
["cookie3"]=>
16-
string(6) "val 3."
17-
["cookie_4"]=>
18-
string(10) " value 4 ;"
19-
["cookie__5"]=>
20-
string(7) " value"
21-
["cookie_6"]=>
22-
string(3) "ţćö"
23-
["cookie_7"]=>
24-
string(0) ""
25-
["$cookie_8"]=>
26-
string(0) ""
27-
["cookie-9"]=>
28-
string(1) "1"
29-
["-_&_%_$cookie_10"]=>
30-
string(2) "10"
31-
}
32-
--UEXPECTF--
3310
array(10) {
3411
[u"cookie1"]=>
3512
unicode(0) ""

‎tests/basic/023.phpt

-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","valu
77
var_dump($_COOKIE);
88
?>
99
--EXPECT--
10-
array(3) {
11-
["c_o_o_k_i_e"]=>
12-
string(5) "value"
13-
["name"]=>
14-
string(24) ""value","value",UEhQIQ=="
15-
["UEhQIQ"]=>
16-
string(4) "=foo"
17-
}
18-
--UEXPECT--
1910
array(3) {
2011
[u"c_o_o_k_i_e"]=>
2112
unicode(1) "v"

‎tests/basic/024.phpt

-17
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,6 @@ a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3
1212
var_dump($_POST, $HTTP_RAW_POST_DATA);
1313
?>
1414
--EXPECT--
15-
array(3) {
16-
["a"]=>
17-
string(3) "ABC"
18-
["y"]=>
19-
string(3) "XYZ"
20-
["c"]=>
21-
array(3) {
22-
[0]=>
23-
string(1) "1"
24-
[1]=>
25-
string(1) "2"
26-
["a"]=>
27-
string(1) "3"
28-
}
29-
}
30-
string(30) "a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3"
31-
--UEXPECT--
3215
array(3) {
3316
[u"a"]=>
3417
unicode(3) "ABC"

‎tests/basic/026.phpt

-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ var_dump($_POST, $HTTP_RAW_POST_DATA);
1515
--EXPECT--
1616
array(0) {
1717
}
18-
string(9) "a=1&b=ZYX"
19-
--UEXPECT--
20-
array(0) {
21-
}
2218
unicode(9) "a=1&b=ZYX"

‎tests/basic/027.phpt

-18
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,6 @@ a=1&b=ZYX&c[][][][][][][][][][][][][][][][][][][][][][]=123&d=123&e[][]][]=3
1616
var_dump($_POST, $php_errormsg);
1717
?>
1818
--EXPECT--
19-
array(4) {
20-
["a"]=>
21-
string(1) "1"
22-
["b"]=>
23-
string(3) "ZYX"
24-
["d"]=>
25-
string(3) "123"
26-
["e"]=>
27-
array(1) {
28-
[0]=>
29-
array(1) {
30-
[0]=>
31-
string(1) "3"
32-
}
33-
}
34-
}
35-
string(106) "Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini."
36-
--UEXPECT--
3719
array(4) {
3820
[u"a"]=>
3921
unicode(1) "1"

‎tests/basic/bug29971.phpt

-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,4 @@ array(0) {
1313
}
1414
array(0) {
1515
}
16-
string(3) "GPC"
17-
--UEXPECT--
18-
array(0) {
19-
}
20-
array(0) {
21-
}
2216
unicode(3) "GPC"

‎tests/classes/__call_001.phpt

-20
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,6 @@ var_dump($a);
2222
?>
2323
--EXPECT--
2424
Method test called:
25-
array(4) {
26-
[0]=>
27-
int(1)
28-
[1]=>
29-
string(1) "2"
30-
[2]=>
31-
float(3.4)
32-
[3]=>
33-
bool(true)
34-
}
35-
array(3) {
36-
[0]=>
37-
int(1)
38-
[1]=>
39-
int(2)
40-
[2]=>
41-
int(3)
42-
}
43-
--UEXPECT--
44-
Method test called:
4525
array(4) {
4626
[0]=>
4727
int(1)

‎tests/classes/__call_003.phpt

+2-11
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,12 @@ Force pass-by-reference to __call
2121

2222
var_dump($a, $b);
2323
?>
24-
--EXPECTF--
25-
array(1) {
26-
[0]=>
27-
string(8) "original"
28-
}
29-
array(1) {
30-
[0]=>
31-
&string(7) "changed"
32-
}
33-
--UEXPECTF--
24+
--EXPECT--
3425
array(1) {
3526
[0]=>
3627
unicode(8) "original"
3728
}
3829
array(1) {
3930
[0]=>
4031
&unicode(7) "changed"
41-
}
32+
}

‎tests/classes/__call_004.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class B extends A {
2626
$b = new B();
2727
$b->test();
2828
?>
29-
--EXPECTF--
29+
--EXPECT--
3030
In B::__call(test1, array(1,a))
3131
object(B)#1 (0) {
3232
}
@@ -38,4 +38,4 @@ object(B)#1 (0) {
3838
}
3939
In B::__call(test4, array(1,a))
4040
object(B)#1 (0) {
41-
}
41+
}

‎tests/classes/__call_005.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class B extends A {
2121
$b = new B();
2222
$b->test();
2323
?>
24-
--EXPECTF--
24+
--EXPECT--
2525
In A::__call(test1, array(1,a))
2626
object(B)#1 (0) {
2727
}
@@ -33,4 +33,4 @@ object(B)#1 (0) {
3333
}
3434
In A::__call(test4, array(1,a))
3535
object(B)#1 (0) {
36-
}
36+
}

‎tests/classes/__set__get_001.phpt

+1-25
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class setter {
2323

2424
function __set($nm, $val) {
2525
echo "Setting [$nm] to $val\n";
26-
26+
2727
if (isset($this->x[$nm])) {
2828
$this->x[$nm] = $val;
2929
echo "OK!\n";
@@ -57,30 +57,6 @@ Getting [z]
5757
Nothing!
5858
Setting [z] to 1
5959
Not OK!
60-
object(setter)#%d (2) {
61-
["n"]=>
62-
int(1)
63-
["x"]=>
64-
array(3) {
65-
["a"]=>
66-
int(101)
67-
["b"]=>
68-
int(2)
69-
["c"]=>
70-
int(3)
71-
}
72-
}
73-
--UEXPECTF--
74-
Setting [a] to 100
75-
OK!
76-
Getting [a]
77-
Returning: 100
78-
Setting [a] to 101
79-
OK!
80-
Getting [z]
81-
Nothing!
82-
Setting [z] to 1
83-
Not OK!
8460
object(setter)#%d (2) {
8561
[u"n"]=>
8662
int(1)

‎tests/classes/__set__get_004.phpt

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ var_dump($foo->bar->baz);
3434
?>
3535
===DONE===
3636
--EXPECT--
37-
string(5) "Check"
38-
string(5) "Check"
39-
===DONE===
40-
--UEXPECT--
4137
unicode(5) "Check"
4238
unicode(5) "Check"
4339
===DONE===

0 commit comments

Comments
 (0)