Skip to content

Commit 0dc22bd

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: deal with errors being thrown on PHP 8
2 parents 9ab6195 + df8fe9c commit 0dc22bd

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Caster/SplCaster.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe
110110

111111
$a[$prefix.''] = 'The parent constructor was not called: the object is in an invalid state';
112112

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+
113121
return $a;
114122
}
115123
}

0 commit comments

Comments
 (0)