Migrate to new Type::getArrays()

Author: herndlm

src/Type/BeberleiAssert/AssertHelper.php

@@ -28,7 +28,6 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeUtils;
 use ReflectionObject;
 use function array_key_exists;
 use function count;
@@ -177,15 +176,15 @@ private static 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/BeberleiAssert/data/data.php

@@ -83,6 +83,11 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		Assertion::allNotNull($w);
 		\PHPStan\Testing\assertType('array<int>', $w);
 
+		/** @var array{baz: float|null}|array{foo?: string|null, bar: int|null} $w */
+		$w = doFoo();
+		Assertion::allNotNull($w);
+		\PHPStan\Testing\assertType('array{baz: float}|array{foo?: string, bar: int}', $w);
+
 		Assertion::same($x, 1);
 		\PHPStan\Testing\assertType('1', $x);