bug #23176 [VarDumper] fixes (nicolas-grekas)

fabpot · fabpot · commit d1104da96611 · 2017-06-14T12:17:45.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [VarDumper] fixes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23115 and #23151 (hopefully) | License | MIT | Doc PR | - it looks like stream_context_get_params can return false (looking at php-src and #23151) and doing a foreach on SplObjectStorage changes its internal iterator state. Commits ------- d7238c9 [VarDumper] fixes
diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
@@ -45,7 +45,7 @@ public static function castStream($stream, array $a, Stub $stub, $isNested)
 
     public static function castStreamContext($stream, array $a, Stub $stub, $isNested)
     {
-        return stream_context_get_params($stream);
+        return @stream_context_get_params($stream) ?: $a;
     }
 
     public static function castGd($gd, array $a, Stub $stub, $isNested)
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -86,7 +86,7 @@ public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $s
         $storage = array();
         unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
 
-        foreach ($c as $obj) {
+        foreach (clone $c as $obj) {
             $storage[spl_object_hash($obj)] = array(
                 'object' => $obj,
                 'info' => $c->getInfo(),

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static function castStream($stream, array $a, Stub $stub, $isNested)`
`45`	`45`
`46`	`46`	`public static function castStreamContext($stream, array $a, Stub $stub, $isNested)`
`47`	`47`	`{`
`48`		`- return stream_context_get_params($stream);`
	`48`	`+ return @stream_context_get_params($stream) ?: $a;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public static function castGd($gd, array $a, Stub $stub, $isNested)`