[VarDumper] Allow preserving a subset of cut arrays

nicolas-grekas · nicolas-grekas · commit 208ca94b67ad · 2015-04-22T15:44:48.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Caster/CutArrayStub.php b/src/Symfony/Component/VarDumper/Caster/CutArrayStub.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a cut array.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CutArrayStub extends CutStub
+{
+    public $preservedSubset;
+
+    public function __construct(array $value, array $preservedKeys)
+    {
+        parent::__construct($value);
+
+        $this->preservedSubset = array_intersect_key($value, array_flip($preservedKeys));
+        $this->cut -= count($this->preservedSubset);
+    }
+}
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -160,18 +160,7 @@ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $
         }
 
         if (isset($a[$prefix.'fstat'])) {
-            $fstat = $a[$prefix.'fstat'];
-            $fstat = array(
-                'dev' => $fstat['dev'],
-                'ino' => $fstat['ino'],
-                'nlink' => $fstat['nlink'],
-                'rdev' => $fstat['rdev'],
-                'blksize' => $fstat['blksize'],
-                'blocks' => $fstat['blocks'],
-                '…' => '…'.(count($fstat) - 6),
-            );
-
-            $a[$prefix.'fstat'] = $fstat;
+            $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
         }
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -33,6 +33,11 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
         }
     }
 
+    public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)
+    {
+        return $isNested ? $c->preservedSubset : $a;
+    }
+
     public static function cutInternals($obj, array $a, Stub $stub, $isNested)
     {
         if ($isNested) {
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -23,6 +23,7 @@ abstract class AbstractCloner implements ClonerInterface
 {
     public static $defaultCasters = array(
         'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+        'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',
         'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
 
         'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -106,14 +106,14 @@ public function testCastFileObject()
   ]
   flags: DROP_NEW_LINE|SKIP_EMPTY
   maxLineLen: 0
-  fstat: array:7 [
+  fstat: array:26 [
     "dev" => %d
     "ino" => %d
     "nlink" => %d
     "rdev" => 0
     "blksize" => %d
     "blocks" => %d
-    "…" => "…20"
+     …20
   ]
   eof: false
   key: 0

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,11 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)`
	`37`	`+ {`
	`38`	`+ return $isNested ? $c->preservedSubset : $a;`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`public static function cutInternals($obj, array $a, Stub $stub, $isNested)`
`37`	`42`	`{`
`38`	`43`	`if ($isNested) {`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ abstract class AbstractCloner implements ClonerInterface`
`23`	`23`	`{`
`24`	`24`	`public static $defaultCasters = array(`
`25`	`25`	`'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',`
	`26`	`+ 'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',`
`26`	`27`	`'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',`
`27`	`28`
`28`	`29`	`'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',`