Skip to content

Commit dd55651

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix displaying anonymous classes on PHP >= 7.4.2
2 parents 95f64c1 + ce4d1e4 commit dd55651

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ private function cleanTrace(array $backtrace, int $type, string $file, int $line
761761
*/
762762
private function parseAnonymousClass(string $message): string
763763
{
764-
return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', static function ($m) {
764+
return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static function ($m) {
765765
return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
766766
}, $message);
767767
}

Exception/FlattenException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function getMessage(): string
200200
public function setMessage($message): self
201201
{
202202
if (false !== strpos($message, "class@anonymous\0")) {
203-
$message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) {
203+
$message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
204204
return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
205205
}, $message);
206206
}

0 commit comments

Comments
 (0)