scope return and allow final methods

Author: Orest-Divintari

rules-tests/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector/Fixture/narrow_final_method_in_non_final_class.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector\Source\ConferenceTalk;
+
+class NonFinalClassWithFinalMethod
+{
+    final public function create(): object
+    {
+        return new ConferenceTalk();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector\Source\ConferenceTalk;
+
+class NonFinalClassWithFinalMethod
+{
+    final public function create(): \Rector\Tests\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector\Source\ConferenceTalk
+    {
+        return new ConferenceTalk();
+    }
+}
+
+?>

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\Stmt\Return_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
 use Rector\PhpParser\Node\BetterNodeFinder;
@@ -109,7 +108,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $classReflection->isFinal()) {
+        if (! $classReflection->isFinal() && ! $node->isFinal()) {
             return null;
         }
 
@@ -226,7 +225,7 @@ private function hasParentMethodWithNonObjectReturn(ClassMethod $classMethod): b
 
     private function getActualReturnClass(ClassMethod $node): ?string
     {
-        $returnStatements = $this->betterNodeFinder->findInstanceOf($node, Return_::class);
+        $returnStatements = $this->betterNodeFinder->findReturnsScoped($node);
 
         if ($returnStatements === []) {
             return null;