Skip to content

Commit d98fc46

Browse files
Merge branch '4.4' into 5.0
* 4.4: [Security/Http] fix merge [ErrorHandler] fix setting $trace to null in FatalError
2 parents baf1f94 + 0df9a23 commit d98fc46

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Error/FatalError.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ public function __construct(string $message, int $code, array $error, int $trace
7272
'line' => $error['line'],
7373
'trace' => $trace,
7474
] as $property => $value) {
75-
$refl = new \ReflectionProperty(\Error::class, $property);
76-
$refl->setAccessible(true);
77-
$refl->setValue($this, $value);
75+
if (null !== $value) {
76+
$refl = new \ReflectionProperty(\Error::class, $property);
77+
$refl->setAccessible(true);
78+
$refl->setValue($this, $value);
79+
}
7880
}
7981
}
8082

0 commit comments

Comments
 (0)