archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

var_dump(): Don't skip recursion detection on first level

Browse source 
This is confusing. The current output doesn't make it clear that
we're in fact recursing to the top-level structure.

Closes GH-5171.
This commit is contained in:
Nikita Popov 2020-02-12 10:27:28 +01:00
parent 9e5650265c
commit ae6f45ad45
13 changed files with 23 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Zend/tests/bug35163_2.phpt
View file

@ -16,21 +16,7 @@ array(3) {
[0]=> [0]=>
int(2) int(2)
[1]=> [1]=>
&array(3) { *RECURSION*
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
[2]=> [2]=>
&array(3) { *RECURSION*
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
} }

5
Zend/tests/closure_026.phpt
View file

@ -47,10 +47,7 @@ array(1) {
["this"]=> ["this"]=>
object(foo)#%d (1) { object(foo)#%d (1) {
["a"]=> ["a"]=>
array(1) { *RECURSION*
[0]=>
*RECURSION*
}
} }
} }
} }

5
Zend/tests/foreach_002.phpt
View file

@ -15,8 +15,5 @@ foreach (($a = array('a' => array('a' => &$a))) as $a) {
--EXPECT-- --EXPECT--
array(1) { array(1) {
["a"]=> ["a"]=>
&array(1) { *RECURSION*
["a"]=>
*RECURSION*
}
} }

5
Zend/tests/gc_004.phpt
View file

@ -14,10 +14,7 @@ echo "ok\n"
--EXPECT-- --EXPECT--
array(1) { array(1) {
[0]=> [0]=>
&array(1) { *RECURSION*
[0]=>
*RECURSION*
}
} }
int(1) int(1)
ok ok

5
Zend/tests/gc_007.phpt
View file

@ -15,10 +15,7 @@ echo "ok\n"
--EXPECT-- --EXPECT--
array(1) { array(1) {
[0]=> [0]=>
&array(1) { *RECURSION*
[0]=>
*RECURSION*
}
} }
int(0) int(0)
int(1) int(1)

5
Zend/tests/gc_010.phpt
View file

@ -15,10 +15,7 @@ echo "ok\n"
--EXPECT-- --EXPECT--
array(1) { array(1) {
[0]=> [0]=>
&array(1) { *RECURSION*
[0]=>
*RECURSION*
}
} }
int(1) int(1)
ok ok

5
ext/json/tests/003.phpt
View file

@ -25,10 +25,7 @@ echo "Done\n";
--EXPECTF-- --EXPECTF--
array(1) { array(1) {
[0]=> [0]=>
&array(1) { *RECURSION*
[0]=>
*RECURSION*
}
} }
bool(false) bool(false)

13
ext/mbstring/tests/bug66964.phpt
View file

@ -49,16 +49,5 @@ array(5) {
[3]=> [3]=>
string(21) "日本語テキスト" string(21) "日本語テキスト"
[4]=> [4]=>
&array(5) { *RECURSION*
[0]=>
string(21) "日本語テキスト"
[1]=>
string(21) "日本語テキスト"
[2]=>
string(21) "日本語テキスト"
[3]=>
string(21) "日本語テキスト"
[4]=>
*RECURSION*
}
} }

33
ext/standard/tests/array/array_map_variation2.phpt
View file

@ -38,16 +38,7 @@ array(4) {
[0]=> [0]=>
&string(2) "v1" &string(2) "v1"
[1]=> [1]=>
&array(4) { *RECURSION*
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
} }
array(4) { array(4) {
["k1"]=> ["k1"]=>
@ -91,16 +82,7 @@ array(4) {
[0]=> [0]=>
&string(2) "v1" &string(2) "v1"
[1]=> [1]=>
&array(4) { *RECURSION*
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
} }
array(4) { array(4) {
[0]=> [0]=>
@ -141,16 +123,7 @@ array(4) {
[0]=> [0]=>
&string(2) "v1" &string(2) "v1"
[1]=> [1]=>
&array(4) { *RECURSION*
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
} }
array(4) { array(4) {
[0]=> [0]=>

26
ext/standard/tests/array/natcasesort_variation7.phpt
View file

@ -34,18 +34,7 @@ array(5) {
[3]=> [3]=>
string(1) "2" string(1) "2"
[4]=> [4]=>
&array(5) { *RECURSION*
[0]=>
int(1)
[1]=>
float(3)
[2]=>
string(4) "zero"
[3]=>
string(1) "2"
[4]=>
*RECURSION*
}
} }
bool(true) bool(true)
array(5) { array(5) {
@ -56,18 +45,7 @@ array(5) {
[1]=> [1]=>
float(3) float(3)
[4]=> [4]=>
&array(5) { *RECURSION*
[0]=>
int(1)
[3]=>
string(1) "2"
[1]=>
float(3)
[4]=>
*RECURSION*
[2]=>
string(4) "zero"
}
[2]=> [2]=>
string(4) "zero" string(4) "zero"
} }

54
ext/standard/tests/serialize/serialization_arrays_004.phpt
View file

@ -55,14 +55,7 @@ echo "Done";
--- 1 refs container: --- 1 refs container:
array(3) { array(3) {
[0]=> [0]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
int(1)
[2]=>
int(1)
}
[1]=> [1]=>
int(1) int(1)
[2]=> [2]=>
@ -113,23 +106,9 @@ array(3) {
--- 1,2 ref container: --- 1,2 ref container:
array(3) { array(3) {
[0]=> [0]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
int(1)
}
[1]=> [1]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
int(1)
}
[2]=> [2]=>
int(1) int(1)
} }
@ -185,32 +164,11 @@ array(3) {
--- 1,2,3 ref container: --- 1,2,3 ref container:
array(3) { array(3) {
[0]=> [0]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
[1]=> [1]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
[2]=> [2]=>
&array(3) { *RECURSION*
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
} }
string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;R:2;}i:1;R:2;i:2;R:2;}" string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;R:2;}i:1;R:2;i:2;R:2;}"
array(3) { array(3) {

9
ext/standard/tests/serialize/serialization_arrays_005.phpt
View file

@ -435,14 +435,7 @@ array(3) {
[0]=> [0]=>
int(1) int(1)
[1]=> [1]=>
&array(3) { *RECURSION*
[0]=>
int(1)
[1]=>
int(1)
[2]=>
*RECURSION*
}
} }
} }
string(74) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;i:1;i:1;a:3:{i:0;i:1;i:1;i:1;i:2;R:4;}}}" string(74) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;i:1;i:1;a:3:{i:0;i:1;i:1;i:1;i:2;R:4;}}}"

4
ext/standard/var.c
View file

@ -123,7 +123,7 @@ again:
break; break;
case IS_ARRAY: case IS_ARRAY:
myht = Z_ARRVAL_P(struc); myht = Z_ARRVAL_P(struc);
if (level > 1 && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (!(GC_FLAGS(myht) & GC_IMMUTABLE)) {
if (GC_IS_RECURSIVE(myht)) { if (GC_IS_RECURSIVE(myht)) {
PUTS("*RECURSION*\n"); PUTS("*RECURSION*\n");
return; return;
@ -136,7 +136,7 @@ again:
ZEND_HASH_FOREACH_KEY_VAL_IND(myht, num, key, val) { ZEND_HASH_FOREACH_KEY_VAL_IND(myht, num, key, val) {
php_array_element_dump(val, num, key, level); php_array_element_dump(val, num, key, level);
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
if (level > 1 && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (!(GC_FLAGS(myht) & GC_IMMUTABLE)) {
GC_UNPROTECT_RECURSION(myht); GC_UNPROTECT_RECURSION(myht);
} }
if (level > 1) { if (level > 1) {