[TypeDeclaration] Skip return void in abstract empty class in AddVoid…

…ReturnTypeWhereNoReturnRector (#5311)
rectorphp · Dec 2, 2023 · 3b84030 · 3b84030
1 parent cd9ea2c
commit 3b84030
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/...lassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_empty_class.php.inc b/...lassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_empty_class.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
+
+abstract class SkipAbstractEmptyClass
+{
+    /**
+     * @return string[]
+     */
+    public function getValues()
+    {
+    }
+}
diff --git a/rules/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector.php b/rules/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector.php
@@ -81,7 +81,11 @@ public function refactor(Node $node): ?Node
         $hasChanged = false;
         $isFinal = $class->isFinal();
 
-        $this->traverseNodesWithCallable($node, function (Node $node) use ($class, &$hasChanged, $isFinal): ?PropertyFetch {
+        $this->traverseNodesWithCallable($node, function (Node $node) use (
+            $class,
+            &$hasChanged,
+            $isFinal
+        ): ?PropertyFetch {
             if (! $node instanceof MethodCall) {
                 return null;
             }

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php
@@ -117,7 +117,7 @@ private function shouldSkipClassMethod(ClassMethod|Function_|Closure $functionLi
             return ! $this->isInsideFinalClass($functionLike);
         }
 
-        return false;
+        return $this->isInsideAbstractClass($functionLike) && $functionLike->getStmts() === [];
     }
 
     private function isInsideFinalClass(ClassMethod $classMethod): bool
@@ -129,4 +129,14 @@ private function isInsideFinalClass(ClassMethod $classMethod): bool
 
         return $classReflection->isFinalByKeyword();
     }
+
+    private function isInsideAbstractClass(ClassMethod $classMethod): bool
+    {
+        $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
+        if (! $classReflection instanceof ClassReflection) {
+            return false;
+        }
+
+        return $classReflection->isAbstract();
+    }
 }