[type-declaration] Add typed property, if traits do not duplicate the…

… property (#6663)

* [type-declaration] Add typed property using trait test fixture

* Add typed property, if traits do not duplicate the property

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

@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Source\TraitUsingEntityManager;
+
+final class IncludeTraitAsWell
+{
+    use TraitUsingEntityManager;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    private $entityManager;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Source\TraitUsingEntityManager;
+
+final class IncludeTraitAsWell
+{
+    use TraitUsingEntityManager;
+
+    private \Doctrine\ORM\EntityManagerInterface $entityManager;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+}
+
+?>

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

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Source;
+
+trait TraitUsingEntityManager
+{
+    public function run()
+    {
+        $this->entityManager->flush();
+    }
+}

rules/Php74/Guard/PropertyTypeChangeGuard.php

@@ -41,7 +41,7 @@ public function isLegal(
 
         $propertyName = $this->nodeNameResolver->getName($property);
 
-        if ($this->propertyManipulator->isUsedByTrait($classReflection, $propertyName)) {
+        if ($this->propertyManipulator->hasTraitWithSamePropertyOrWritten($classReflection, $propertyName)) {
             return false;
         }
 

scoper.php

@@ -137,11 +137,7 @@ static function (string $filePath, string $prefix, string $content): string {
                 return $content;
             }
 
-            return str_replace(
-                "'" . $prefix . "\\",
-                "'\\",
-                $content
-            );
+            return str_replace("'" . $prefix . '\\', "'\\", $content);
         },
 
         static function (string $filePath, string $prefix, string $content): string {

src/NodeAnalyzer/PropertyFetchAnalyzer.php

@@ -104,6 +104,24 @@ public function containsLocalPropertyFetchName(Trait_ $trait, string $propertyNa
         );
     }
 
+    public function containsWrittenPropertyFetchName(Trait_ $trait, string $propertyName): bool
+    {
+        if ($trait->getProperty($propertyName) instanceof Property) {
+            return true;
+        }
+
+        return (bool) $this->betterNodeFinder->findFirst(
+            $trait,
+            function (Node $node) use ($propertyName): bool {
+                if (! $node instanceof Assign) {
+                    return false;
+                }
+
+                return $this->isLocalPropertyFetchName($node->var, $propertyName);
+            }
+        );
+    }
+
     /**
      * @phpstan-assert-if-true PropertyFetch|StaticPropertyFetch $node
      */

src/NodeManipulator/PropertyManipulator.php

@@ -144,6 +144,28 @@ public function isUsedByTrait(ClassReflection $classReflection, string $property
         return false;
     }
 
+    public function hasTraitWithSamePropertyOrWritten(ClassReflection $classReflection, string $propertyName): bool
+    {
+        foreach ($classReflection->getTraits() as $traitUse) {
+            if ($traitUse->hasProperty($propertyName)) {
+                return true;
+            }
+
+            $trait = $this->astResolver->resolveClassFromClassReflection($traitUse);
+            if (! $trait instanceof Trait_) {
+                continue;
+            }
+
+            // is property written to
+            if ($this->propertyFetchAnalyzer->containsWrittenPropertyFetchName($trait, $propertyName)) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
     private function isPropertyAssignedOnlyInConstructor(
         Class_ $class,
         string $propertyName,