fix reporting on renamed proeprty match type (#3098)

rectorphp · Nov 26, 2022 · 1f8c88a · 1f8c88a
1 parent 07b529a
commit 1f8c88a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -781,3 +781,6 @@ parameters:
         -
             path: packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php
             message: '#Offset (.*?)includes(.*?) always exists and is not nullable#'
+
+        # returns bool for notifications
+        - '#Method "renamePropertyPromotion\(\)" returns bool type, so the name should start with is/has/was#'
diff --git a/rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php b/rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php
@@ -36,15 +36,17 @@ public function __construct(
     ) {
     }
 
-    public function renamePropertyPromotion(Class_|Interface_ $classLike): void
+    public function renamePropertyPromotion(Class_|Interface_ $classLike): bool
     {
+        $hasChanged = false;
+
         if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::PROPERTY_PROMOTION)) {
-            return;
+            return false;
         }
 
         $constructClassMethod = $classLike->getMethod(MethodName::CONSTRUCT);
         if (! $constructClassMethod instanceof ClassMethod) {
-            return;
+            return false;
         }
 
         // resolve possible and existing param names
@@ -71,7 +73,10 @@ public function renamePropertyPromotion(Class_|Interface_ $classLike): void
             }
 
             $this->renameParamVarNameAndVariableUsage($classLike, $constructClassMethod, $desiredPropertyName, $param);
+            $hasChanged = true;
         }
+
+        return $hasChanged;
     }
 
     private function renameParamVarNameAndVariableUsage(

diff --git a/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php b/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php
@@ -87,13 +87,17 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         $this->refactorClassProperties($node);
-        $this->propertyPromotionRenamer->renamePropertyPromotion($node);
 
-        if (! $this->hasChanged) {
-            return null;
+        $hasPromotedPropertyChanged = $this->propertyPromotionRenamer->renamePropertyPromotion($node);
+        if ($this->hasChanged) {
+            return $node;
         }
 
-        return $node;
+        if ($hasPromotedPropertyChanged) {
+            return $node;
+        }
+
+        return null;
     }
 
     private function refactorClassProperties(ClassLike $classLike): void