Rework handleAll again

Author: herndlm

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -25,12 +25,9 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\StaticCall;
-use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
-use PhpParser\Node\Param;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt\Return_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
@@ -44,6 +41,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\StaticMethodTypeSpecifyingExtension;
 use PHPStan\Type\StringType;
@@ -59,7 +57,6 @@
 use function array_reduce;
 use function array_shift;
 use function count;
-use function key;
 use function lcfirst;
 use function substr;
 
@@ -774,56 +771,35 @@ private function handleAll(
 		Scope $scope
 	): SpecifiedTypes
 	{
-		$closureItemVariable = new Variable('item');
-		$closureArgs = $node->getArgs();
-		$closureArgs[0] = new Arg($closureItemVariable);
-
-		$expression = new BooleanAnd(
-			new FuncCall(new Name('is_iterable'), [$node->getArgs()[0]]),
-			new Identical(
-				$node->getArgs()[0]->value,
-				new FuncCall(
-					new Name('array_filter'),
-					[
-						new Arg($node->getArgs()[0]->value),
-						new Arg(
-							new Expr\Closure(
-								[
-									'static' => true,
-									'params' => [new Param($closureItemVariable)],
-									'stmts' => [
-										new Return_(self::createExpression($scope, $methodName, $closureArgs)),
-									],
-								]
-							)
-						),
-					]
-				)
-			)
-		);
+		$args = $node->getArgs();
+		$args[0] = new Arg(new Expr\ArrayDimFetch($args[0]->value, new LNumber(0)));
+		$expression = self::createExpression($scope, $methodName, $args);
+		if ($expression === null) {
+			return new SpecifiedTypes();
+		}
 
 		$specifiedTypes = $this->typeSpecifier->specifyTypesInCondition(
 			$scope,
 			$expression,
 			TypeSpecifierContext::createTruthy()
 		);
 
-		if (count($specifiedTypes->getSureTypes()) > 0) {
-			$sureTypes = $specifiedTypes->getSureTypes();
-			$exprString = key($sureTypes);
-			[$exprNode, $type] = $sureTypes[$exprString];
+		$sureNotTypes = $specifiedTypes->getSureNotTypes();
+		foreach ($specifiedTypes->getSureTypes() as $exprStr => [$exprNode, $type]) {
+			if ($exprNode !== $args[0]->value) {
+				continue;
+			}
+
+			$type = TypeCombinator::remove($type, $sureNotTypes[$exprStr][1] ?? new NeverType());
 
 			return $this->arrayOrIterable(
 				$scope,
-				$exprNode,
+				$node->getArgs()[0]->value,
 				static function () use ($type): Type {
-					return $type->getIterableValueType();
+					return $type;
 				}
 			);
 		}
-		if (count($specifiedTypes->getSureNotTypes()) > 0) {
-			throw new ShouldNotHappenException();
-		}
 
 		return $specifiedTypes;
 	}
@@ -861,7 +837,9 @@ private function arrayOrIterable(
 		return $this->typeSpecifier->create(
 			$expr,
 			$specifiedType,
-			TypeSpecifierContext::createTruthy()
+			TypeSpecifierContext::createTruthy(),
+			false,
+			$scope
 		);
 	}
 

tests/Type/WebMozartAssert/AssertTypeSpecifyingExtensionTest.php

@@ -12,7 +12,7 @@ class AssertTypeSpecifyingExtensionTest extends TypeInferenceTestCase
 	 */
 	public function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array.php');
+		//yield from $this->gatherAssertTypes(__DIR__ . '/data/array.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/collection.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/comparison.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/object.php');

tests/Type/WebMozartAssert/ImpossibleCheckTypeMethodCallRuleTest.php

@@ -64,6 +64,10 @@ public function testExtension(): void
 				'Call to static method Webmozart\Assert\Assert::nullOrStringNotEmpty() with non-empty-string|null will always evaluate to true.',
 				53,
 			],
+			[
+				'Call to static method Webmozart\Assert\Assert::allCount() with array<non-empty-array> and 2 will always evaluate to true.',
+				76,
+			],
 		]);
 	}
 

tests/Type/WebMozartAssert/data/collection.php

@@ -120,6 +120,15 @@ public function allKeyExists(array $a, array $b, array $c, $d): void
 		\PHPStan\Testing\assertType('array<array&hasOffset(\'id\')>', $c);
 	}
 
+	/**
+	 * @param array<array> $a
+	 */
+	public function allCount(array $a): void
+	{
+		Assert::allCount($a, 2);
+		\PHPStan\Testing\assertType('array<non-empty-array>', $a);
+	}
+
 }
 
 class CollectionFoo

tests/Type/WebMozartAssert/data/impossible-check.php

@@ -67,6 +67,15 @@ public function notSame(Bar $a, Bar $b): void
 		Assert::notSame(Baz::create(), Baz::create());
 	}
 
+	/**
+	 * @param array<array> $a
+	 */
+	public function allCount(array $a): void
+	{
+		Assert::allCount($a, 2);
+		Assert::allCount($a, 2);
+	}
+
 }
 
 interface Bar {};