Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit ef8b34c75fb1 · 2020-01-25T13:44:29.000+01:00
* 4.3:
  Fix displaying anonymous classes on PHP &gt;= 7.4.2
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -873,7 +873,7 @@ private function doActuallyRenderThrowable(\Throwable $e, OutputInterface $outpu
             }
 
             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
@@ -180,7 +180,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/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -761,7 +761,7 @@ private function cleanTrace(array $backtrace, int $type, string $file, int $line
      */
     private function parseAnonymousClass(string $message): string
     {
-        return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', static function ($m) {
+        return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static function ($m) {
             return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
         }, $message);
     }
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -196,7 +196,7 @@ public function getMessage(): string
     public function setMessage($message): self
     {
         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
@@ -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
`@@ -873,7 +873,7 @@ private function doActuallyRenderThrowable(\Throwable $e, OutputInterface $outpu`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`if (false !== strpos($message, "class@anonymous\0")) {`
`876`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`876`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`877`	`877`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`878`	`878`	`}, $message);`
`879`	`879`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function getMessage()`
`180`	`180`	`public function setMessage($message)`
`181`	`181`	`{`
`182`	`182`	`if (false !== strpos($message, "class@anonymous\0")) {`
`183`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`183`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`184`	`184`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`185`	`185`	`}, $message);`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ private function cleanTrace(array $backtrace, int $type, string $file, int $line`
`761`	`761`	`*/`
`762`	`762`	`private function parseAnonymousClass(string $message): string`
`763`	`763`	`{`
`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) {`
`765`	`765`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`766`	`766`	`}, $message);`
`767`	`767`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function getMessage(): string`
`196`	`196`	`public function setMessage($message): self`
`197`	`197`	`{`
`198`	`198`	`if (false !== strpos($message, "class@anonymous\0")) {`
`199`		`- $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:)[0-9a-fA-F]++/', function ($m) {`
	`199`	`+ $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`200`	`200`	`return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];`
`201`	`201`	`}, $message);`
`202`	`202`	`}`
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`	`}`