Migrate to new Type::getArrays()

Author: herndlm

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -49,7 +49,6 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeUtils;
 use PHPStan\Type\TypeWithClassName;
 use ReflectionObject;
 use Traversable;
@@ -886,15 +885,15 @@ private function arrayOrIterable(
 	): SpecifiedTypes
 	{
 		$currentType = TypeCombinator::intersect($scope->getType($expr), new IterableType(new MixedType(), new MixedType()));
-		$arrayTypes = TypeUtils::getArrays($currentType);
+		$arrayTypes = $currentType->getArrays();
 		if (count($arrayTypes) > 0) {
 			$newArrayTypes = [];
 			foreach ($arrayTypes as $arrayType) {
 				if ($arrayType instanceof ConstantArrayType) {
 					$builder = ConstantArrayTypeBuilder::createEmpty();
 					foreach ($arrayType->getKeyTypes() as $i => $keyType) {
 						$valueType = $arrayType->getValueTypes()[$i];
-						$builder->setOffsetValueType($keyType, $typeCallback($valueType));
+						$builder->setOffsetValueType($keyType, $typeCallback($valueType), $arrayType->isOptionalKey($i));
 					}
 					$newArrayTypes[] = $builder->getArray();
 				} else {

tests/Type/WebMozartAssert/data/collection.php

@@ -98,22 +98,26 @@ public function allNotInstanceOf(array $a, array $b, array $c): void
 		assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $c);
 	}
 
-	/**
-	 * @param (int|null)[] $a
-	 */
-	public function allNotNull(array $a): void
+	public function allNotNull(array $arr): void
 	{
-		Assert::allNotNull($a);
-		assertType('array<int>', $a);
+		/** @var (int|null)[] $arr */
+		Assert::allNotNull($arr);
+		assertType('array<int>', $arr);
+
+		/** @var array{baz: float|null}|array{foo?: string|null, bar: int|null} $arr */
+		Assert::allNotNull($arr);
+		assertType('array{baz: float}|array{foo?: string, bar: int}', $arr);
 	}
 
-	/**
-	 * @param array{-1|1, -2|2, -3|3} $a
-	 */
-	public function allNotSame(array $a): void
+	public function allNotSame(array $arr): void
 	{
-		Assert::allNotSame($a, -1);
-		assertType('array{1, -2|2, -3|3}', $a);
+		/** @var array{-1|1, -2|2, -3|3} $arr */
+		Assert::allNotSame($arr, -1);
+		assertType('array{1, -2|2, -3|3}', $arr);
+
+		/** @var array{-1, -2, -3}|array{1, 2, 3} $arr */
+		Assert::allNotSame($arr, -1);
+		assertType('array{*NEVER*, -2, -3}|array{1, 2, 3}', $arr);
 	}
 
 	public function allSubclassOf(array $a, iterable $b, $c): void