Merge pull request #2885 from rectorphp/fix-const

Fix already constant
rectorphp · Feb 19, 2020 · 5a3b0ad · 5a3b0ad
2 parents d7fcfe1 + 9da97ed
commit 5a3b0ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -259,7 +259,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.6-dev"
+            "dev-master": "0.8-dev"
         }
     }
 }
diff --git a/...s/solid/src/Rector/ClassMethod/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php b/...s/solid/src/Rector/ClassMethod/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php
@@ -216,8 +216,13 @@ private function refactorClassMethod(ClassMethod $classMethod, Class_ $class, ar
         foreach ($readOnlyVariableAssigns as $readOnlyVariableAssign) {
             $this->removeNode($readOnlyVariableAssign);
 
-            /** @var Variable $variable */
+            /** @var Variable|ClassConstFetch $variable */
             $variable = $readOnlyVariableAssign->var;
+            // already overriden
+            if (! $variable instanceof Variable) {
+                continue;
+            }
+
             $classConst = $this->createClassConst($variable, $readOnlyVariableAssign->expr);
 
             // replace $variable usage in the code with constant