simplify

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -181,6 +181,7 @@
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
+use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
@@ -6322,10 +6323,7 @@ private function processVarAnnotation(MutatingScope $scope, array $variableNames
 
 	private function getForeachIterateeType(): Type
 	{
-		return TypeCombinator::union(
-			new ArrayType(new MixedType(), new MixedType()),
-			new ObjectType(Traversable::class),
-		);
+		return new IterableType(new MixedType(), new MixedType());
 	}
 
 	private function enterForeach(MutatingScope $scope, MutatingScope $originalScope, Foreach_ $stmt): MutatingScope

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -5816,7 +5816,7 @@ public static function dataIterable(): array
 				'$iterableWithoutTypehint[0]',
 			],
 			[
-				'array|Traversable',
+				'iterable',
 				'$iterableWithIterableTypehint',
 			],
 			[
@@ -5828,7 +5828,7 @@ public static function dataIterable(): array
 				'$mixed',
 			],
 			[
-				'array<Iterables\Bar>|(iterable<Iterables\Bar>&Traversable)',
+				'iterable<Iterables\Bar>',
 				'$iterableWithConcreteTypehint',
 			],
 			[
@@ -5844,7 +5844,7 @@ public static function dataIterable(): array
 				'$this->doBar()',
 			],
 			[
-				'array<Iterables\Baz>|(iterable<Iterables\Baz>&Traversable)',
+				'iterable<Iterables\Baz>',
 				'$this->doBaz()',
 			],
 			[

tests/PHPStan/Analyser/nsrt/bug-13270a.php

@@ -14,7 +14,7 @@ final class HelloWorld
 	public function test(array $data): void
 	{
 		foreach($data as $k => $v) {
-			assertType('non-empty-array', $data);
+			assertType('non-empty-array<mixed>', $data);
 			$data[$k]['a'] = true;
 			assertType("non-empty-array<(non-empty-array&hasOffsetValue('a', true))|(ArrayAccess&hasOffsetValue('a', true))>", $data);
 			foreach($data[$k] as $val) {

tests/PHPStan/Analyser/nsrt/bug-13312.php

@@ -35,7 +35,7 @@ function foo(array $arr): void {
 function fooBar(mixed $mixed): void {
 	assertType('mixed', $mixed);
 	foreach ($mixed as $v) {
-		assertType('array|Traversable', $mixed); // could be non-empty-array|Traversable
+		assertType('iterable', $mixed); // could be non-empty-array|Traversable
 	}
 	assertType('mixed', $mixed);
 

tests/PHPStan/Analyser/nsrt/composer-array-bug.php

@@ -18,26 +18,26 @@ public function doFoo(): void
 		if (!empty($this->config['authors'])) {
 			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
-				assertType("array|Traversable", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 
 				if (!is_array($author)) {
 					$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					continue;
 				}
-				assertType("array|Traversable", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
 					if (isset($author[$authorData]) && !is_string($author[$authorData])) {
 						$this->errors[] = 'authors.'.$key.'.'.$authorData.' : invalid value, must be a string';
 						unset($this->config['authors'][$key][$authorData]);
 					}
 				}
 				if (isset($author['homepage'])) {
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]['homepage']);
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 				}
 				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
 					unset($this->config['authors'][$key]['email']);

tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php

@@ -15,10 +15,10 @@ public function doFoo()
 		if (!empty($this->config['authors'])) {
 			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
-				assertType("array|Traversable", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 				if (!is_array($author)) {
 					unset($this->config['authors'][$key]);
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					continue;
 				}
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
@@ -33,11 +33,11 @@ public function doFoo()
 					unset($this->config['authors'][$key]['email']);
 				}
 				if (empty($this->config['authors'][$key])) {
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("array|Traversable", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 				}
-				assertType("array|Traversable", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 			}
 			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 		}