[PHP 7.3] Register existing ContinueToBreakInSwitchRector in PHP 5.2 …

…set to PHP 7.3 config set (rectorphp#5820)

Co-authored-by: kaizen-ci <[email protected]>

config/set/php73.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector;
 use Rector\Php73\Rector\BooleanOr\IsCountableRector;
 use Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector;
 use Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector;
@@ -46,4 +47,5 @@
     $services->set(StringifyStrNeedlesRector::class);
     $services->set(JsonThrowOnErrorRector::class);
     $services->set(RegexDashEscapeRector::class);
+    $services->set(ContinueToBreakInSwitchRector::class);
 };

packages/node-type-resolver/tests/PerNodeTypeResolver/PropertyFetchTypeResolver/Php74Test.php

@@ -22,6 +22,9 @@ public function test(SmartFileInfo $smartFileInfo): void
         $this->doTestFileInfo($smartFileInfo);
     }
 
+    /**
+     * @return Iterator<mixed, SmartFileInfo>
+     */
     public function provideData(): Iterator
     {
         return StaticFixtureFinder::yieldDirectoryExclusively(__DIR__ . '/FixturePhp74');

packages/node-type-resolver/tests/PerNodeTypeResolver/PropertyFetchTypeResolver/Php80Test.php

@@ -22,6 +22,9 @@ public function test(SmartFileInfo $smartFileInfo): void
         $this->doTestFileInfo($smartFileInfo);
     }
 
+    /**
+     * @return Iterator<mixed, SmartFileInfo>
+     */
     public function provideData(): Iterator
     {
         return StaticFixtureFinder::yieldDirectoryExclusively(__DIR__ . '/FixturePhp80');

packages/node-type-resolver/tests/PerNodeTypeResolver/PropertyFetchTypeResolver/PropertyFetchTypeResolverTest.php

@@ -18,6 +18,9 @@ public function test(SmartFileInfo $smartFileInfo): void
         $this->doTestFileInfo($smartFileInfo);
     }
 
+    /**
+     * @return Iterator<mixed, SmartFileInfo>
+     */
     public function provideData(): Iterator
     {
         return StaticFixtureFinder::yieldDirectoryExclusively(__DIR__ . '/Fixture');

rules/type-declaration/src/Rector/ClassMethod/AddArrayReturnDocTypeRector.php

@@ -10,6 +10,7 @@
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -176,6 +177,13 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($inferredReturnType instanceof GenericObjectType && $currentReturnType instanceof MixedType) {
+            $types = $inferredReturnType->getTypes();
+            if ($types[0] instanceof MixedType && $types[1] instanceof ArrayType) {
+                return null;
+            }
+        }
+
         $this->phpDocTypeChanger->changeReturnType($phpDocInfo, $inferredReturnType);
         $this->returnTagRemover->removeReturnTagIfUseless($phpDocInfo, $node);
 

rules/type-declaration/tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/Fixture/skip_some_iterator.php.inc

@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddArrayReturnDocTypeRector\Fixture;
+
+use Iterator;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class SkipSomeIterator
+{
+    public function someMethod(): Iterator
+    {
+        return self::someIterator();
+    }
+
+    /**
+     * @return \Iterator<array<int, SmartFileInfo>>
+     */
+    public static function someIterator(): Iterator
+    {
+        yield [100 => new SmartFileInfo('...')];
+    }
+}
+
+?>