Skip to content

Commit ae6f45a

Browse files
committed
var_dump(): Don't skip recursion detection on first level
This is confusing. The current output doesn't make it clear that we're in fact recursing to the top-level structure. Closes phpGH-5171.
1 parent 9e56502 commit ae6f45a

File tree

13 files changed

+23
-164
lines changed

13 files changed

+23
-164
lines changed

Zend/tests/bug35163_2.phpt

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,7 @@ array(3) {
1616
[0]=>
1717
int(2)
1818
[1]=>
19-
&array(3) {
20-
[0]=>
21-
int(2)
22-
[1]=>
23-
*RECURSION*
24-
[2]=>
25-
*RECURSION*
26-
}
19+
*RECURSION*
2720
[2]=>
28-
&array(3) {
29-
[0]=>
30-
int(2)
31-
[1]=>
32-
*RECURSION*
33-
[2]=>
34-
*RECURSION*
35-
}
21+
*RECURSION*
3622
}

Zend/tests/closure_026.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ array(1) {
4747
["this"]=>
4848
object(foo)#%d (1) {
4949
["a"]=>
50-
array(1) {
51-
[0]=>
52-
*RECURSION*
53-
}
50+
*RECURSION*
5451
}
5552
}
5653
}

Zend/tests/foreach_002.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,5 @@ foreach (($a = array('a' => array('a' => &$a))) as $a) {
1515
--EXPECT--
1616
array(1) {
1717
["a"]=>
18-
&array(1) {
19-
["a"]=>
20-
*RECURSION*
21-
}
18+
*RECURSION*
2219
}

Zend/tests/gc_004.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ echo "ok\n"
1414
--EXPECT--
1515
array(1) {
1616
[0]=>
17-
&array(1) {
18-
[0]=>
19-
*RECURSION*
20-
}
17+
*RECURSION*
2118
}
2219
int(1)
2320
ok

Zend/tests/gc_007.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ echo "ok\n"
1515
--EXPECT--
1616
array(1) {
1717
[0]=>
18-
&array(1) {
19-
[0]=>
20-
*RECURSION*
21-
}
18+
*RECURSION*
2219
}
2320
int(0)
2421
int(1)

Zend/tests/gc_010.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ echo "ok\n"
1515
--EXPECT--
1616
array(1) {
1717
[0]=>
18-
&array(1) {
19-
[0]=>
20-
*RECURSION*
21-
}
18+
*RECURSION*
2219
}
2320
int(1)
2421
ok

ext/json/tests/003.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ echo "Done\n";
2525
--EXPECTF--
2626
array(1) {
2727
[0]=>
28-
&array(1) {
29-
[0]=>
30-
*RECURSION*
31-
}
28+
*RECURSION*
3229
}
3330

3431
bool(false)

ext/mbstring/tests/bug66964.phpt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,5 @@ array(5) {
4949
[3]=>
5050
string(21) "日本語テキスト"
5151
[4]=>
52-
&array(5) {
53-
[0]=>
54-
string(21) "日本語テキスト"
55-
[1]=>
56-
string(21) "日本語テキスト"
57-
[2]=>
58-
string(21) "日本語テキスト"
59-
[3]=>
60-
string(21) "日本語テキスト"
61-
[4]=>
62-
*RECURSION*
63-
}
52+
*RECURSION*
6453
}

ext/standard/tests/array/array_map_variation2.phpt

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,7 @@ array(4) {
3838
[0]=>
3939
&string(2) "v1"
4040
[1]=>
41-
&array(4) {
42-
["k1"]=>
43-
&string(2) "v1"
44-
["k2"]=>
45-
string(2) "v2"
46-
[0]=>
47-
&string(2) "v1"
48-
[1]=>
49-
*RECURSION*
50-
}
41+
*RECURSION*
5142
}
5243
array(4) {
5344
["k1"]=>
@@ -91,16 +82,7 @@ array(4) {
9182
[0]=>
9283
&string(2) "v1"
9384
[1]=>
94-
&array(4) {
95-
["k1"]=>
96-
&string(2) "v1"
97-
["k2"]=>
98-
string(2) "v2"
99-
[0]=>
100-
&string(2) "v1"
101-
[1]=>
102-
*RECURSION*
103-
}
85+
*RECURSION*
10486
}
10587
array(4) {
10688
[0]=>
@@ -141,16 +123,7 @@ array(4) {
141123
[0]=>
142124
&string(2) "v1"
143125
[1]=>
144-
&array(4) {
145-
["k1"]=>
146-
&string(2) "v1"
147-
["k2"]=>
148-
string(2) "v2"
149-
[0]=>
150-
&string(2) "v1"
151-
[1]=>
152-
*RECURSION*
153-
}
126+
*RECURSION*
154127
}
155128
array(4) {
156129
[0]=>

ext/standard/tests/array/natcasesort_variation7.phpt

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,7 @@ array(5) {
3434
[3]=>
3535
string(1) "2"
3636
[4]=>
37-
&array(5) {
38-
[0]=>
39-
int(1)
40-
[1]=>
41-
float(3)
42-
[2]=>
43-
string(4) "zero"
44-
[3]=>
45-
string(1) "2"
46-
[4]=>
47-
*RECURSION*
48-
}
37+
*RECURSION*
4938
}
5039
bool(true)
5140
array(5) {
@@ -56,18 +45,7 @@ array(5) {
5645
[1]=>
5746
float(3)
5847
[4]=>
59-
&array(5) {
60-
[0]=>
61-
int(1)
62-
[3]=>
63-
string(1) "2"
64-
[1]=>
65-
float(3)
66-
[4]=>
67-
*RECURSION*
68-
[2]=>
69-
string(4) "zero"
70-
}
48+
*RECURSION*
7149
[2]=>
7250
string(4) "zero"
7351
}

0 commit comments

Comments
 (0)