[VarDumper] Fix dumping jsons casted as arrays

nicolas-grekas · nicolas-grekas · commit 1a41265546cf · 2016-07-15T19:01:02.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -35,14 +35,15 @@ protected function doClone($var)
         $objRefs = array();             // Map of original object handles to their stub object couterpart
         $resRefs = array();             // Map of original resource handles to their stub object couterpart
         $values = array();              // Map of stub objects' hashes to original values
+        $jsonKeys = array();
         $maxItems = $this->maxItems;
         $maxString = $this->maxString;
         $cookie = (object) array();     // Unique object used to detect hard references
         $gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
         $a = null;                      // Array cast for nested structures
         $stub = null;                   // Stub capturing the main properties of an original item value
                                         // or null if the original value is used directly
-        $zval = array(                  // Main properties of the current value
+        $zvalProto = $zval = array(     // Main properties of the current value
             'type' => null,
             'zval_isref' => null,
             'zval_hash' => null,
@@ -67,7 +68,11 @@ protected function doClone($var)
                 if ($indexed && $k !== ++$j) {
                     $indexed = false;
                 }
-                if ($useExt) {
+                if (null === $v ? !array_key_exists($k, $step) : !isset($step[$k])) {
+                    $jsonKeys[$k] = $k;
+                    $zval = $zvalProto;
+                    $zval['type'] = gettype($v);
+                } elseif ($useExt) {
                     $zval = symfony_zval_info($k, $step);
                 } else {
                     $step[$k] = $cookie;
@@ -253,7 +258,23 @@ protected function doClone($var)
                         $values[$h] = $v;
                     }
                     $queue[$i][$k]->handle = ++$refs;
+                } else {
+                    unset($jsonKeys[$k]);
+                }
+            }
+
+            if ($jsonKeys) {
+                foreach ($queue[$i] as $k => &$v) {
+                    if (isset($jsonKeys[$k])) {
+                        if ($k === $jsonKeys[$k]) {
+                            $v = $queue[$i][$k];
+                        } else {
+                            unset($queue[$i][$k]);
+                        }
+                    }
                 }
+                $jsonKeys = array();
+                unset($v);
             }
 
             if (isset($arrayRefs[$i])) {
diff --git a/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
@@ -135,6 +135,72 @@ public function testClone()
         $this->assertStringMatchesFormat($expected, print_r($clone, true));
     }
 
+    public function testJsonCast()
+    {
+        $data = (array) json_decode('{"1":{}}');
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<'EOTXT'
+object(Symfony\Component\VarDumper\Cloner\Data)#%i (4) {
+  ["data":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [0]=>
+      object(Symfony\Component\VarDumper\Cloner\Stub)#%i (7) {
+        ["type"]=>
+        string(5) "array"
+        ["class"]=>
+        string(5) "assoc"
+        ["value"]=>
+        int(1)
+        ["cut"]=>
+        int(0)
+        ["handle"]=>
+        int(0)
+        ["refCount"]=>
+        int(0)
+        ["position"]=>
+        int(1)
+      }
+    }
+    [1]=>
+    array(1) {
+      ["1"]=>
+      object(Symfony\Component\VarDumper\Cloner\Stub)#%i (7) {
+        ["type"]=>
+        string(6) "object"
+        ["class"]=>
+        string(8) "stdClass"
+        ["value"]=>
+        NULL
+        ["cut"]=>
+        int(0)
+        ["handle"]=>
+        int(%i)
+        ["refCount"]=>
+        int(0)
+        ["position"]=>
+        int(0)
+      }
+    }
+  }
+  ["maxDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(20)
+  ["maxItemsPerDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+  ["useRefHandles":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+}
+
+EOTXT;
+        ob_start();
+        var_dump($clone);
+        $this->assertStringMatchesFormat($expected, ob_get_clean());
+    }
+
     public function testCaster()
     {
         $cloner = new VarCloner(array(
