Updated Rector to commit 52c6ece13308d46109bd1c2f4927592244d1c7b0

rectorphp/rector-src@52c6ece Add support for adding the `#[Override]` attribute to methods implementing interfaces (#7934)

Author: TomasVotruba

rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php

@@ -66,11 +66,17 @@ final class AddOverrideAttributeToOverriddenMethodsRector extends AbstractRector
      * @var string
      */
     public const ALLOW_OVERRIDE_EMPTY_METHOD = 'allow_override_empty_method';
+    /**
+     * @api
+     * @var string
+     */
+    public const ADD_TO_INTERFACE_METHODS = 'add_to_interface_methods';
     /**
      * @var string
      */
     private const OVERRIDE_CLASS = 'Override';
     private bool $allowOverrideEmptyMethod = \false;
+    private bool $addToInterfaceMethods = \false;
     private bool $hasChanged = \false;
     public function __construct(ReflectionProvider $reflectionProvider, ClassAnalyzer $classAnalyzer, PhpAttributeAnalyzer $phpAttributeAnalyzer, AstResolver $astResolver, ValueResolver $valueResolver, ParentClassAnalyzer $parentClassAnalyzer)
     {
@@ -118,7 +124,36 @@ public function foo()
     }
 }
 CODE_SAMPLE
-, [self::ALLOW_OVERRIDE_EMPTY_METHOD => \false])]);
+, [self::ALLOW_OVERRIDE_EMPTY_METHOD => \false]), new ConfiguredCodeSample(<<<'CODE_SAMPLE'
+interface ParentInterface
+{
+    public function foo();
+}
+
+final class ChildClass implements ParentInterface
+{
+    public function foo()
+    {
+        echo 'implements interface';
+    }
+}
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+interface ParentInterface
+{
+    public function foo();
+}
+
+final class ChildClass implements ParentInterface
+{
+    #[\Override]
+    public function foo()
+    {
+        echo 'implements interface';
+    }
+}
+CODE_SAMPLE
+, [self::ADD_TO_INTERFACE_METHODS => \true])]);
     }
     /**
      * @return array<class-string<Node>>
@@ -133,6 +168,7 @@ public function getNodeTypes(): array
     public function configure(array $configuration): void
     {
         $this->allowOverrideEmptyMethod = $configuration[self::ALLOW_OVERRIDE_EMPTY_METHOD] ?? \false;
+        $this->addToInterfaceMethods = $configuration[self::ADD_TO_INTERFACE_METHODS] ?? \false;
     }
     /**
      * @param Class_ $node
@@ -143,8 +179,7 @@ public function refactor(Node $node): ?Node
         if ($this->classAnalyzer->isAnonymousClass($node)) {
             return null;
         }
-        // skip if no parents, nor traits, nor strinables are involved
-        if ($node->extends === null && $node->getTraitUses() === [] && !$this->implementsStringable($node)) {
+        if ($this->shouldSkipNode($node)) {
             return null;
         }
         $className = (string) $this->getName($node);
@@ -153,14 +188,14 @@ public function refactor(Node $node): ?Node
         }
         $classReflection = $this->reflectionProvider->getClass($className);
         $parentClassReflections = $classReflection->getParents();
+        // interfaces are added for Stringable
+        if ($this->addToInterfaceMethods || $this->allowOverrideEmptyMethod) {
+            $parentClassReflections = array_merge($parentClassReflections, $classReflection->getInterfaces());
+        }
         if ($this->allowOverrideEmptyMethod) {
-            $parentClassReflections = array_merge(
-                $parentClassReflections,
-                $classReflection->getInterfaces(),
-                // place on last to ensure verify method exists on parent early
-                // for non abstract method from trait
-                $classReflection->getTraits()
-            );
+            // place on last to ensure verify method exists on parent early
+            // for non abstract method from trait
+            $parentClassReflections = array_merge($parentClassReflections, $classReflection->getTraits());
         }
         if ($parentClassReflections === []) {
             return null;
@@ -233,9 +268,14 @@ private function shouldSkipClassMethod(ClassMethod $classMethod): bool
     }
     private function shouldSkipParentClassMethod(ClassReflection $parentClassReflection, ClassMethod $classMethod): bool
     {
-        if ($this->allowOverrideEmptyMethod && $parentClassReflection->isBuiltIn()) {
+        // special case for Stringable interface
+        if ($this->allowOverrideEmptyMethod && $parentClassReflection->getName() === 'Stringable') {
             return \false;
         }
+        // if the method is on interface, skip based on the config flag
+        if ($parentClassReflection->isInterface()) {
+            return !$this->addToInterfaceMethods;
+        }
         // parse parent method, if it has some contents or not
         $parentClass = $this->astResolver->resolveClassFromClassReflection($parentClassReflection);
         if (!$parentClass instanceof ClassLike) {
@@ -289,13 +329,26 @@ private function resolveClassMethodFromTraitUse(ClassLike $classLike, string $me
         }
         return null;
     }
-    private function implementsStringable(Class_ $class): bool
+    // early return for the class if it does not extend anything
+    private function shouldSkipNode(Class_ $class): bool
     {
-        foreach ($class->implements as $implement) {
-            if ($this->isName($implement, 'Stringable')) {
-                return \true;
+        if ($class->extends !== null) {
+            return \false;
+        }
+        if ($class->getTraitUses() !== []) {
+            return \false;
+        }
+        if ($this->addToInterfaceMethods && $class->implements !== []) {
+            return \false;
+        }
+        // add override to Stringable if flag is set
+        if ($this->allowOverrideEmptyMethod) {
+            foreach ($class->implements as $implement) {
+                if ($this->isName($implement, 'Stringable')) {
+                    return \false;
+                }
             }
         }
-        return \false;
+        return \true;
     }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '23810525658cb51d0e169c2556917f22a245bcde';
+    public const PACKAGE_VERSION = '52c6ece13308d46109bd1c2f4927592244d1c7b0';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-04-07 18:38:23';
+    public const RELEASE_DATE = '2026-04-07 18:39:52';
     /**
      * @var int
      */