[Php82] Move consume trait property skip check to ReadOnlyClassRector (…

…#3316)

* [Php82] Move consume trait property to ReadOnlyClassRector

* cs fix

* add check property not readonly in trait

* [ci-review] Rector Rectify

* phsptan

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <action@github.com>

rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/Fixture/skip_consume_trait_property.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
+
+use Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Source\SomeTraitWithProperty;
+
+final class SkipConsumeTraitProperty
+{
+    use SomeTraitWithProperty;
+
+    public function __construct(private readonly string $name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+}

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Source/SomeTraitWithProperty.php → rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/Source/SomeTraitWithProperty.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Source;
+namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Source;
 
 trait SomeTraitWithProperty
 {

rules/Php81/Rector/Property/ReadOnlyPropertyRector.php

@@ -15,7 +15,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\NodeTraverser;
-use PHPStan\Reflection\ReflectionProvider;
 use Rector\Core\NodeAnalyzer\ParamAnalyzer;
 use Rector\Core\NodeManipulator\PropertyFetchAssignManipulator;
 use Rector\Core\NodeManipulator\PropertyManipulator;
@@ -40,8 +39,7 @@ public function __construct(
         private readonly PropertyManipulator $propertyManipulator,
         private readonly PropertyFetchAssignManipulator $propertyFetchAssignManipulator,
         private readonly ParamAnalyzer $paramAnalyzer,
-        private readonly VisibilityManipulator $visibilityManipulator,
-        private readonly ReflectionProvider $reflectionProvider
+        private readonly VisibilityManipulator $visibilityManipulator
     ) {
     }
 
@@ -115,34 +113,7 @@ private function shouldSkipInReadonlyClass(Property|Param $node): bool
             return true;
         }
 
-        if ($class->isReadonly()) {
-            return true;
-        }
-
-        $traitUses = $class->getTraitUses();
-        if ($traitUses === []) {
-            return false;
-        }
-
-        foreach ($traitUses as $traitUse) {
-            foreach ($traitUse->traits as $trait) {
-                $traitName = $trait->toString();
-
-                // trait not autoloaded
-                if (! $this->reflectionProvider->hasClass($traitName)) {
-                    return true;
-                }
-
-                $traitClassReflection = $this->reflectionProvider->getClass($traitName);
-                $nativeReflection = $traitClassReflection->getNativeReflection();
-
-                if ($nativeReflection->getProperties() !== []) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
+        return $class->isReadonly();
     }
 
     private function refactorProperty(Property $property): ?Property

rules/Php82/Rector/Class_/ReadOnlyClassRector.php

@@ -9,7 +9,9 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
+use PHPStan\BetterReflection\Reflection\Adapter\ReflectionProperty;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
@@ -34,7 +36,8 @@ public function __construct(
         private readonly ClassAnalyzer $classAnalyzer,
         private readonly VisibilityManipulator $visibilityManipulator,
         private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
-        private readonly ReflectionResolver $reflectionResolver
+        private readonly ReflectionResolver $reflectionResolver,
+        private readonly ReflectionProvider $reflectionProvider
     ) {
     }
 
@@ -158,6 +161,10 @@ private function shouldSkip(Class_ $class): bool
             return true;
         }
 
+        if ($this->shouldSkipConsumeTraitProperty($class)) {
+            return true;
+        }
+
         $constructClassMethod = $class->getMethod(MethodName::CONSTRUCT);
         if (! $constructClassMethod instanceof ClassMethod) {
             // no __construct means no property promotion, skip if class has no property defined
@@ -173,6 +180,44 @@ private function shouldSkip(Class_ $class): bool
         return $this->shouldSkipParams($params);
     }
 
+    private function shouldSkipConsumeTraitProperty(Class_ $class): bool
+    {
+        $traitUses = $class->getTraitUses();
+        foreach ($traitUses as $traitUse) {
+            foreach ($traitUse->traits as $trait) {
+                $traitName = $trait->toString();
+
+                // trait not autoloaded
+                if (! $this->reflectionProvider->hasClass($traitName)) {
+                    return true;
+                }
+
+                $traitClassReflection = $this->reflectionProvider->getClass($traitName);
+                $nativeReflection = $traitClassReflection->getNativeReflection();
+
+                if ($this->hasReadonlyProperty($nativeReflection->getProperties())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ReflectionProperty[] $properties
+     */
+    private function hasReadonlyProperty(array $properties): bool
+    {
+        foreach ($properties as $property) {
+            if (! $property->isReadOnly()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param ClassReflection[] $parents
      */