bug #34996 Fix displaying anonymous classes on PHP 7.4 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 624f2e345bfb · 2019-12-16T15:24:15.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- Fix displaying anonymous classes on PHP 7.4 | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Follows php/php-src@0f2cdbf#diff-3a8139128d4026ce0cb0c86beba4e6b9R6351 Commits ------- c36568a Fix displaying anonymous classes on PHP 7.4
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -795,7 +795,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
             }
 
             if (false !== strpos($message, "class@anonymous\0")) {
-                $message = preg_replace_callback('/class@anonymous\x00.*?\.php0x?[0-9a-fA-F]++/', function ($m) {
+                $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {
+            $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[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/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -252,7 +252,11 @@ public function getContent(FlattenException $exception)
                 foreach ($e['trace'] as $trace) {
                     $content .= '<tr><td>';
                     if ($trace['function']) {
-                        $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>(<span class="trace-arguments">%s</span>)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
+                        $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>', $this->formatClass($trace['class']), $trace['type'], $trace['function']);
+
+                        if (isset($trace['args'])) {
+                            $content .= sprintf('(<span class="trace-arguments">%s</span>)', $this->formatArgs($trace['args']));
+                        }
                     }
                     if (isset($trace['file']) && isset($trace['line'])) {
                         $content .= $this->formatPath($trace['file'], $trace['line']);
diff --git a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -237,6 +237,10 @@ public function flattenDataProvider()
 
     public function testArguments()
     {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+        }
+
         $dh = opendir(__DIR__);
         $fh = tmpfile();
 
@@ -299,6 +303,10 @@ function () {},
 
     public function testRecursionInArguments()
     {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+        }
+
         $a = null;
         $a = ['foo', [2, &$a]];
         $exception = $this->createException($a);
@@ -310,6 +318,10 @@ public function testRecursionInArguments()
 
     public function testTooBigArray()
     {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+        }
+
         $a = [];
         for ($i = 0; $i < 20; ++$i) {
             for ($j = 0; $j < 50; ++$j) {
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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {
+                $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {
+            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[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
`@@ -795,7 +795,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`if (false !== strpos($message, "class@anonymous\0")) {`
`798`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php0x?[0-9a-fA-F]++/', function ($m) {`
	`798`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
`799`	`799`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`800`	`800`	`}, $message);`
`801`	`801`	`}`
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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {`
	`175`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {`
	`59`	`+ $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[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.*?\.php0x?[0-9a-fA-F]++/', function ($m) {`
	`285`	`+ $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[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`	`}`