archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +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

14
Zend/tests/bug35163_2.phpt
View file

@ -13,10 +13,6 @@ $a = null;
?>
--EXPECT--
array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
@ -24,13 +20,3 @@ array(3) {
[2]=>
*RECURSION*
}
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
}

3
Zend/tests/closure_026.phpt
View file

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

3
Zend/tests/foreach_002.phpt
View file

@ -14,9 +14,6 @@ foreach (($a = array('a' => array('a' => &$a))) as $a) {
?>
--EXPECT--
array(1) {
["a"]=>
&array(1) {
["a"]=>
*RECURSION*
}
}

3
Zend/tests/gc_004.phpt
View file

@ -13,11 +13,8 @@ echo "ok\n"
?>
--EXPECT--
array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
}
int(1)
ok

3
Zend/tests/gc_007.phpt
View file

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

3
Zend/tests/gc_010.phpt
View file

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

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

@ -24,12 +24,9 @@ echo "Done\n";
?>
--EXPECTF--
array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
}
bool(false)
int(6)

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

@ -40,16 +40,6 @@ array(4) {
Warning: mb_convert_variables(): %s on line %d
bool(false)
array(5) {
[0]=>
string(21) "日本語テキスト"
[1]=>
string(21) "日本語テキスト"
[2]=>
string(21) "日本語テキスト"
[3]=>
string(21) "日本語テキスト"
[4]=>
&array(5) {
[0]=>
string(21) "日本語テキスト"
[1]=>
@ -61,4 +51,3 @@ array(5) {
[4]=>
*RECURSION*
}
}

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

@ -31,14 +31,6 @@ string(2) "v1"
string(2) "v2"
string(2) "v1"
array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
@ -48,7 +40,6 @@ array(4) {
[1]=>
*RECURSION*
}
}
array(4) {
["k1"]=>
array(1) {
@ -84,14 +75,6 @@ string(2) "v1"
string(2) "v2"
string(2) "v1"
array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
@ -101,7 +84,6 @@ array(4) {
[1]=>
*RECURSION*
}
}
array(4) {
[0]=>
array(1) {
@ -134,14 +116,6 @@ array(4) {
}
}
array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
@ -151,7 +125,6 @@ array(4) {
[1]=>
*RECURSION*
}
}
array(4) {
[0]=>
array(2) {

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

@ -25,16 +25,6 @@ echo "Done";
--EXPECT--
*** Testing natcasesort() : usage variations ***
array(5) {
[0]=>
int(1)
[1]=>
float(3)
[2]=>
string(4) "zero"
[3]=>
string(1) "2"
[4]=>
&array(5) {
[0]=>
int(1)
[1]=>
@ -46,17 +36,8 @@ array(5) {
[4]=>
*RECURSION*
}
}
bool(true)
array(5) {
[0]=>
int(1)
[3]=>
string(1) "2"
[1]=>
float(3)
[4]=>
&array(5) {
[0]=>
int(1)
[3]=>
@ -68,7 +49,4 @@ array(5) {
[2]=>
string(4) "zero"
}
[2]=>
string(4) "zero"
}
Done

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

@ -54,8 +54,6 @@ echo "Done";
--EXPECT--
--- 1 refs container:
array(3) {
[0]=>
&array(3) {
[0]=>
*RECURSION*
[1]=>
@ -63,11 +61,6 @@ array(3) {
[2]=>
int(1)
}
[1]=>
int(1)
[2]=>
int(1)
}
string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;i:1;i:2;i:1;}i:1;i:1;i:2;i:1;}"
array(3) {
[0]=>
@ -112,8 +105,6 @@ array(3) {
--- 1,2 ref container:
array(3) {
[0]=>
&array(3) {
[0]=>
*RECURSION*
[1]=>
@ -121,18 +112,6 @@ array(3) {
[2]=>
int(1)
}
[1]=>
&array(3) {
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
int(1)
}
[2]=>
int(1)
}
string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;i:1;}i:1;R:2;i:2;i:1;}"
array(3) {
[0]=>
@ -184,8 +163,6 @@ array(3) {
--- 1,2,3 ref container:
array(3) {
[0]=>
&array(3) {
[0]=>
*RECURSION*
[1]=>
@ -193,25 +170,6 @@ array(3) {
[2]=>
*RECURSION*
}
[1]=>
&array(3) {
[0]=>
*RECURSION*
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
[2]=>
&array(3) {
[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;}"
array(3) {
[0]=>

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

@ -435,16 +435,9 @@ array(3) {
[0]=>
int(1)
[1]=>
&array(3) {
[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;}}}"
array(3) {
[0]=>

4
ext/standard/var.c
View file

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