Support isNonEmptyList and isNonEmptyMap

phpstan · Feb 23, 2022 · d1c78f6 · d1c78f6
1 parent 586d049
commit d1c78f6
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,9 @@ This extension specifies types of values passed to:
 * `Assert::maxCount`
 * `Assert::countBetween`
 * `Assert::isList`
+* `Assert::isNonEmptyList`
 * `Assert::isMap`
+* `Assert::isNonEmptyMap`
 * `Assert::inArray`
 * `Assert::oneOf`
 * `Assert::methodExists`

diff --git a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php
@@ -331,6 +331,15 @@ private static function getExpressionResolvers(): array
 						)
 					);
 				},
+				'isNonEmptyList' => static function (Scope $scope, Arg $expr): Expr {
+					return new BooleanAnd(
+						self::$resolvers['isList']($scope, $expr),
+						new NotIdentical(
+							$expr->value,
+							new Array_()
+						)
+					);
+				},
 				'isMap' => static function (Scope $scope, Arg $expr): Expr {
 					return new BooleanAnd(
 						new FuncCall(
@@ -346,6 +355,15 @@ private static function getExpressionResolvers(): array
 						)
 					);
 				},
+				'isNonEmptyMap' => static function (Scope $scope, Arg $expr): Expr {
+					return new BooleanAnd(
+						self::$resolvers['isMap']($scope, $expr),
+						new NotIdentical(
+							$expr->value,
+							new Array_()
+						)
+					);
+				},
 				'isCountable' => static function (Scope $scope, Arg $expr): Expr {
 					return new BooleanOr(
 						new FuncCall(

diff --git a/tests/Type/WebMozartAssert/data/array.php b/tests/Type/WebMozartAssert/data/array.php
@@ -106,6 +106,15 @@ public function isList($a, $b): void
 		\PHPStan\Testing\assertType('array<int, mixed>|null', $b);
 	}
 
+	public function isNonEmptyList($a, $b): void
+	{
+		Assert::isNonEmptyList($a);
+		\PHPStan\Testing\assertType('non-empty-array<int, mixed>', $a);
+
+		Assert::nullOrIsNonEmptyList($b);
+		\PHPStan\Testing\assertType('non-empty-array<int, mixed>|null', $b);
+	}
+
 	public function isMap($a, $b): void
 	{
 		Assert::isMap($a);
@@ -115,4 +124,13 @@ public function isMap($a, $b): void
 		\PHPStan\Testing\assertType('array<string, mixed>|null', $b);
 	}
 
+	public function isNonEmptyMap($a, $b): void
+	{
+		Assert::isNonEmptyMap($a);
+		\PHPStan\Testing\assertType('non-empty-array<string, mixed>', $a);
+
+		Assert::nullOrIsNonEmptyMap($b);
+		\PHPStan\Testing\assertType('non-empty-array<string, mixed>|null', $b);
+	}
+
 }