Code quality improvements

rectorphp · Aug 4, 2023 · fb893e6 · fb893e6
1 parent 439740f
commit fb893e6
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php b/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php
@@ -101,7 +101,7 @@ public function refactor(Node $node): ?Node
         return $this->nodeFactory->createClassConstFetch($className, $enumCaseName);
     }
 
-    private function isEnumConstant(string $className, string $constant)
+    private function isEnumConstant(string $className, string $constant): bool
     {
         $classReflection = $this->reflectionProvider->getClass($className);
 
@@ -189,21 +189,42 @@ private function refactorEqualsMethodCall(MethodCall $methodCall): ?Identical
         return new Identical($expr, $right);
     }
 
+    private function isCallerClassEnum(StaticCall|MethodCall $node): bool
+    {
+        if ($node instanceof StaticCall) {
+            return $this->isObjectType($node->class, new ObjectType('MyCLabs\Enum\Enum'));
+        }
+
+        return $this->isObjectType($node->var, new ObjectType('MyCLabs\Enum\Enum'));
+    }
+
     private function getNonEnumReturnTypeExpr(Node $node): null|ClassConstFetch|Expr
     {
         if (! $node instanceof StaticCall && ! $node instanceof MethodCall) {
             return null;
         }
 
-        if ($this->isObjectType($node->class ?? $node->var, new ObjectType('MyCLabs\Enum\Enum'))) {
+        if ($this->isCallerClassEnum($node)) {
             $methodName = $this->getName($node->name);
             if ($methodName === null) {
                 return null;
             }
 
-            $classReflection = $this->reflectionProvider->getClass($this->getName($node->class ?? $node->var));
+            if ($node instanceof StaticCall) {
+                $className = $this->getName($node->class);
+            }
+
+            if ($node instanceof MethodCall) {
+                $className = $this->getName($node->var);
+            }
+
+            if ($className === null) {
+                return null;
+            }
+
+            $classReflection = $this->reflectionProvider->getClass($className);
             // method self::getValidEnumExpr process enum static methods from constants
-            if ($classReflection->hasConstant($this->getName($node->name))) {
+            if ($classReflection->hasConstant($methodName)) {
                 return null;
             }
         }