bug #33919 [VarDumper] fix array key error for class SymfonyCaster (zcodes)

nicolas-grekas · nicolas-grekas · commit 332d9e9067a4 · 2019-10-09T08:54:10.000+02:00
This PR was squashed before being merged into the 4.3 branch (closes #33919). Discussion ---------- [VarDumper] fix array key error for class SymfonyCaster | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #33751 | License | MIT | Doc PR | - Commits ------- 1f20f35 [VarDumper] fix array key error for class SymfonyCaster
diff --git a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
@@ -30,7 +30,8 @@ public static function castRequest(Request $request, array $a, Stub $stub, $isNe
         $clone = null;
 
         foreach (self::$requestGetters as $prop => $getter) {
-            if (null === $a[Caster::PREFIX_PROTECTED.$prop]) {
+            $key = Caster::PREFIX_PROTECTED.$prop;
+            if (\array_key_exists($key, $a) && null === $a[$key]) {
                 if (null === $clone) {
                     $clone = clone $request;
                 }
@@ -44,7 +45,9 @@ public static function castRequest(Request $request, array $a, Stub $stub, $isNe
     public static function castHttpClient($client, array $a, Stub $stub, $isNested)
     {
         $multiKey = sprintf("\0%s\0multi", \get_class($client));
-        $a[$multiKey] = new CutStub($a[$multiKey]);
+        if (isset($a[$multiKey])) {
+            $a[$multiKey] = new CutStub($a[$multiKey]);
+        }
 
         return $a;
     }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public static function castRequest(Request $request, array $a, Stub $stub, $isNe`
`30`	`30`	`$clone = null;`
`31`	`31`
`32`	`32`	`foreach (self::$requestGetters as $prop => $getter) {`
`33`		`- if (null === $a[Caster::PREFIX_PROTECTED.$prop]) {`
	`33`	`+ $key = Caster::PREFIX_PROTECTED.$prop;`
	`34`	`+ if (\array_key_exists($key, $a) && null === $a[$key]) {`
`34`	`35`	`if (null === $clone) {`
`35`	`36`	`$clone = clone $request;`
`36`	`37`	`}`
`@@ -44,7 +45,9 @@ public static function castRequest(Request $request, array $a, Stub $stub, $isNe`
`44`	`45`	`public static function castHttpClient($client, array $a, Stub $stub, $isNested)`
`45`	`46`	`{`
`46`	`47`	`$multiKey = sprintf("\0%s\0multi", \get_class($client));`
`47`		`- $a[$multiKey] = new CutStub($a[$multiKey]);`
	`48`	`+ if (isset($a[$multiKey])) {`
	`49`	`+ $a[$multiKey] = new CutStub($a[$multiKey]);`
	`50`	`+ }`
`48`	`51`
`49`	`52`	`return $a;`
`50`	`53`	`}`