Improve all* handling

Author: herndlm

src/Type/BeberleiAssert/AssertHelper.php

@@ -24,6 +24,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -104,7 +105,7 @@ public static function handleAll(
 			reset($sureTypes);
 			$exprString = key($sureTypes);
 			$sureType = $sureTypes[$exprString];
-			return self::arrayOrIterable($typeSpecifier, $scope, $sureType[0], static function () use ($sureType): Type {
+			return self::allArrayOrIterable($typeSpecifier, $scope, $sureType[0], static function () use ($sureType): Type {
 				return $sureType[1];
 			});
 		}
@@ -126,7 +127,7 @@ public static function handleAllNot(
 	): SpecifiedTypes
 	{
 		if ($assertName === 'notNull') {
-			return self::arrayOrIterable(
+			return self::allArrayOrIterable(
 				$typeSpecifier,
 				$scope,
 				$args[0]->value,
@@ -143,7 +144,7 @@ static function (Type $type): Type {
 			}
 
 			$objectType = new ObjectType($classType->getValue());
-			return self::arrayOrIterable(
+			return self::allArrayOrIterable(
 				$typeSpecifier,
 				$scope,
 				$args[0]->value,
@@ -155,7 +156,7 @@ static function (Type $type) use ($objectType): Type {
 
 		if ($assertName === 'notSame') {
 			$valueType = $scope->getType($args[1]->value);
-			return self::arrayOrIterable(
+			return self::allArrayOrIterable(
 				$typeSpecifier,
 				$scope,
 				$args[0]->value,
@@ -168,7 +169,7 @@ static function (Type $type) use ($valueType): Type {
 		throw new ShouldNotHappenException();
 	}
 
-	private static function arrayOrIterable(
+	private static function allArrayOrIterable(
 		TypeSpecifier $typeSpecifier,
 		Scope $scope,
 		Expr $expr,
@@ -183,18 +184,30 @@ private static function arrayOrIterable(
 				if ($arrayType instanceof ConstantArrayType) {
 					$builder = ConstantArrayTypeBuilder::createEmpty();
 					foreach ($arrayType->getKeyTypes() as $i => $keyType) {
-						$valueType = $arrayType->getValueTypes()[$i];
-						$builder->setOffsetValueType($keyType, $typeCallback($valueType), $arrayType->isOptionalKey($i));
+						$valueType = $typeCallback($arrayType->getValueTypes()[$i]);
+						if ($valueType instanceof NeverType) {
+							continue 2;
+						}
+						$builder->setOffsetValueType($keyType, $valueType, $arrayType->isOptionalKey($i));
 					}
 					$newArrayTypes[] = $builder->getArray();
 				} else {
-					$newArrayTypes[] = new ArrayType($arrayType->getKeyType(), $typeCallback($arrayType->getItemType()));
+					$itemType = $typeCallback($arrayType->getItemType());
+					if ($itemType instanceof NeverType) {
+						continue;
+					}
+					$newArrayTypes[] = new ArrayType($arrayType->getKeyType(), $itemType);
 				}
 			}
 
 			$specifiedType = TypeCombinator::union(...$newArrayTypes);
 		} elseif ((new IterableType(new MixedType(), new MixedType()))->isSuperTypeOf($currentType)->yes()) {
-			$specifiedType = new IterableType($currentType->getIterableKeyType(), $typeCallback($currentType->getIterableValueType()));
+			$itemType = $typeCallback($currentType->getIterableValueType());
+			if ($itemType instanceof NeverType) {
+				$specifiedType = $itemType;
+			} else {
+				$specifiedType = new IterableType($currentType->getIterableKeyType(), $itemType);
+			}
 		} else {
 			return new SpecifiedTypes([], []);
 		}

tests/Type/BeberleiAssert/data/data.php

@@ -83,6 +83,16 @@ 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 null[] $w */
+		$w = doFoo();
+		Assertion::allNotNull($w);
+		\PHPStan\Testing\assertType('*NEVER*', $w);
+
+		/** @var iterable<null> $w */
+		$w = doFoo();
+		Assertion::allNotNull($w);
+		\PHPStan\Testing\assertType('*NEVER*', $w);
+
 		/** @var array{baz: float|null}|array{foo?: string|null, bar: int|null} $w */
 		$w = doFoo();
 		Assertion::allNotNull($w);
@@ -106,7 +116,11 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 			$z = [-1, -2, -3];
 		}
 		Assertion::allNotSame($z, -1);
-		\PHPStan\Testing\assertType('array{*NEVER*, -2, -3}|array{1, 2, 3}', $z);
+		\PHPStan\Testing\assertType('array{1, 2, 3}', $z);
+
+		$z = [-1, -2, -3];
+		Assertion::allNotSame($z, -1);
+		\PHPStan\Testing\assertType('*NEVER*', $z);
 
 		Assertion::subclassOf($aa, self::class);
 		\PHPStan\Testing\assertType('class-string<PHPStan\Type\BeberleiAssert\Foo>|PHPStan\Type\BeberleiAssert\Foo', $aa);