Merge branch '4.4' into 5.0

chalasr · chalasr · commit 923591cfb78a · 2020-01-25T16:56:29.000+01:00
* 4.4:
  Fix displaying anonymous classes on PHP &gt;= 7.4.2
diff --git a/Caster/ClassStub.php b/Caster/ClassStub.php
@@ -56,7 +56,7 @@ public function __construct(string $identifier, $callable = null)
             }
 
             if (false !== strpos($identifier, "class@anonymous\0")) {
-                $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) {
+                $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
                     return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
                 }, $identifier);
             }
diff --git a/Caster/ExceptionCaster.php b/Caster/ExceptionCaster.php
@@ -283,7 +283,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x
         unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
 
         if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "class@anonymous\0")) {
-            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) {
+            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
                 return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
             }, $a[Caster::PREFIX_PROTECTED.'message']);
         }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(string $identifier, $callable = null)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (false !== strpos($identifier, "class@anonymous\0")) {`
`59`		`- $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`59`	`+ $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`60`	`60`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`61`	`61`	`}, $identifier);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x`
`283`	`283`	`unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);`
`284`	`284`
`285`	`285`	`if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "class@anonymous\0")) {`
`286`		`- $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`286`	`+ $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`287`	`287`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`288`	`288`	`}, $a[Caster::PREFIX_PROTECTED.'message']);`
`289`	`289`	`}`