Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 70dc6e4

Browse filesBrowse files
[VarDumper] Fix dumping ArrayObject and ArrayIterator instances
1 parent 5c2b2bb commit 70dc6e4
Copy full SHA for 70dc6e4

File tree

2 files changed

+11
-15
lines changed
Filter options

2 files changed

+11
-15
lines changed

‎src/Symfony/Component/VarDumper/Caster/SplCaster.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/SplCaster.php
+10-15Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,25 @@ class SplCaster
2727
\SplFileObject::READ_CSV => 'READ_CSV',
2828
);
2929

30-
public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
30+
public static function castArrayObject($c, array $a, Stub $stub, $isNested)
3131
{
3232
$prefix = Caster::PREFIX_VIRTUAL;
3333
$class = $stub->class;
3434
$flags = $c->getFlags();
3535

36-
$b = array(
36+
if (!($flags & \ArrayObject::STD_PROP_LIST)) {
37+
$c->setFlags(\ArrayObject::STD_PROP_LIST);
38+
$a = Caster::castObject($c, new \ReflectionClass($class));
39+
$c->setFlags($flags);
40+
}
41+
$a += array(
3742
$prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
3843
$prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
39-
$prefix.'iteratorClass' => $c->getIteratorClass(),
40-
$prefix.'storage' => $c->getArrayCopy(),
4144
);
42-
43-
if ('ArrayObject' === $class) {
44-
$a = $b;
45-
} else {
46-
if (!($flags & \ArrayObject::STD_PROP_LIST)) {
47-
$c->setFlags(\ArrayObject::STD_PROP_LIST);
48-
$a = Caster::castObject($c, new \ReflectionClass($class));
49-
$c->setFlags($flags);
50-
}
51-
52-
$a += $b;
45+
if ($c instanceof \ArrayObject) {
46+
$a[$prefix.'iteratorClass'] = $c->getIteratorClass();
5347
}
48+
$a[$prefix.'storage'] = $c->getArrayCopy();
5449

5550
return $a;
5651
}

‎src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ abstract class AbstractCloner implements ClonerInterface
8989
'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope',
9090

9191
'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
92+
'ArrayIterator' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
9293
'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
9394
'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
9495
'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.