[TypeDeclarationDocblocks] Handle multiple objects on AddReturnDocblockDataProviderRector (#7298)

* [TypeDeclarationDocblocks] Handle multiple objects on AddReturnDocblockDataProviderRector

* Fix

* update complex array

Author: samsonasik

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

@@ -8,6 +8,7 @@ class ComplexArray
     {
         return [
             'id' => new \stdClass(),
+            'other' => false,
             'context' => [
                 'id' => 1,
                 'data' => [
@@ -17,6 +18,11 @@ class ComplexArray
             ],
             'values' => [
                 'name' => '111',
+                'age' => 1,
+            ],
+            'values_other' => [
+                'name' => '111',
+                'age' => 1,
             ],
         ];
     }
@@ -37,6 +43,7 @@ class ComplexArray
     {
         return [
             'id' => new \stdClass(),
+            'other' => false,
             'context' => [
                 'id' => 1,
                 'data' => [
@@ -46,6 +53,11 @@ class ComplexArray
             ],
             'values' => [
                 'name' => '111',
+                'age' => 1,
+            ],
+            'values_other' => [
+                'name' => '111',
+                'age' => 1,
             ],
         ];
     }

rules-tests/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector/Fixture/multi_objects.php.inc

@@ -0,0 +1,52 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use DateTime;
+use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class MultiObjects extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    public static function provideData(): iterable
+    {
+        yield [[new DateTime(), 'format']];
+        yield [[new DateTimeImmutable(), 'format']];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use DateTime;
+use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class MultiObjects extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    /**
+     * @return \Iterator<array<int, array<int, (\DateTime | \DateTimeImmutable | string)>>>
+     */
+    public static function provideData(): iterable
+    {
+        yield [[new DateTime(), 'format']];
+        yield [[new DateTimeImmutable(), 'format']];
+    }
+}
+
+?>

rules/Privatization/TypeManipulator/TypeNormalizer.php

@@ -27,7 +27,7 @@
     /**
      * @var int
      */
-    private const MAX_PRINTED_UNION_DOC_LENGHT = 60;
+    private const MAX_PRINTED_UNION_DOC_LENGHT = 77;
 
     public function __construct(
         private TypeFactory $typeFactory,

src/NodeTypeResolver/PHPStan/Type/TypeFactory.php

@@ -205,6 +205,16 @@ private function unwrapConstantArrayTypes(ConstantArrayType $constantArrayType):
                 $nestedFlattenKeyType = new MixedType();
             }
 
+            if ($nestedFlattenItemType instanceof ConstantArrayType) {
+                $innerArrayTypes = $this->unwrapConstantArrayTypes($nestedFlattenItemType);
+                foreach ($innerArrayTypes as $innerArrayType) {
+                    // preserve outer array -> inner array structure: array<outerKey, innerArray>
+                    $unwrappedTypes[] = new ArrayType($nestedFlattenKeyType, $innerArrayType);
+                }
+
+                continue;
+            }
+
             $unwrappedTypes[] = new ArrayType($nestedFlattenKeyType, $nestedFlattenItemType);
         }