Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

src/Type/Php/IteratorToArrayFunctionReturnTypeExtension.php

@@ -32,33 +32,28 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$traversableType = $scope->getType($arguments[0]->value);
-		$arrayKeyType = $traversableType->getIterableKeyType()->toArrayKey();
-
-		if ($arrayKeyType instanceof ErrorType) {
-			return new NeverType(true);
-		}
-
-		$isList = false;
 
 		if (isset($arguments[1])) {
 			$preserveKeysType = $scope->getType($arguments[1]->value);
 
 			if ($preserveKeysType->isFalse()->yes()) {
-				$arrayKeyType = new IntegerType();
-				$isList = true;
+				return TypeCombinator::intersect(new ArrayType(
+					new IntegerType(),
+					$traversableType->getIterableValueType(),
+				), new AccessoryArrayListType());
 			}
 		}
 
-		$arrayType = new ArrayType(
-			$arrayKeyType,
-			$traversableType->getIterableValueType(),
-		);
+		$arrayKeyType = $traversableType->getIterableKeyType()->toArrayKey();
 
-		if ($isList) {
-			$arrayType = TypeCombinator::intersect($arrayType, new AccessoryArrayListType());
+		if ($arrayKeyType instanceof ErrorType) {
+			return new NeverType(true);
 		}
 
-		return $arrayType;
+		return new ArrayType(
+			$arrayKeyType,
+			$traversableType->getIterableValueType(),
+		);
 	}
 
 }

tests/PHPStan/Analyser/nsrt/iterator_to_array.php

@@ -49,7 +49,9 @@ public function testBehaviorOnGenerators(): void
 		};
 
 		assertType('array<0|1|2|\'\', 1|2|3|4>', iterator_to_array($generator1()));
+		assertType('list<1|2|3|4>', iterator_to_array($generator1(), false));
 		assertType('array<0|1|\'\'|\'a\', 1|2|3|4>', iterator_to_array($generator2()));
+		assertType('list<1|2|3|4>', iterator_to_array($generator2(), false));
 	}
 
 	public function testOnGeneratorsWithIllegalKeysForArray(): void
@@ -60,5 +62,6 @@ public function testOnGeneratorsWithIllegalKeysForArray(): void
 		};
 
 		assertType('*NEVER*', iterator_to_array($illegalGenerator()));
+		assertType('list<\'b\'|\'c\'>', iterator_to_array($illegalGenerator(), false));
 	}
 }