Skip to content

Commit 2dc4f9d

Browse files
Merge branch '6.2' into 6.3
* 6.2: [PropertyAccess] Fix access to undefined "file" key when checking stack frames
2 parents db93585 + 9b11824 commit 2dc4f9d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

PropertyAccessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid
413413
[$trace] = $e->getTrace();
414414

415415
// handle uninitialized properties in PHP >= 7
416-
if (__FILE__ === $trace['file']
416+
if (__FILE__ === ($trace['file'] ?? null)
417417
&& $name === $trace['function']
418418
&& $object instanceof $trace['class']
419419
&& preg_match('/Return value (?:of .*::\w+\(\) )?must be of (?:the )?type (\w+), null returned$/', $e->getMessage(), $matches)

0 commit comments

Comments
 (0)