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.

Author: nikic

Zend/tests/bug35163_2.phpt

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

Zend/tests/closure_026.phpt

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

Zend/tests/foreach_002.phpt

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

Zend/tests/gc_004.phpt

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

Zend/tests/gc_007.phpt

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

Zend/tests/gc_010.phpt

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

ext/standard/var.c

@@ -123,7 +123,7 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 			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 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 			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) {