Add multiple stmts above in DocblockReturnArrayFromDirectArrayInstanceRector

Author: TomasVotruba

rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/some-items-above.php.inc

@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class SomeItemsAbove
+{
+    private static function getValues(): array
+    {
+        $list = [1, 2, 3];
+
+        return [
+            [
+                'key1' => 100,
+                'key2' => '-25.5%',
+            ],
+        ];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class SomeItemsAbove
+{
+    /**
+     * @return array<int, array<string, int|string>>
+     */
+    private static function getValues(): array
+    {
+        $list = [1, 2, 3];
+
+        return [
+            [
+                'key1' => 100,
+                'key2' => '-25.5%',
+            ],
+        ];
+    }
+}
+
+?>

rules/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector.php

@@ -8,12 +8,12 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
-use PhpParser\Node\Stmt\Return_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\Type\Constant\ConstantArrayType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Rector\AbstractRector;
+use Rector\TypeDeclarationDocblocks\NodeFinder\ReturnNodeFinder;
 use Rector\TypeDeclarationDocblocks\TypeResolver\ConstantArrayTypeGeneralizer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -27,6 +27,7 @@ public function __construct(
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly DocBlockUpdater $docBlockUpdater,
         private readonly ConstantArrayTypeGeneralizer $constantArrayTypeGeneralizer,
+        private readonly ReturnNodeFinder $returnNodeFinder,
     ) {
     }
 
@@ -85,15 +86,11 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($node->stmts === null || count($node->stmts) !== 1) {
-            return null;
-        }
-
-        $soleReturn = $node->stmts[0];
-        if (! $soleReturn instanceof Return_) {
+        if ($node->stmts === null) {
             return null;
         }
 
+        $soleReturn = $this->returnNodeFinder->findOnlyReturnWithExpr($node);
         if (! $soleReturn->expr instanceof Array_) {
             return null;
         }