minor #62798 Don't use ->getDeclaringClass() when ->class is enough (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit ebb9ef0c517e · 2025-12-19T08:48:18.000+01:00
This PR was merged into the 8.1 branch. Discussion ---------- Don't use `->getDeclaringClass()` when `->class` is enough | Q | A | ------------- | --- | Branch? | 8.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Commits ------- 93fd60b Dont use ->getDeclaringClass() when ->class is enough
diff --git a/src/Symfony/Component/Console/Attribute/Interact.php b/src/Symfony/Component/Console/Attribute/Interact.php
@@ -29,11 +29,11 @@ public static function tryFrom(\ReflectionMethod $method): ?self
         }
 
         if (!$method->isPublic() || $method->isStatic()) {
-            throw new LogicException(\sprintf('The interactive method "%s::%s()" must be public and non-static.', $method->getDeclaringClass()->getName(), $method->getName()));
+            throw new LogicException(\sprintf('The interactive method "%s::%s()" must be public and non-static.', $method->class, $method->getName()));
         }
 
         if ('__invoke' === $method->getName()) {
-            throw new LogicException(\sprintf('The "%s::__invoke()" method cannot be used as an interactive method.', $method->getDeclaringClass()->getName()));
+            throw new LogicException(\sprintf('The "%s::__invoke()" method cannot be used as an interactive method.', $method->class));
         }
 
         $self->method = $method;
diff --git a/src/Symfony/Component/Console/Attribute/Reflection/ReflectionMember.php b/src/Symfony/Component/Console/Attribute/Reflection/ReflectionMember.php
@@ -36,7 +36,7 @@ public function getAttribute(string $class): ?object
     public function getSourceName(): string
     {
         if ($this->member instanceof \ReflectionProperty) {
-            return $this->member->getDeclaringClass()->name;
+            return $this->member->class;
         }
 
         $function = $this->member->getDeclaringFunction();
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -109,7 +109,7 @@ public function __construct(?string $name = null, ?callable $code = null)
             $this->addUsage($usage);
         }
 
