Arrays: some methods accepts iterable

Author: dg

src/Utils/Arrays.php

@@ -280,7 +280,7 @@ public static function pick(array &$array, $key, $default = null)
 	 * Tests whether at least one element in the array passes the test implemented by the
 	 * provided callback with signature `function ($value, $key, array $array): bool`.
 	 */
-	public static function some(array $array, callable $callback): bool
+	public static function some(iterable $array, callable $callback): bool
 	{
 		foreach ($array as $k => $v) {
 			if ($callback($v, $k, $array)) {
@@ -295,7 +295,7 @@ public static function some(array $array, callable $callback): bool
 	 * Tests whether all elements in the array pass the test implemented by the provided function,
 	 * which has the signature `function ($value, $key, array $array): bool`.
 	 */
-	public static function every(array $array, callable $callback): bool
+	public static function every(iterable $array, callable $callback): bool
 	{
 		foreach ($array as $k => $v) {
 			if (!$callback($v, $k, $array)) {
@@ -310,7 +310,7 @@ public static function every(array $array, callable $callback): bool
 	 * Calls $callback on all elements in the array and returns the array of return values.
 	 * The callback has the signature `function ($value, $key, array $array): bool`.
 	 */
-	public static function map(array $array, callable $callback): array
+	public static function map(iterable $array, callable $callback): array
 	{
 		$res = [];
 		foreach ($array as $k => $v) {
@@ -325,7 +325,7 @@ public static function map(array $array, callable $callback): array
 	 * @param  object  $object
 	 * @return object
 	 */
-	public static function toObject(array $array, $object)
+	public static function toObject(iterable $array, $object)
 	{
 		foreach ($array as $k => $v) {
 			$object->$k = $v;

tests/Utils/Arrays.every().phpt

@@ -78,3 +78,14 @@ test('', function () {
 	Assert::true($res);
 	Assert::same([['a', 'x', $arr], ['b', 'y', $arr]], $log);
 });
+
+test('', function () {
+	$arr = new ArrayIterator(['x' => 'a', 'y' => 'b']);
+	$log = [];
+	$res = Arrays::every(
+		$arr,
+		function ($v, $k, $arr) use (&$log) { $log[] = func_get_args(); return true; }
+	);
+	Assert::true($res);
+	Assert::same([['a', 'x', $arr], ['b', 'y', $arr]], $log);
+});

tests/Utils/Arrays.map().phpt

@@ -45,3 +45,14 @@ test('', function () {
 	Assert::same(['x' => 'aa', 'y' => 'bb'], $res);
 	Assert::same([['a', 'x', $arr], ['b', 'y', $arr]], $log);
 });
+
+test('', function () {
+	$arr = new ArrayIterator(['x' => 'a', 'y' => 'b']);
+	$log = [];
+	$res = Arrays::map(
+		$arr,
+		function ($v, $k, $arr) use (&$log) { $log[] = func_get_args(); return $v . $v; }
+	);
+	Assert::same(['x' => 'aa', 'y' => 'bb'], $res);
+	Assert::same([['a', 'x', $arr], ['b', 'y', $arr]], $log);
+});

tests/Utils/Arrays.some().phpt

@@ -78,3 +78,14 @@ test('', function () {
 	Assert::true($res);
 	Assert::same([['a', 'x', $arr]], $log);
 });
+
+test('', function () {
+	$arr = new ArrayIterator(['x' => 'a', 'y' => 'b']);
+	$log = [];
+	$res = Arrays::some(
+		$arr,
+		function ($v, $k, $arr) use (&$log) { $log[] = func_get_args(); return $v === 'a'; }
+	);
+	Assert::true($res);
+	Assert::same([['a', 'x', $arr]], $log);
+});

tests/Utils/Arrays.toObject.phpt

@@ -28,3 +28,11 @@ test('', function () {
 	Assert::type(stdClass::class, $res);
 	Assert::same(['a' => 1, 'b' => 2], (array) $res);
 });
+
+test('', function () {
+	$obj = new stdClass;
+	$res = Arrays::toObject(new ArrayIterator(['a' => 1, 'b' => 2]), $obj);
+	Assert::same($res, $obj);
+	Assert::type(stdClass::class, $res);
+	Assert::same(['a' => 1, 'b' => 2], (array) $res);
+});