diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[VarDumper] Fix dumping ArrayObject and ArrayIterator instances

Browse Source
This commit is contained in:
Nicolas Grekas 2018-06-13 13:43:13 +02:00
parent 5c2b2bb2ce
commit 3ecabfc36e
3 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Symfony/Component/VarDumper/Caster/SplCaster.php
View File

@ -29,30 +29,12 @@ class SplCaster
public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested) public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
{ {
$prefix = Caster::PREFIX_VIRTUAL; return self::castSplArray($c, $a, $stub, $isNested);
$class = $stub->class; }
$flags = $c->getFlags();
$b = array( public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub, $isNested)
$prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST), {
$prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS), return self::castSplArray($c, $a, $stub, $isNested);
$prefix.'iteratorClass' => $c->getIteratorClass(),
$prefix.'storage' => $c->getArrayCopy(),
);
if ('ArrayObject' === $class) {
$a = $b;
} else {
if (!($flags & \ArrayObject::STD_PROP_LIST)) {
$c->setFlags(\ArrayObject::STD_PROP_LIST);
$a = Caster::castObject($c, new \ReflectionClass($class));
$c->setFlags($flags);
}
$a += $b;
}
return $a;
} }
public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested) public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
@ -182,7 +164,7 @@ class SplCaster
$clone = clone $c; $clone = clone $c;
foreach ($clone as $obj) { foreach ($clone as $obj) {
$storage[spl_object_hash($obj)] = array( $storage[] = array(
'object' => $obj, 'object' => $obj,
'info' => $clone->getInfo(), 'info' => $clone->getInfo(),
); );
@ -201,4 +183,27 @@ class SplCaster
return $a; return $a;
} }
private static function castSplArray($c, array $a, Stub $stub, $isNested)
{
$prefix = Caster::PREFIX_VIRTUAL;
$class = $stub->class;
$flags = $c->getFlags();
if (!($flags & \ArrayObject::STD_PROP_LIST)) {
$c->setFlags(\ArrayObject::STD_PROP_LIST);
$a = Caster::castObject($c, new \ReflectionClass($class));
$c->setFlags($flags);
}
$a += array(
$prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
$prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
);
if ($c instanceof \ArrayObject) {
$a[$prefix.'iteratorClass'] = $c->getIteratorClass();
}
$a[$prefix.'storage'] = $c->getArrayCopy();
return $a;
}
} }

1
src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
View File

@ -89,6 +89,7 @@ abstract class AbstractCloner implements ClonerInterface
'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope', 'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope',
'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject', 'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
'ArrayIterator' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayIterator',
'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList', 'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo', 'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject', 'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',

47
src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
View File

@ -160,4 +160,51 @@ EOTXT;
$this->assertDumpMatchesFormat('%ADateTime%A', $var); $this->assertDumpMatchesFormat('%ADateTime%A', $var);
} }
public function testCastArrayObject()
{
if (\defined('HHVM_VERSION')) {
$this->markTestSkipped('HHVM as different internal details.');
}
$var = new \ArrayObject(array(123));
$var->foo = 234;
$expected = <<<EOTXT
ArrayObject {
+"foo": 234
flag::STD_PROP_LIST: false
flag::ARRAY_AS_PROPS: false
iteratorClass: "ArrayIterator"
storage: array:1 [
0 => 123
]
}
EOTXT;
$this->assertDumpEquals($expected, $var);
}
public function testArrayIterator()
{
if (\defined('HHVM_VERSION')) {
$this->markTestSkipped('HHVM as different internal details.');
}
$var = new MyArrayIterator(array(234));
$expected = <<<EOTXT
Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
-foo: 123
flag::STD_PROP_LIST: false
flag::ARRAY_AS_PROPS: false
storage: array:1 [
0 => 234
]
}
EOTXT;
$this->assertDumpEquals($expected, $var);
}
}
class MyArrayIterator extends \ArrayIterator
{
private $foo = 123;
} }