[tests] add known iterable types

rector.php

@@ -13,6 +13,7 @@
         codeQuality: true,
         codingStyle: true,
         typeDeclarations: true,
+        // typeDeclarationDocblocks: true,
         privatization: true,
         naming: true,
         instanceOf: true,

rules-tests/CodingStyle/ClassNameImport/ShortNameResolver/ShortNameResolverTest.php

@@ -37,6 +37,9 @@ public function test(string $filePath, array $expectedShortNames): void
         $this->assertSame($expectedShortNames, $shortNames);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         yield [__DIR__ . '/Fixture/various_imports.php.inc', [

rules-tests/Naming/Naming/PropertyNamingTest.php

@@ -57,6 +57,9 @@ public function testPropertyName(string $objectName, string $expectedVariableNam
         $this->assertSame($expectedVariableName, $variableName);
     }
 
+    /**
+     * @return Iterator<array<int, string>>
+     */
     public static function provideDataPropertyName(): Iterator
     {
         yield ['SomeVariable', 'someVariable'];

rules/Privatization/TypeManipulator/TypeNormalizer.php

@@ -5,6 +5,7 @@
 namespace Rector\Privatization\TypeManipulator;
 
 use PHPStan\Type\Accessory\AccessoryLiteralStringType;
+use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
@@ -57,7 +58,7 @@ public function generalizeConstantBoolTypes(Type $type): Type
     public function generalizeConstantTypes(Type $type): Type
     {
         return TypeTraverser::map($type, function (Type $type, callable $traverseCallback): Type {
-            if ($type instanceof AccessoryNonFalsyStringType || $type instanceof AccessoryLiteralStringType) {
+            if ($type instanceof AccessoryNonFalsyStringType || $type instanceof AccessoryLiteralStringType || $type instanceof AccessoryNonEmptyStringType) {
                 return new StringType();
             }
 

tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/DoctrineTest.php

@@ -26,6 +26,9 @@ public function testClass(string $docFilePath, string $className): void
         $this->assertSame($docComment, $printedPhpDocInfo);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideDataClass(): Iterator
     {
         yield [__DIR__ . '/Source/Doctrine/index_in_table.txt', IndexInTable::class];

tests/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParserTest.php

@@ -41,6 +41,9 @@ public function test(string $docContent, array $expectedArrayItemNodes): void
         $this->assertEquals($expectedArrayItemNodes, $arrayItemNodes);
     }
 
+    /**
+     * @return Iterator<array<int, (array<int, ArrayItemNode>|string)>>
+     */
     public static function provideData(): Iterator
     {
         yield ['{key: "value"}', [new ArrayItemNode(new StringNode('value'), 'key')]];

tests/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/StaticDoctrineAnnotationParserTest.php

@@ -43,6 +43,9 @@ public function test(string $docContent, CurlyListNode | array $expectedValue):
         $this->assertEquals($expectedValue, $value);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         $curlyListNode = new CurlyListNode([

tests/FileSystem/FilePathHelperTest.php

@@ -26,6 +26,9 @@ public function test(string $inputPath, string $expectedNormalizedPath): void
         $this->assertSame($expectedNormalizedPath, $normalizedPath);
     }
 
+    /**
+     * @return Iterator<array<int, string>>
+     */
     public static function provideData(): Iterator
     {
         // based on Linux

tests/Naming/ExpectedNameResolver/InflectorSingularResolverTest.php

@@ -27,6 +27,9 @@ public function testResolveForForeach(string $currentName, string $expectedSingu
         $this->assertSame($expectedSingularName, $singularValue);
     }
 
+    /**
+     * @return Iterator<array<int, string>>
+     */
     public static function provideData(): Iterator
     {
         yield ['psr4NamespacesToPaths', 'psr4NamespaceToPath'];

tests/NodeTypeResolver/PerNodeTypeResolver/ParamTypeResolver/ParamTypeResolverTest.php

@@ -25,6 +25,9 @@ public function test(string $file, int $nodePosition, string $expectedType): voi
         $this->assertSame($resolvedType::class, $expectedType);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         yield [__DIR__ . '/Source/MethodParamTypeHint.php', 0, FullyQualifiedObjectType::class];

tests/NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php

@@ -41,6 +41,9 @@ public function test(string $file, int $nodePosition, Type $expectedType): void
         $this->assertSame($expectedTypeAsString, $resolvedTypeAsString);
     }
 
+    /**
+     * @return Iterator<array<int, (int|ObjectType|UnionType|string)>>
+     */
     public static function provideData(): Iterator
     {
         yield [__DIR__ . '/Source/MethodParamDocBlock.php', 0, new ObjectType(Html::class)];

tests/NodeTypeResolver/PerNodeTypeResolver/VariableTypeResolver/VariableTypeResolverTest.php

@@ -29,6 +29,9 @@ public function test(string $file, int $nodePosition, TypeWithClassName $expecte
         $this->assertSame($expectedTypeWithClassName->getClassName(), $resolvedType->getClassName());
     }
 
+    /**
+     * @return Iterator<array<int, (int|ObjectType|string)>>
+     */
     public static function provideData(): Iterator
     {
         $anotherTypeObjectType = new ObjectType(AnotherType::class);

tests/NodeTypeResolver/StaticTypeMapper/StaticTypeMapperTest.php

@@ -44,6 +44,9 @@ public function testMapPHPStanPhpDocTypeNodeToPHPStanType(TypeNode $typeNode, st
         $this->assertInstanceOf($expectedType, $phpStanType);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         $genericTypeNode = new GenericTypeNode(new IdentifierTypeNode('Traversable'), []);
@@ -85,6 +88,9 @@ public function testMapPhpParserNodePHPStanType(Node $node, string $expectedType
         $this->assertInstanceOf($expectedType, $phpStanType);
     }
 
+    /**
+     * @return Iterator<array<int, (class-string<IterableType>|Identifier)>>
+     */
     public static function provideDataForMapPhpParserNodePHPStanType(): Iterator
     {
         yield [new Identifier('iterable'), IterableType::class];

tests/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapperTest.php

@@ -53,6 +53,9 @@ public static function provideDataWithoutKeys(): Iterator
         yield [$arrayType, 'string[]'];
     }
 
+    /**
+     * @return Iterator<array<int, (ArrayType|string)>>
+     */
     public static function provideDataUnionedWithoutKeys(): Iterator
     {
         $stringAndIntegerUnionType = new UnionType([new StringType(), new IntegerType()]);
@@ -66,6 +69,9 @@ public static function provideDataUnionedWithoutKeys(): Iterator
         yield [$evenMoreNestedUnionArrayType, 'string[][][]|int[][][]'];
     }
 
+    /**
+     * @return Iterator<array<int, (ArrayType|string)>>
+     */
     public static function provideDataWithKeys(): Iterator
     {
         $arrayMixedToStringType = new ArrayType(new MixedType(), new StringType());

tests/PhpAttribute/AnnotationToAttributeMapper/AnnotationToAttributeMapperTest.php

@@ -42,6 +42,9 @@ public function test(mixed $input, string $expectedTypeClass): void
         }
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         yield [false, ConstFetch::class];

tests/PhpAttribute/UseAliasNameMatcherTest.php

@@ -56,6 +56,9 @@ public function test(
         $this->assertSame($expectedAttributeUseImportName, $useAliasMetadata->getUseImportName());
     }
 
+    /**
+     * @return Iterator<array<int, (AnnotationToAttribute|string)>>
+     */
     public static function provideData(): Iterator
     {
         yield [

tests/PhpParser/Printer/BetterStandardPrinterTest.php

@@ -80,6 +80,9 @@ public function testYield(Node $node, string $expectedPrintedNode): void
         $this->assertSame($expectedPrintedNode, $printedNode);
     }
 
+    /**
+     * @return Iterator<array<int, (Yield_|Expression|string)>>
+     */
     public static function provideDataForYield(): Iterator
     {
         $yield = new Yield_(new String_('value'));

tests/Set/SetManager/SetManagerTest.php

@@ -37,6 +37,9 @@ public function testByVersion(string $projectDirectory, array $expectedSets): vo
         $this->assertSame($expectedSets, $composerTriggeredSets);
     }
 
+    /**
+     * @return Iterator<(array<int, array<bool>>|array<int, array<int, bool>>|array<int, array<int, string>>|array<int, string>)>
+     */
     public static function provideInstalledTwigData(): Iterator
     {
         // here we cannot used features coming up in 2.4, as we only have 2.0

tests/Skipper/FileSystem/FnMatchPathNormalizerTest.php

@@ -28,6 +28,9 @@ public function testPaths(string $path, string $expectedNormalizedPath): void
         $this->assertSame($expectedNormalizedPath, $normalizedPath);
     }
 
+    /**
+     * @return Iterator<array<int, string>>
+     */
     public static function providePaths(): Iterator
     {
         yield ['path/with/no/asterisk', 'path/with/no/asterisk'];

tests/Skipper/Skipper/SkipperTest.php

@@ -86,6 +86,9 @@ public function testSkipElementAndFilePath(string $element, string $filePath, bo
         $this->assertSame($expectedSkip, $resolvedSkip);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideCheckerAndFile(): Iterator
     {
         yield [FifthElement::class, __DIR__ . '/Fixture', true];
@@ -97,6 +100,9 @@ public static function provideCheckerAndFile(): Iterator
         yield [NotSkippedClass::class, __DIR__ . '/Fixture/someOtherFile', false];
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideDataShouldSkipElement(): Iterator
     {
         yield [ThreeMan::class, false];

tests/Util/Reflection/PrivatesAccessorTest.php

@@ -36,6 +36,9 @@ public function test(
         $this->assertSame($expectedResult, $result);
     }
 
+    /**
+     * @return Iterator<array<array<int, mixed>, mixed>>
+     */
     public static function provideData(): Iterator
     {
         yield [SomeClassWithPrivateMethods::class, 'getNumber', [], 5];

tests/Validation/RectorAssertTest.php

@@ -89,6 +89,9 @@ public function testInvalidFunctionName(string $functionName): void
         RectorAssert::functionName($functionName);
     }
 
+    /**
+     * @return Iterator<array<int, string>>
+     */
     public static function provideDataInvalidFunctionNames(): Iterator
     {
         yield ['35'];