cleanup

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -55,15 +55,15 @@ public function processNode(Node $node, Scope $scope): array
 $constantArrays = [];
 $exprType = $scope->getType($node->expr);
 $exprConstArrays = $exprType->getConstantArrays();
-if ($exprConstArrays !== []) {
-foreach ($exprConstArrays as $constArray) {
-foreach ($constArray->getValueTypes() as $valueType) {
-foreach ($valueType->getConstantArrays() as $constValueArray) {
-$constantArrays[] = $constValueArray;
-}
+foreach ($exprConstArrays as $constArray) {
+foreach ($constArray->getValueTypes() as $valueType) {
+foreach ($valueType->getConstantArrays() as $constValueArray) {
+$constantArrays[] = $constValueArray;
 }
 }
-} else {
+}
+
+if ($constantArrays === []) {
 $constantArrays = $exprType->getIterableValueType()->getConstantArrays();
 }
 } elseif ($node instanceof Node\Expr\Yield_) {

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -21,7 +21,7 @@
 {
 $reflectionProvider = $this->createReflectionProvider();
 
 return new CompositeRule([
 new DataProviderDataRule(
 new TestMethodsHelper(
 self::getContainer()->getByType(FileTypeMapper::class),
@@ -139,24 +139,24 @@
 355,
 ],
 [
-'Unknown parameter $foo in call to method DataProviderDataTest\TestIterable::testBar().',
+'Unknown parameter $foo in call to method DataProviderDataTest\TestArrayShapeIterable::testBar().',
 371,
 ],
 [
-'Missing parameter $si (int) in call to method DataProviderDataTest\TestIterable::testBar().',
+'Missing parameter $si (int) in call to method DataProviderDataTest\TestArrayShapeIterable::testBar().',
 371,
 ],
 [
 'Parameter #1 $i of method DataProviderDataTest\TestArrayIterator::testBar() expects int, int|string given.',
-401,
+421,
 ],
 [
 'Parameter #1 $i of method DataProviderDataTest\TestArrayIterator::testFoo() expects int, int|string given.',
-401,
+421,
 ],
 [
 'Parameter #1 $s1 of method DataProviderDataTest\TestArrayIterator::testFooBar() expects string, int|string given.',
-401,
+421,
 ],
 ]);
 }

tests/Rules/PHPUnit/data/data-provider-data.php

@@ -359,7 +359,7 @@ public function aProvider(): iterable
 }
 }
 
-class TestIterable extends TestCase
+class TestArrayShapeIterable extends TestCase
 {
 /** @dataProvider aProvider */
 public function testBar(int $si): void
@@ -379,6 +379,26 @@ public function data(): iterable
 }
 }
 
+class TestTypedIterable extends TestCase
+{
+/** @dataProvider aProvider */
+public function testBar(int $si): void
+{
+}
+
+public function aProvider(): iterable
+{
+return $this->data();
+}
+
+/**
+ * @return iterable<array<int>>
+ */
+public function data(): iterable
+{
+}
+}
+
 class TestArrayIterator extends TestCase
 {
 /** @dataProvider aProvider */