add iterable, iterable|null, array|object, array|object|null

Author: MartkCz

bin/methods.neon

@@ -16,6 +16,8 @@ types:
 		assertions: '!is_scalar($value)'
 	callable:
 		assertions: '!is_callable($value)'
+	iterable:
+		assertions: '!is_iterable($value)'
 	null:
 		assertions: '$value !== null'
 
@@ -50,6 +52,8 @@ generate:
 		- array|null
 		- object
 		- object|null
+		- array|object
+		- array|object|null
 		- string
 		- string|null
 		- int
@@ -62,6 +66,8 @@ generate:
 		- bool|null
 		- callable
 		- callable|null
+		- iterable
+		- iterable|null
 	special:
 		- scalar
 		- scalar|null

src/Mixins/ArrayTypeAssertTrait.php

@@ -30,6 +30,16 @@ public static function objectOrNull(mixed $array, int|string $key): ?object
 		return TypeAssert::objectOrNull(self::get($array, $key));
 	}
 
+	public static function arrayOrObject(mixed $array, int|string $key): array|object
+	{
+		return TypeAssert::arrayOrObject(self::get($array, $key));
+	}
+
+	public static function arrayOrObjectOrNull(mixed $array, int|string $key): array|object|null
+	{
+		return TypeAssert::arrayOrObjectOrNull(self::get($array, $key));
+	}
+
 	public static function string(mixed $array, int|string $key): string
 	{
 		return TypeAssert::string(self::get($array, $key));
@@ -90,6 +100,16 @@ public static function callableOrNull(mixed $array, int|string $key): ?callable
 		return TypeAssert::callableOrNull(self::get($array, $key));
 	}
 
+	public static function iterable(mixed $array, int|string $key): iterable
+	{
+		return TypeAssert::iterable(self::get($array, $key));
+	}
+
+	public static function iterableOrNull(mixed $array, int|string $key): ?iterable
+	{
+		return TypeAssert::iterableOrNull(self::get($array, $key));
+	}
+
 	public static function scalar(mixed $array, int|string $key): int|float|string|bool
 	{
 		return TypeAssert::scalar(self::get($array, $key));

src/Mixins/TypeAssertTrait.php

@@ -46,6 +46,24 @@ public static function objectOrNull(mixed $value): ?object
 		return $value;
 	}
 
+	public static function arrayOrObject(mixed $value): array|object
+	{
+		if (!is_array($value) && !is_object($value)) {
+			throw new AssertionFailedException(self::createErrorMessage($value, 'array|object'));
+		}
+
+		return $value;
+	}
+
+	public static function arrayOrObjectOrNull(mixed $value): array|object|null
+	{
+		if (!is_array($value) && !is_object($value) && $value !== null) {
+			throw new AssertionFailedException(self::createErrorMessage($value, 'array|object|null'));
+		}
+
+		return $value;
+	}
+
 	public static function string(mixed $value): string
 	{
 		if (!is_string($value)) {
@@ -154,6 +172,24 @@ public static function callableOrNull(mixed $value): ?callable
 		return $value;
 	}
 
+	public static function iterable(mixed $value): iterable
+	{
+		if (!is_iterable($value)) {
+			throw new AssertionFailedException(self::createErrorMessage($value, 'iterable'));
+		}
+
+		return $value;
+	}
+
+	public static function iterableOrNull(mixed $value): ?iterable
+	{
+		if (!is_iterable($value) && $value !== null) {
+			throw new AssertionFailedException(self::createErrorMessage($value, 'iterable|null'));
+		}
+
+		return $value;
+	}
+
 	public static function scalar(mixed $value): int|float|string|bool
 	{
 		if (!is_scalar($value)) {

tests/TypeAssert.test.phpt

@@ -15,7 +15,7 @@ function hasType(array $array, string $type): bool
 	return Arrays::some($array, fn (string $name) => $name === $type);
 }
 
-function type(mixed $value, bool $callable) {
+function type(mixed $value, bool $callable, bool $iterable) {
 	static $converts = [
 		'boolean' => 'bool',
 		'integer' => 'int',
@@ -32,6 +32,10 @@ function type(mixed $value, bool $callable) {
 		return 'callable';
 	}
 
+	if ($iterable && is_iterable($value)) {
+		return 'iterable';
+	}
+
 	return $converts[gettype($value)];
 }
 
@@ -50,7 +54,7 @@ function testVariants(callable $callback, string $type) {
 	$type = Type::fromString($type);
 
 	foreach ($values as $value) {
-		$valueType = type($value, hasType($type->getNames(), 'callable'));
+		$valueType = type($value, hasType($type->getNames(), 'callable'), hasType($type->getNames(), 'iterable'));
 		if (!$type->allows($valueType)) {
 			Assert::exception(fn () => $callback($value), AssertionFailedException::class);
 		} else {