bug #48615 Fix getting the name of closures on PHP 8.1.11+ (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 64d145c8353b · 2022-12-13T10:43:00.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- Fix getting the name of closures on PHP 8.1.11+ | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Leverages php/php-src#9299 Commits ------- bccd23d Fix getting the name of closures on PHP 8.1.11+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -361,7 +361,7 @@ private function getCallableData($callable): array
             }
             $data['name'] = $r->name;
 
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $data['class'] = $class->name;
                 if (!$r->getClosureThis()) {
                     $data['static'] = true;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -377,7 +377,7 @@ protected function describeCallable($callable, array $options = [])
             }
             $string .= "\n".sprintf('- Name: `%s`', $r->name);
 
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $string .= "\n".sprintf('- Class: `%s`', $class->name);
                 if (!$r->getClosureThis()) {
                     $string .= "\n- Static: yes";
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -614,7 +614,7 @@ private function formatCallable($callable): string
             if (str_contains($r->name, '{closure}')) {
                 return 'Closure()';
             }
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 return sprintf('%s::%s()', $class->name, $r->name);
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -548,7 +548,7 @@ private function getCallableDocument($callable): \DOMDocument
             }
             $callableXML->setAttribute('name', $r->name);
 
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $callableXML->setAttribute('class', $class->name);
                 if (!$r->getClosureThis()) {
                     $callableXML->setAttribute('static', 'true');
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
@@ -255,7 +255,7 @@ private function formatCallable($callable): string
             if (false !== strpos($r->name, '{closure}')) {
                 return 'Closure()';
             }
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 return sprintf('%s::%s()', $class->name, $r->name);
             }
 
diff --git a/src/Symfony/Component/ErrorHandler/Internal/TentativeTypes.php b/src/Symfony/Component/ErrorHandler/Internal/TentativeTypes.php
@@ -753,6 +753,7 @@ class TentativeTypes
             'isVariadic' => 'bool',
             'isStatic' => 'bool',
             'getClosureThis' => '?object',
