[TypeDeclaration] Skip iterable already there in AddReturnTypeDeclara…

…tionFromYieldsRector (#5291)
rectorphp · Nov 27, 2023 · e66754a · e66754a
1 parent 09a962c
commit e66754a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 67 deletions.
diff --git a/...n/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/on_closure.php.inc b/...n/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/on_closure.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector\Fixture;
 
-$func = function (): iterable {
+$func = function () {
     yield 1;
 };
 
@@ -12,7 +12,7 @@ $func = function (): iterable {
 
 namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector\Fixture;
 
-$func = function (): \Iterator {
+$func = function (): \Generator {
     yield 1;
 };
 

diff --git a/...tor/FunctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/return_iterator.php.inc b/...tor/FunctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/return_iterator.php.inc
diff --git a/...unctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/return_type_iterable.php.inc b/...unctionLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/return_type_iterable.php.inc
diff --git a/...onLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/skip_return_type_iterable.php.inc b/...onLike/AddReturnTypeDeclarationFromYieldsRector/Fixture/skip_return_type_iterable.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector\Fixture;
+
+final class SkipReturnTypeIterable
+{
+    public function run(): iterable
+    {
+        yield from $this->getData();
+    }
+
+    private function getData(): array
+    {
+        return [];
+    }
+}
diff --git a/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php b/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php
@@ -98,7 +98,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         // skip already filled type
         if ($node->returnType instanceof Node && $this->isNames(
             $node->returnType,
-            ['Iterator', 'Generator', 'Traversable']
+            ['Iterator', 'Generator', 'Traversable', 'iterable']
         )) {
             return null;
         }