[TypeDeclaration] Skip property names in TypedPropertyFromStrictConst…

…ructorRector (#3128)

* add trait failing fixture in TypedPropertyFromStrictConstructorRector

* [TypeDeclaration] Skip property names in TypedPropertyFromStrictConstructorRector

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/Fixture/skip_if_trait_has_same_property.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Source\SomeSkipMeTrait;
+
+final class SkipIfTraitHasSameProperty
+{
+    use SomeSkipMeTrait;
+
+    private $skipMe;
+
+    public function __construct(string $nullableString = null)
+    {
+        $this->skipMe = $nullableString;
+    }
+}

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/Source/SomeSkipMeTrait.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Source;
+
+trait SomeSkipMeTrait
+{
+    private $skipMe;
+}

rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
@@ -34,7 +35,8 @@ public function __construct(
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
         private readonly ConstructorAssignDetector $constructorAssignDetector,
         private readonly PhpVersionProvider $phpVersionProvider,
-        private readonly PropertyTypeOverrideGuard $propertyTypeOverrideGuard
+        private readonly PropertyTypeOverrideGuard $propertyTypeOverrideGuard,
+        private readonly ReflectionProvider $reflectionProvider,
     ) {
     }
 
@@ -83,7 +85,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->type !== null) {
+        if ($this->shouldSkip($node)) {
             return null;
         }
 
@@ -138,4 +140,46 @@ public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::TYPED_PROPERTIES;
     }
+
+    /**
+     * @return string[]
+     */
+    private function resolveTraitPropertyNames(Class_ $class): array
+    {
+        $traitPropertyNames = [];
+
+        foreach ($class->getTraitUses() as $traitUse) {
+            foreach ($traitUse->traits as $traitName) {
+                $traitNameString = $this->getName($traitName);
+                if (! $this->reflectionProvider->hasClass($traitNameString)) {
+                    continue;
+                }
+
+                $traitClassReflection = $this->reflectionProvider->getClass($traitNameString);
+                $nativeReflection = $traitClassReflection->getNativeReflection();
+                foreach ($nativeReflection->getProperties() as $property) {
+                    $traitPropertyNames[] = $property->getName();
+                }
+            }
+        }
+
+        return $traitPropertyNames;
+    }
+
+    private function shouldSkip(Property $property): bool
+    {
+        if ($property->type !== null) {
+            return true;
+        }
+
+        $class = $this->betterNodeFinder->findParentType($property, Class_::class);
+        if ($class instanceof Class_) {
+            $traitPropertyNames = $this->resolveTraitPropertyNames($class);
+            if ($this->isNames($property, $traitPropertyNames)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }