Add typed property, if traits do not duplicate the property

rectorphp · Jan 9, 2025 · b5ea2db · b5ea2db
1 parent 1c39637
commit b5ea2db
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/...ector/Property/TypedPropertyFromStrictConstructorRector/Fixture/include_trait_as_well.php b/...ector/Property/TypedPropertyFromStrictConstructorRector/Fixture/include_trait_as_well.php
diff --git a/...r/Property/TypedPropertyFromStrictConstructorRector/Fixture/include_trait_as_well.php.inc b/...r/Property/TypedPropertyFromStrictConstructorRector/Fixture/include_trait_as_well.php.inc
@@ -33,7 +33,7 @@ final class IncludeTraitAsWell
 {
     use TraitUsingEntityManager;
 
-    private EntityManagerInterface $entityManager;
+    private \Doctrine\ORM\EntityManagerInterface $entityManager;
 
     public function __construct(EntityManagerInterface $entityManager)
     {

diff --git a/rules/Php74/Guard/PropertyTypeChangeGuard.php b/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->hasTraitWitHSameProperty($classReflection, $propertyName)) {
             return false;
         }
 

diff --git a/scoper.php b/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 {

diff --git a/src/NodeManipulator/PropertyManipulator.php b/src/NodeManipulator/PropertyManipulator.php
@@ -144,6 +144,17 @@ public function isUsedByTrait(ClassReflection $classReflection, string $property
         return false;
     }
 
+    public function hasTraitWitHSameProperty(ClassReflection $classReflection, string $propertyName): bool
+    {
+        foreach ($classReflection->getTraits() as $traitUse) {
+            if ($traitUse->hasProperty($propertyName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private function isPropertyAssignedOnlyInConstructor(
         Class_ $class,
         string $propertyName,