[Php83] Handle parent class consume trait on AddOverrideAttributeToOverriddenMethodsRector

rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/Fixture/extends_parent_consume_trait.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Fixture;
+
+use Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Source\ParentConsumeTrait;
+
+class ExtendsParentConsumeTrait extends ParentConsumeTrait
+{
+    public function run()
+    {
+        echo 'override default';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Fixture;
+
+use Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Source\ParentConsumeTrait;
+
+class ExtendsParentConsumeTrait extends ParentConsumeTrait
+{
+    #[\Override]
+    public function run()
+    {
+        echo 'override default';
+    }
+}
+
+?>

rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/Source/ParentConsumeTrait.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Source;
+
+abstract class ParentConsumeTrait
+{
+    use ExampleFromTrait;
+}

rules/Php83/Rector/BooleanAnd/JsonValidateRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Php83\Rector\BooleanAnd;
 
+use PhpParser\Node\Identifier;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
@@ -98,8 +99,8 @@ 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)
+                ($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

@@ -16,6 +16,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;
@@ -261,6 +262,10 @@ private function shouldSkipParentClassMethod(ClassReflection $parentClassReflect
         }
 
         $parentClassMethod = $parentClass->getMethod($classMethod->name->toString());
+        if (! $parentClassMethod instanceof ClassMethod) {
+            $parentClassMethod = $this->resolveClassMethodFromTraitUse($parentClass, $classMethod->name->toString());
+        }
+
         if (! $parentClassMethod instanceof ClassMethod) {
             return true;
         }
@@ -298,6 +303,25 @@ 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) {