minor symfony#35471 Fix displaying anonymous classes on PHP >= 7.4.2 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d695b43b9812 · 2020-01-25T13:38:50.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- Fix displaying anonymous classes on PHP >= 7.4.2 | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- dd94b38 Fix displaying anonymous classes on PHP >= 7.4.2
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -796,7 +796,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
             }
 
             if (false !== strpos($message, "class@anonymous\0")) {
-                $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) {
+                $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];
                 }, $message);
             }
diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php
@@ -172,7 +172,7 @@ public function getMessage()
     public function setMessage($message)
     {
         if (false !== strpos($message, "class@anonymous\0")) {
-            $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) {
+            $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];
             }, $message);
         }
diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/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/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -282,7 +282,7 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte
         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
`@@ -796,7 +796,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`if (false !== strpos($message, "class@anonymous\0")) {`
`799`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`799`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`800`	`800`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`801`	`801`	`}, $message);`
`802`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public function getMessage()`
`172`	`172`	`public function setMessage($message)`
`173`	`173`	`{`
`174`	`174`	`if (false !== strpos($message, "class@anonymous\0")) {`
`175`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`175`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`176`	`176`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`177`	`177`	`}, $message);`
`178`	`178`	`}`
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
`@@ -282,7 +282,7 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte`
`282`	`282`	`unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);`
`283`	`283`
`284`	`284`	`if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "class@anonymous\0")) {`
`285`		`- $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`285`	`+ $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`286`	`286`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`287`	`287`	`}, $a[Caster::PREFIX_PROTECTED.'message']);`
`288`	`288`	`}`