Updated Rector to commit a6296aa93add2104e2a9ed42a56e2d749939be56

rectorphp/rector-src@a6296aa [Php83] Handle parent class consume trait on AddOverrideAttributeToOverriddenMethodsRector (#7868)

Author: TomasVotruba

rules/Php83/Rector/BooleanAnd/JsonValidateRector.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Php83\Rector\BooleanAnd;
 
+use PhpParser\Node\Identifier;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
@@ -88,7 +89,7 @@ public function refactor(Node $node): ?Node
         }
         // Remove associative argument (position 1 or named) - json_validate does not have this param
         foreach ($args as $index => $arg) {
-            if ($arg instanceof Arg && ($arg->name !== null && $arg->name->toString() === 'associative' || $arg->name === null && $index === 1)) {
+            if ($arg instanceof Arg && ($arg->name instanceof Identifier && $arg->name->toString() === 'associative' || !$arg->name instanceof Identifier && $index === 1)) {
                 unset($funcCall->args[$index]);
                 break;
             }

rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php

@@ -15,6 +15,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
+use PhpParser\Node\Stmt\Trait_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
@@ -241,6 +242,9 @@ private function shouldSkipParentClassMethod(ClassReflection $parentClassReflect
             return \true;
         }
         $parentClassMethod = $parentClass->getMethod($classMethod->name->toString());
+        if (!$parentClassMethod instanceof ClassMethod) {
+            $parentClassMethod = $this->resolveClassMethodFromTraitUse($parentClass, $classMethod->name->toString());
+        }
         if (!$parentClassMethod instanceof ClassMethod) {
             return \true;
         }
@@ -269,6 +273,22 @@ private function shouldSkipParentClassMethod(ClassReflection $parentClassReflect
         }
         return \false;
     }
+    private function resolveClassMethodFromTraitUse(ClassLike $classLike, string $methodName): ?ClassMethod
+    {
+        foreach ($classLike->getTraitUses() as $traitUse) {
+            foreach ($traitUse->traits as $traitName) {
+                $traitClass = $this->astResolver->resolveClassFromName($traitName->__toString());
+                if (!$traitClass instanceof Trait_) {
+                    continue;
+                }
+                $traitClassMethod = $traitClass->getMethod($methodName);
+                if ($traitClassMethod instanceof ClassMethod) {
+                    return $traitClassMethod;
+                }
+            }
+        }
+        return null;
+    }
     private function implementsStringable(Class_ $class): bool
     {
         foreach ($class->implements as $implement) {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '9d02f92a2b31cf4d0944c4cc4ae9c024a26ca826';
+    public const PACKAGE_VERSION = 'a6296aa93add2104e2a9ed42a56e2d749939be56';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-29 17:51:10';
+    public const RELEASE_DATE = '2026-01-30 19:22:02';
     /**
      * @var int
      */