Merge branch '3.4' into 4.4

xabbuh · xabbuh · commit 948e107a1ba5 · 2020-09-18T10:35:10.000+02:00
* 3.4:
  deal with errors being thrown on PHP 8
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -110,6 +110,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe
 
                 $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
 
+                return $a;
+            } catch (\Error $e) {
+                if ('Object not initialized' !== $e->getMessage()) {
+                    throw $e;
+                }
+
+                $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
+
                 return $a;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe`
`110`	`110`
`111`	`111`	`$a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';`
`112`	`112`
	`113`	`+ return $a;`
	`114`	`+ } catch (\Error $e) {`
	`115`	`+ if ('Object not initialized' !== $e->getMessage()) {`
	`116`	`+ throw $e;`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';`
	`120`	`+`
`113`	`121`	`return $a;`
`114`	`122`	`}`
`115`	`123`	`}`