-        if (!$code && \is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->getDeclaringClass()->name) {
+        if (!$code && \is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->class) {
             $this->code = new InvokableCommand($this, $this(...));
         }
 
diff --git a/src/Symfony/Component/Console/Command/TraceableCommand.php b/src/Symfony/Component/Console/Command/TraceableCommand.php
@@ -322,7 +322,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 
     protected function interact(InputInterface $input, OutputInterface $output): void
     {
-        if (!$this->isInteractive = Command::class !== (new \ReflectionMethod($this->command, 'interact'))->getDeclaringClass()->getName()) {
+        if (!$this->isInteractive = Command::class !== (new \ReflectionMethod($this->command, 'interact'))->class) {
             return;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -203,7 +203,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect
         }
 
         if ('self' === $type) {
-            $type = $parameter->getDeclaringClass()->getName();
+            $type = $parameter->getDeclaringClass()->name;
         }
 
         if ('static' === $type) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1285,7 +1285,7 @@ public function __construct()
             if (null !== $r
                 && (null !== $constructor = $r->getConstructor())
                 && 0 === $constructor->getNumberOfRequiredParameters()
-                && Container::class !== $constructor->getDeclaringClass()->name
+                && Container::class !== $constructor->class
             ) {
                 $code .= "        parent::__construct();\n";
                 $code .= "        \$this->parameterBag = null;\n\n";
diff --git a/src/Symfony/Component/DependencyInjection/Exception/InvalidParameterTypeException.php b/src/Symfony/Component/DependencyInjection/Exception/InvalidParameterTypeException.php
@@ -27,7 +27,7 @@ public function __construct(string $serviceId, string $type, \ReflectionParamete
 
         $function = $parameter->getDeclaringFunction();
         $functionName = $function instanceof \ReflectionMethod
-            ? \sprintf('%s::%s', $function->getDeclaringClass()->getName(), $function->getName())
+            ? \sprintf('%s::%s', $function->class, $function->getName())
             : $function->getName();
 
         parent::__construct(\sprintf('Invalid definition for service "%s": argument %d of "%s()" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $functionName, $acceptedType, $type));
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -187,7 +187,7 @@ public function getRunner(?object $application): RunnerInterface
             if (!$application->getName() || !$console->has($application->getName())) {
                 $application->setName($_SERVER['argv'][0]);
 
-                if (!method_exists($console, 'addCommand') || method_exists($console, 'add') && (new \ReflectionMethod($console, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($console, 'addCommand'))->getDeclaringClass()->getName()) {
+                if (!method_exists($console, 'addCommand') || method_exists($console, 'add') && (new \ReflectionMethod($console, 'add'))->class !== (new \ReflectionMethod($console, 'addCommand'))->class) {
                     $console->add($application);
                 } else {
                     $console->addCommand($application);
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php
@@ -100,7 +100,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet
             }
 
             $attributeMetadata = $attributesMetadata[$property->name];
-            if ($property->getDeclaringClass()->name === $className) {
+            if ($property->class === $className) {
                 if ($classContextAttribute) {
                     $this->setAttributeContextsForGroups($classContextAttribute, $attributeMetadata);
                 }
@@ -133,7 +133,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet
         }
 
         foreach ($reflectionClass->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name !== $className) {
+            if ($method->class !== $className) {
                 continue;
             }
 
@@ -211,8 +211,8 @@ private function loadAttributes(\ReflectionMethod|\ReflectionClass|\ReflectionPr
                     }
                     $on = match (true) {
                         $reflector instanceof \ReflectionClass => ' on class '.$reflector->name,
-                        $reflector instanceof \ReflectionMethod => \sprintf(' on "%s::%s()"', $reflector->getDeclaringClass()->name, $reflector->name),
-                        $reflector instanceof \ReflectionProperty => \sprintf(' on "%s::$%s"', $reflector->getDeclaringClass()->name, $reflector->name),
+                        $reflector instanceof \ReflectionMethod => \sprintf(' on "%s::%s()"', $reflector->class, $reflector->name),
+                        $reflector instanceof \ReflectionProperty => \sprintf(' on "%s::$%s"', $reflector->class, $reflector->name),
                         default => '',
                     };
 
diff --git a/src/Symfony/Component/TypeInfo/TypeResolver/ReflectionPropertyTypeResolver.php b/src/Symfony/Component/TypeInfo/TypeResolver/ReflectionPropertyTypeResolver.php
@@ -41,7 +41,7 @@ public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
         try {
             return $this->reflectionTypeResolver->resolve($subject->getType(), $typeContext);
         } catch (UnsupportedException $e) {
-            $path = \sprintf('%s::$%s', $subject->getDeclaringClass()->getName(), $subject->getName());
+            $path = \sprintf('%s::$%s', $subject->class, $subject->getName());
 
             throw new UnsupportedException(\sprintf('Cannot resolve type for "%s".', $path), $subject, previous: $e);
         }
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AttributeLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AttributeLoader.php
@@ -78,7 +78,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflClass, ClassMetadata
         }
 
         foreach ($reflClass->getProperties() as $property) {
-            if ($property->getDeclaringClass()->name === $className) {
+            if ($property->class === $className) {
                 foreach ($this->getAttributes($property) as $constraint) {
                     if ($constraint instanceof Constraint) {
                         $metadata->addPropertyConstraint($property->name, $constraint);
@@ -90,7 +90,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflClass, ClassMetadata
         }
 
         foreach ($reflClass->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name === $className) {
+            if ($method->class === $className) {
                 foreach ($this->getAttributes($method) as $constraint) {
                     if ($constraint instanceof Callback) {
                         $constraint->callback = $method->getName();
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php
@@ -47,7 +47,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                 throw new MappingException(\sprintf('The method "%s::%s()" should be static.', $reflClass->name, $this->methodName));
             }
 
-            if ($reflMethod->getDeclaringClass()->name != $reflClass->name) {
+            if ($reflMethod->class != $reflClass->name) {
                 return false;
             }
 
diff --git a/src/Symfony/Contracts/Service/ServiceMethodsSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceMethodsSubscriberTrait.php
@@ -33,7 +33,7 @@ public static function getSubscribedServices(): array
         $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
 
         foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-            if (self::class !== $method->getDeclaringClass()->name) {
+            if (self::class !== $method->class) {
                 continue;
             }
 
diff --git a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
@@ -37,7 +37,7 @@ public static function getSubscribedServices(): array
         $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
 
         foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-            if (self::class !== $method->getDeclaringClass()->name) {
+            if (self::class !== $method->class) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public static function tryFrom(\ReflectionMethod $method): ?self`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if (!$method->isPublic() \|\| $method->isStatic()) {`
`32`		`- throw new LogicException(\sprintf('The interactive method "%s::%s()" must be public and non-static.', $method->getDeclaringClass()->getName(), $method->getName()));`
	`32`	`+ throw new LogicException(\sprintf('The interactive method "%s::%s()" must be public and non-static.', $method->class, $method->getName()));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if ('__invoke' === $method->getName()) {`
`36`		`- throw new LogicException(\sprintf('The "%s::__invoke()" method cannot be used as an interactive method.', $method->getDeclaringClass()->getName()));`
	`36`	`+ throw new LogicException(\sprintf('The "%s::__invoke()" method cannot be used as an interactive method.', $method->class));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`$self->method = $method;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getAttribute(string $class): ?object`
`36`	`36`	`public function getSourceName(): string`
`37`	`37`	`{`
`38`	`38`	`if ($this->member instanceof \ReflectionProperty) {`
`39`		`- return $this->member->getDeclaringClass()->name;`
	`39`	`+ return $this->member->class;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`$function = $this->member->getDeclaringFunction();`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function __construct(?string $name = null, ?callable $code = null)`
`109`	`109`	`$this->addUsage($usage);`
`110`	`110`	`}`
`111`	`111`
`112`		`- if (!$code && \is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->getDeclaringClass()->name) {`
	`112`	`+ if (!$code && \is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->class) {`
`113`	`113`	`$this->code = new InvokableCommand($this, $this(...));`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v`
`322`	`322`
`323`	`323`	`protected function interact(InputInterface $input, OutputInterface $output): void`
`324`	`324`	`{`
`325`		`- if (!$this->isInteractive = Command::class !== (new \ReflectionMethod($this->command, 'interact'))->getDeclaringClass()->getName()) {`
	`325`	`+ if (!$this->isInteractive = Command::class !== (new \ReflectionMethod($this->command, 'interact'))->class) {`
`326`	`326`	`return;`
`327`	`327`	`}`
`328`	`328`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`if ('self' === $type) {`
`206`		`- $type = $parameter->getDeclaringClass()->getName();`
	`206`	`+ $type = $parameter->getDeclaringClass()->name;`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`if ('static' === $type) {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`$attributeMetadata = $attributesMetadata[$property->name];`
`103`		`- if ($property->getDeclaringClass()->name === $className) {`
	`103`	`+ if ($property->class === $className) {`
`104`	`104`	`if ($classContextAttribute) {`
`105`	`105`	`$this->setAttributeContextsForGroups($classContextAttribute, $attributeMetadata);`
`106`	`106`	`}`
`@@ -133,7 +133,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`foreach ($reflectionClass->getMethods() as $method) {`
`136`		`- if ($method->getDeclaringClass()->name !== $className) {`
	`136`	`+ if ($method->class !== $className) {`
`137`	`137`	`continue;`
`138`	`138`	`}`
`139`	`139`
`@@ -211,8 +211,8 @@ private function loadAttributes(\ReflectionMethod\|\ReflectionClass\|\ReflectionPr`
`211`	`211`	`}`
`212`	`212`	`$on = match (true) {`
`213`	`213`	`$reflector instanceof \ReflectionClass => ' on class '.$reflector->name,`
`214`		`- $reflector instanceof \ReflectionMethod => \sprintf(' on "%s::%s()"', $reflector->getDeclaringClass()->name, $reflector->name),`
`215`		`- $reflector instanceof \ReflectionProperty => \sprintf(' on "%s::$%s"', $reflector->getDeclaringClass()->name, $reflector->name),`
	`214`	`+ $reflector instanceof \ReflectionMethod => \sprintf(' on "%s::%s()"', $reflector->class, $reflector->name),`
	`215`	`+ $reflector instanceof \ReflectionProperty => \sprintf(' on "%s::$%s"', $reflector->class, $reflector->name),`
`216`	`216`	`default => '',`
`217`	`217`	`};`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type`
`41`	`41`	`try {`
`42`	`42`	`return $this->reflectionTypeResolver->resolve($subject->getType(), $typeContext);`
`43`	`43`	`} catch (UnsupportedException $e) {`
`44`		`- $path = \sprintf('%s::$%s', $subject->getDeclaringClass()->getName(), $subject->getName());`
	`44`	`+ $path = \sprintf('%s::$%s', $subject->class, $subject->getName());`
`45`	`45`
`46`	`46`	`throw new UnsupportedException(\sprintf('Cannot resolve type for "%s".', $path), $subject, previous: $e);`
`47`	`47`	`}`