[TypeDeclarationDocblocks] Handle already return typed \Generator on AddReturnDocblockDataProviderRector

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class AlreadyReturnTypedGenerator extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    public static function provideData(): \Generator
+    {
+        yield ['data1', 'data2'];
+        yield ['item4', 'item5'];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class AlreadyReturnTypedGenerator extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    /**
+     * @return \Generator<array<int, string>>
+     */
+    public static function provideData(): \Generator
+    {
+        yield ['data1', 'data2'];
+        yield ['item4', 'item5'];
+    }
+}
+
+?>

rules/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector.php

@@ -154,7 +154,7 @@ public function refactor(Node $node): ?Node
             if ($yields !== []) {
                 $yieldType = $this->yieldTypeResolver->resolveFromYieldNodes($yields, $dataProviderClassMethod);
 
-                if ($yieldType instanceof FullyQualifiedGenericObjectType && $yieldType->getClassName() === 'Generator') {
+                if ($yieldType instanceof FullyQualifiedGenericObjectType && $yieldType->getClassName() === 'Generator' && ! $dataProviderClassMethod->returnType instanceof Node) {
                     // most likely, a static iterator is used in data test fixtures
                     $yieldType = new FullyQualifiedGenericObjectType('Iterator', $yieldType->getTypes());
                 }