Do not replace existing constant nodes if they are already the correc…

…t ones
rectorphp · Dec 12, 2023 · 91f17e1 · 91f17e1
1 parent 3768001
commit 91f17e1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -524,4 +524,4 @@ parameters:
 
         -
             path: rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php
-            message: "#Method \"processToClassConstFetch\\(\\)\" returns bool type, so the name should start with is/has/was#"
+            message: "#Method \"process(ToClassConstFetch|Arg)\\(\\)\" returns bool type, so the name should start with is/has/was#"
diff --git a/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php b/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php
@@ -132,6 +132,7 @@ private function processToClassConstFetch(
         AttributeKeyToClassConstFetch $attributeKeyToClassConstFetch
     ): bool {
         $hasChanged = false;
+
         foreach ($attributeGroup->attrs as $attribute) {
             if (! $this->isName($attribute->name, $attributeKeyToClassConstFetch->getAttributeClass())) {
                 continue;
@@ -147,23 +148,38 @@ private function processToClassConstFetch(
                     continue;
                 }
 
-                $value = $this->valueResolver->getValue($arg->value);
-
-                $constName = $attributeKeyToClassConstFetch->getValuesToConstantsMap()[$value] ?? null;
-                if ($constName === null) {
-                    continue;
+                if ($this->processArg($arg, $attributeKeyToClassConstFetch)) {
+                    $hasChanged = true;
                 }
-
-                $arg->value = $this->nodeFactory->createClassConstFetch(
-                    $attributeKeyToClassConstFetch->getConstantClass(),
-                    $constName
-                );
-
-                $hasChanged = true;
-                continue 2;
             }
         }
 
         return $hasChanged;
     }
+
+    private function processArg(Node\Arg $arg, AttributeKeyToClassConstFetch $attributeKeyToClassConstFetch): bool
+    {
+        $value = $this->valueResolver->getValue($arg->value);
+
+        $constName = $attributeKeyToClassConstFetch->getValuesToConstantsMap()[$value] ?? null;
+        if ($constName === null) {
+            return false;
+        }
+
+        $newValue = $this->nodeFactory->createClassConstFetch(
+            $attributeKeyToClassConstFetch->getConstantClass(),
+            $constName
+        );
+
+        if (
+            $arg->value instanceof Node\Expr\ClassConstFetch
+            && $this->getName($arg->value) === $this->getName($newValue)
+        ) {
+            return false;
+        }
+
+        $arg->value = $newValue;
+
+        return true;
+    }
 }