[VarDumper] Add missing isset() checks in some casters

nicolas-grekas · nicolas-grekas · commit 8f0edfb10fde · 2017-03-10T23:26:11.000+01:00
diff --git a/src/Symfony/Component/VarDumper/Caster/Caster.php b/src/Symfony/Component/VarDumper/Caster/Caster.php
@@ -132,8 +132,10 @@ public static function filter(array $a, $filter, array $listedProperties = array
 
     public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, $isNested)
     {
-        $stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';
-        unset($a['__PHP_Incomplete_Class_Name']);
+        if (isset($a['__PHP_Incomplete_Class_Name'])) {
+            $stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';
+            unset($a['__PHP_Incomplete_Class_Name']);
+        }
 
         return $a;
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -218,15 +218,19 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte
         }
 
         if (!($filter & Caster::EXCLUDE_VERBOSE)) {
-            self::traceUnshift($trace, $xClass, $a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+            if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
+                self::traceUnshift($trace, $xClass, $a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+            }
             $a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs);
         }
         if (empty($a[$xPrefix.'previous'])) {
             unset($a[$xPrefix.'previous']);
         }
         unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
 
-        $a[Caster::PREFIX_PROTECTED.'file'] = new LinkStub($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+        if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
+            $a[Caster::PREFIX_PROTECTED.'file'] = new LinkStub($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+        }
 
         return $a;
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
@@ -31,8 +31,10 @@ public static function castRedis(\Redis $c, array $a, Stub $stub, $isNested)
         $prefix = Caster::PREFIX_VIRTUAL;
 
         if (defined('HHVM_VERSION_ID')) {
-            $ser = $a[Caster::PREFIX_PROTECTED.'serializer'];
-            $a[Caster::PREFIX_PROTECTED.'serializer'] = isset(self::$serializer[$ser]) ? new ConstStub(self::$serializer[$ser], $ser) : $ser;
+            if (isset($a[Caster::PREFIX_PROTECTED.'serializer'])) {
+                $ser = $a[Caster::PREFIX_PROTECTED.'serializer'];
+                $a[Caster::PREFIX_PROTECTED.'serializer'] = isset(self::$serializer[$ser]) ? new ConstStub(self::$serializer[$ser], $ser) : $ser;
+            }
 
             return $a;
         }

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,10 @@ public static function filter(array $a, $filter, array $listedProperties = array`
`132`	`132`
`133`	`133`	`public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, $isNested)`
`134`	`134`	`{`
`135`		`- $stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';`
`136`		`- unset($a['__PHP_Incomplete_Class_Name']);`
	`135`	`+ if (isset($a['__PHP_Incomplete_Class_Name'])) {`
	`136`	`+ $stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';`
	`137`	`+ unset($a['__PHP_Incomplete_Class_Name']);`
	`138`	`+ }`
`137`	`139`
`138`	`140`	`return $a;`
`139`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,15 +218,19 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`if (!($filter & Caster::EXCLUDE_VERBOSE)) {`
`221`		`- self::traceUnshift($trace, $xClass, $a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);`
	`221`	`+ if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {`
	`222`	`+ self::traceUnshift($trace, $xClass, $a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);`
	`223`	`+ }`
`222`	`224`	`$a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs);`
`223`	`225`	`}`
`224`	`226`	`if (empty($a[$xPrefix.'previous'])) {`
`225`	`227`	`unset($a[$xPrefix.'previous']);`
`226`	`228`	`}`
`227`	`229`	`unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);`
`228`	`230`
`229`		`- $a[Caster::PREFIX_PROTECTED.'file'] = new LinkStub($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);`
	`231`	`+ if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {`
	`232`	`+ $a[Caster::PREFIX_PROTECTED.'file'] = new LinkStub($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);`
	`233`	`+ }`
`230`	`234`
`231`	`235`	`return $a;`
`232`	`236`	`}`