+            'getClosureCalledClass' => '?ReflectionClass',
             'getClosureScopeClass' => '?ReflectionClass',
             'getDocComment' => 'string|false',
             'getEndLine' => 'int|false',
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -49,7 +49,7 @@ public function __construct($listener, ?string $name, Stopwatch $stopwatch, Even
             $r = new \ReflectionFunction($listener);
             if (str_contains($r->name, '{closure}')) {
                 $this->pretty = $this->name = 'closure';
-            } elseif ($class = $r->getClosureScopeClass()) {
+            } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $this->name = $class->name;
                 $this->pretty = $this->name.'::'.$r->name;
             } else {
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -33,7 +33,7 @@ public function createArgumentMetadata($controller): array
             $class = $reflection->class;
         } else {
             $reflection = new \ReflectionFunction($controller);
-            if ($class = str_contains($reflection->name, '{closure}') ? null : $reflection->getClosureScopeClass()) {
+            if ($class = str_contains($reflection->name, '{closure}') ? null : (\PHP_VERSION_ID >= 80111 ? $reflection->getClosureCalledClass() : $reflection->getClosureScopeClass())) {
                 $class = $class->name;
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -479,7 +479,7 @@ private function parseController($controller)
             }
             $controller['method'] = $r->name;
 
-            if ($class = $r->getClosureScopeClass()) {
+            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $controller['class'] = $class->name;
             } else {
                 return $r->name;
diff --git a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php
@@ -37,7 +37,7 @@ public function __construct(callable $handler, array $options = [])
         if (str_contains($r->name, '{closure}')) {
             $this->name = 'Closure';
         } elseif (!$handler = $r->getClosureThis()) {
-            $class = $r->getClosureScopeClass();
+            $class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass();
 
             $this->name = ($class ? $class->name.'::' : '').$r->name;
         } else {
diff --git a/src/Symfony/Component/String/LazyString.php b/src/Symfony/Component/String/LazyString.php
@@ -148,7 +148,7 @@ private static function getPrettyName(callable $callback): string
         } elseif ($callback instanceof \Closure) {
             $r = new \ReflectionFunction($callback);
 
-            if (false !== strpos($r->name, '{closure}') || !$class = $r->getClosureScopeClass()) {
+            if (false !== strpos($r->name, '{closure}') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 return $r->name;
             }
 
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -197,7 +197,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
         self::addMap($a, $c, [
             'returnsReference' => 'returnsReference',
             'returnType' => 'getReturnType',
-            'class' => 'getClosureScopeClass',
+            'class' => \PHP_VERSION_ID >= 80111 ? 'getClosureCalledClass' : 'getClosureScopeClass',
             'this' => 'getClosureThis',
         ]);
 

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ private function getCallableData($callable): array`
`361`	`361`	`}`
`362`	`362`	`$data['name'] = $r->name;`
`363`	`363`
`364`		`- if ($class = $r->getClosureScopeClass()) {`
	`364`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`365`	`365`	`$data['class'] = $class->name;`
`366`	`366`	`if (!$r->getClosureThis()) {`
`367`	`367`	`$data['static'] = true;`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ protected function describeCallable($callable, array $options = [])`
`377`	`377`	`}`
`378`	`378`	$string .= "\n".sprintf('- Name: `%s`', $r->name);
`379`	`379`
`380`		`- if ($class = $r->getClosureScopeClass()) {`
	`380`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`381`	`381`	$string .= "\n".sprintf('- Class: `%s`', $class->name);
`382`	`382`	`if (!$r->getClosureThis()) {`
`383`	`383`	`$string .= "\n- Static: yes";`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ private function formatCallable($callable): string`
`614`	`614`	`if (str_contains($r->name, '{closure}')) {`
`615`	`615`	`return 'Closure()';`
`616`	`616`	`}`
`617`		`- if ($class = $r->getClosureScopeClass()) {`
	`617`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`618`	`618`	`return sprintf('%s::%s()', $class->name, $r->name);`
`619`	`619`	`}`
`620`	`620`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ private function getCallableDocument($callable): \DOMDocument`
`548`	`548`	`}`
`549`	`549`	`$callableXML->setAttribute('name', $r->name);`
`550`	`550`
`551`		`- if ($class = $r->getClosureScopeClass()) {`
	`551`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`552`	`552`	`$callableXML->setAttribute('class', $class->name);`
`553`	`553`	`if (!$r->getClosureThis()) {`
`554`	`554`	`$callableXML->setAttribute('static', 'true');`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private function formatCallable($callable): string`
`255`	`255`	`if (false !== strpos($r->name, '{closure}')) {`
`256`	`256`	`return 'Closure()';`
`257`	`257`	`}`
`258`		`- if ($class = $r->getClosureScopeClass()) {`
	`258`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`259`	`259`	`return sprintf('%s::%s()', $class->name, $r->name);`
`260`	`260`	`}`
`261`	`261`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function createArgumentMetadata($controller): array`
`33`	`33`	`$class = $reflection->class;`
`34`	`34`	`} else {`
`35`	`35`	`$reflection = new \ReflectionFunction($controller);`
`36`		`- if ($class = str_contains($reflection->name, '{closure}') ? null : $reflection->getClosureScopeClass()) {`
	`36`	`+ if ($class = str_contains($reflection->name, '{closure}') ? null : (\PHP_VERSION_ID >= 80111 ? $reflection->getClosureCalledClass() : $reflection->getClosureScopeClass())) {`
`37`	`37`	`$class = $class->name;`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ private function parseController($controller)`
`479`	`479`	`}`
`480`	`480`	`$controller['method'] = $r->name;`
`481`	`481`
`482`		`- if ($class = $r->getClosureScopeClass()) {`
	`482`	`+ if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`483`	`483`	`$controller['class'] = $class->name;`
`484`	`484`	`} else {`
`485`	`485`	`return $r->name;`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private static function getPrettyName(callable $callback): string`
`148`	`148`	`} elseif ($callback instanceof \Closure) {`
`149`	`149`	`$r = new \ReflectionFunction($callback);`
`150`	`150`
`151`		`- if (false !== strpos($r->name, '{closure}') \|\| !$class = $r->getClosureScopeClass()) {`
	`151`	`+ if (false !== strpos($r->name, '{closure}') \|\| !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
`152`	`152`	`return $r->name;`
`153`	`153`	`}`
`154`	`154`