Merge branch '4.4' into 5.0

* 4.4: [Security/Http] fix merge [ErrorHandler] fix setting $trace to null in FatalError
symfony · May 28, 2020 · d98fc46 · d98fc46
2 parents baf1f94 + 0df9a23
commit d98fc46
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Error/FatalError.php b/Error/FatalError.php
@@ -72,9 +72,11 @@ public function __construct(string $message, int $code, array $error, int $trace
             'line' => $error['line'],
             'trace' => $trace,
         ] as $property => $value) {
-            $refl = new \ReflectionProperty(\Error::class, $property);
-            $refl->setAccessible(true);
-            $refl->setValue($this, $value);
+            if (null !== $value) {
+                $refl = new \ReflectionProperty(\Error::class, $property);
+                $refl->setAccessible(true);
+                $refl->setValue($this, $value);
+            }
         }
     }