cover no direct return array too

Author: TomasVotruba

rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/include_missing_return_array.php.inc

@@ -0,0 +1,34 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class IncludeMissingReturnArray
+{
+    public function getNames()
+    {
+        return [
+            'key' => 'value',
+        ];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class IncludeMissingReturnArray
+{
+    /**
+     * @return array<string, string>
+     */
+    public function getNames()
+    {
+        return [
+            'key' => 'value',
+        ];
+    }
+}
+
+?>

rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/skip_already_set_docblock.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class SkipAlreadySetDocblock
+{
+    /**
+     * @return array<string, int|string>
+     */
+    public function getNames(): array
+    {
+        return [
+            'key' => 'value',
+        ];
+    }
+}

rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/skip_more_variables.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
+
+final class SkipMoreVariables
+{
+    public function getNames()
+    {
+        $variable = [
+            'key' => 'value',
+        ];
+
+
+        return $variable;
+    }
+}

rules/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\TypeDeclarationDocblocks\Rector\ClassMethod;
 
+use PHPStan\Type\Type;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -43,9 +44,11 @@ public function getNodeTypes(): array
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Add @return array docblock based on direct single level direct return of []', [
-            new CodeSample(
-                <<<'CODE_SAMPLE'
+        return new RuleDefinition(
+            'Add simple @return array docblock based on direct single level direct return of []',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
 class SomeClass
 {
     public function getItems(): array
@@ -56,8 +59,8 @@ public function getItems(): array
     }
 }
 CODE_SAMPLE
-                ,
-                <<<'CODE_SAMPLE'
+                    ,
+                    <<<'CODE_SAMPLE'
 class SomeClass
 {
     /**
@@ -71,31 +74,25 @@ public function getItems(): array
     }
 }
 CODE_SAMPLE
-            ),
-        ]);
+                ),
+
+            ]
+        );
     }
 
     /**
      * @param ClassMethod $node
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $node->returnType instanceof Node) {
-            return null;
-        }
-
-        if (! $this->isName($node->returnType, 'array')) {
-            return null;
-        }
-
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
 
         // return tag is already given
         if ($phpDocInfo->getReturnTagValue() instanceof ReturnTagValueNode) {
             return null;
         }
 
-        if (count($node->stmts) !== 1) {
+        if ($node->stmts === null || count($node->stmts) !== 1) {
             return null;
         }
 
@@ -131,7 +128,7 @@ public function refactor(Node $node): ?Node
     /**
      * covers constant types too and makes them more generic
      */
-    private function constantToGenericType(\PHPStan\Type\Type $type): \PHPStan\Type\Type
+    private function constantToGenericType(Type $type): Type
     {
         if ($type instanceof StringType) {
             return new StringType();
@@ -154,8 +151,8 @@ private function constantToGenericType(\PHPStan\Type\Type $type): \PHPStan\Type\
     }
 
     private function createArrayGenericTypeNode(
-        \PHPStan\Type\Type $keyType,
-        \PHPStan\Type\Type $itemType
+        Type $keyType,
+        Type $itemType
     ): GenericTypeNode {
         $keyDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($keyType);
         $itemDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($itemType);