Support isMap, adapt isList to work the same

phpstan · Feb 15, 2022 · 086010d · 086010d
1 parent 4fe6508
commit 086010d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,8 @@ This extension specifies types of values passed to:
 * `Assert::minCount`
 * `Assert::maxCount`
 * `Assert::countBetween`
+* `Assert::isList`
+* `Assert::isMap`
 * `Assert::inArray`
 * `Assert::oneOf`
 * `Assert::methodExists`

diff --git a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php
@@ -314,11 +314,26 @@ private static function getExpressionResolvers(): array
 							[$expr]
 						),
 						new Identical(
-							$expr->value,
 							new FuncCall(
-								new Name('array_values'),
-								[$expr]
-							)
+								new Name('array_filter'),
+								[$expr, new Arg(new String_('is_int')), new Arg(new ConstFetch(new Name('ARRAY_FILTER_USE_KEY')))]
+							),
+							$expr->value
+						)
+					);
+				},
+				'isMap' => static function (Scope $scope, Arg $expr): Expr {
+					return new BooleanAnd(
+						new FuncCall(
+							new Name('is_array'),
+							[$expr]
+						),
+						new Identical(
+							new FuncCall(
+								new Name('array_filter'),
+								[$expr, new Arg(new String_('is_string')), new Arg(new ConstFetch(new Name('ARRAY_FILTER_USE_KEY')))]
+							),
+							$expr->value
 						)
 					);
 				},

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