Support remaining array count assertions

Co-authored-by: Fabien Villepinte <[email protected]>

Author: 2 people

README.md

@@ -62,6 +62,8 @@ This extension specifies types of values passed to:
 * `Assert::validArrayKey`
 * `Assert::count`
 * `Assert::minCount`
+* `Assert::maxCount`
+* `Assert::countBetween`
 * `Assert::inArray`
 * `Assert::oneOf`
 * `Assert::methodExists`

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -436,13 +436,40 @@ private static function getExpressionResolvers(): array
 						$number->value
 					);
 				},
-				'minCount' => function (Scope $scope, Arg $array, Arg $number): \PhpParser\Node\Expr {
+				'minCount' => function (Scope $scope, Arg $array, Arg $min): \PhpParser\Node\Expr {
 					return new \PhpParser\Node\Expr\BinaryOp\GreaterOrEqual(
 						new \PhpParser\Node\Expr\FuncCall(
 							new \PhpParser\Node\Name('count'),
 							[$array]
 						),
-						$number->value
+						$min->value
+					);
+				},
+				'maxCount' => function (Scope $scope, Arg $array, Arg $max): \PhpParser\Node\Expr {
+					return new \PhpParser\Node\Expr\BinaryOp\SmallerOrEqual(
+						new \PhpParser\Node\Expr\FuncCall(
+							new \PhpParser\Node\Name('count'),
+							[$array]
+						),
+						$max->value
+					);
+				},
+				'countBetween' => function (Scope $scope, Arg $array, Arg $min, Arg $max): \PhpParser\Node\Expr {
+					return new BooleanAnd(
+						new \PhpParser\Node\Expr\BinaryOp\GreaterOrEqual(
+							new \PhpParser\Node\Expr\FuncCall(
+								new \PhpParser\Node\Name('count'),
+								[$array]
+							),
+							$min->value
+						),
+						new \PhpParser\Node\Expr\BinaryOp\SmallerOrEqual(
+							new \PhpParser\Node\Expr\FuncCall(
+								new \PhpParser\Node\Name('count'),
+								[$array]
+							),
+							$max->value
+						)
 					);
 				},
 				'length' => function (Scope $scope, Arg $value, Arg $length): \PhpParser\Node\Expr {

tests/Type/WebMozartAssert/data/array.php

@@ -36,24 +36,62 @@ public function validArrayKey($a, bool $b): void
 
 	/**
 	 * @param int[] $a
+	 * @param int[] $b
 	 */
-	public function count(array $a): void
+	public function count(array $a, array $b): void
 	{
 		Assert::count($a, 1);
-		$a1 = array_pop($a);
-		$a2 = array_pop($a);
-		\PHPStan\Testing\assertType('int', $a1);
-		\PHPStan\Testing\assertType('int|null', $a2);
+		\PHPStan\Testing\assertType('non-empty-array<int>', $a);
+
+		Assert::count($b, 0);
+		\PHPStan\Testing\assertType('array{}', $b);
 	}
 
 	/**
 	 * @param int[] $a
+	 * @param int[] $b
 	 */
-	public function minCount(array $a): void
+	public function minCount(array $a, array $b): void
 	{
 		Assert::minCount($a, 1);
-		$a1 = array_pop($a);
-		\PHPStan\Testing\assertType('int', $a1);
+		\PHPStan\Testing\assertType('non-empty-array<int>', $a);
+
+		Assert::minCount($b, 0);
+		\PHPStan\Testing\assertType('array<int>', $b);
+	}
+
+	/**
+	 * @param int[] $a
+	 * @param int[] $b
+	 */
+	public function maxCount(array $a, array $b): void
+	{
+		Assert::maxCount($a, 1);
+		\PHPStan\Testing\assertType('array<int>', $a);
+
+		Assert::maxCount($b, 0);
+		\PHPStan\Testing\assertType('array{}', $b);
+	}
+
+	/**
+	 * @param int[] $a
+	 * @param int[] $b
+	 * @param int[] $c
+	 * @param int[] $d
+	 */
+	public function countBetween(array $a, array $b, array $c, array $d): void
+	{
+		Assert::countBetween($a, 1, 2);
+		\PHPStan\Testing\assertType('non-empty-array<int>', $a);
+
+		Assert::countBetween($b, 0, 2);
+		\PHPStan\Testing\assertType('array<int>', $b);
+
+		Assert::countBetween($c, 0, 0);
+		\PHPStan\Testing\assertType('array{}', $c);
+
+		Assert::countBetween($d, 2, 0);
+		\PHPStan\Testing\assertType('*NEVER*', $d);
 	}
 
 	public function isList($a): void