feat: do not return same type as input iterable anymore in iterable_map() and iterable_filter()

Author: bpolaszek

src/iterable-functions.php

@@ -9,7 +9,6 @@
 use Traversable;
 
 use function array_values;
-use function is_array;
 use function iterator_to_array;
 
 /**
@@ -26,9 +25,7 @@
  */
 function iterable_map(iterable $iterable, callable $mapper): iterable
 {
-    $mapped = iterable($iterable)->map($mapper);
-
-    return is_array($iterable) ? $mapped->asArray() : $mapped;
+    return iterable($iterable)->map($mapper);
 }
 
 /**
@@ -86,9 +83,7 @@ function iterable_to_traversable(iterable $iterable): Traversable
  */
 function iterable_filter(iterable $iterable, ?callable $filter = null): iterable
 {
-    $filtered = iterable($iterable)->filter($filter);
-
-    return is_array($iterable) ? $filtered->asArray() : $filtered;
+    return iterable($iterable)->filter($filter);
 }
 
 /**
@@ -125,9 +120,7 @@ function iterable_reduce(iterable $iterable, callable $reduce, $initial = null)
  */
 function iterable_values(iterable $iterable): iterable
 {
-    $withoutKeys = iterable($iterable)->values();
-
-    return is_array($iterable) ? $withoutKeys->asArray() : $withoutKeys;
+    return iterable($iterable)->values();
 }
 
 /**

tests/IterableFilterTest.php

@@ -9,13 +9,14 @@
 
 use function assert;
 use function BenTools\IterableFunctions\iterable_filter;
+use function BenTools\IterableFunctions\iterable_to_array;
 use function it;
 use function iterator_to_array;
 use function PHPUnit\Framework\assertSame;
 
 it('filters an array', function (): void {
     $iterable = [false, true];
-    assertSame([1 => true], iterable_filter($iterable));
+    assertSame([1 => true], iterable_to_array(iterable_filter($iterable)));
 });
 
 it('filters a Traversable object', function (): void {
@@ -32,7 +33,7 @@
     static function ($input): bool {
         return $input === 'bar';
     };
-    assertSame([1 => 'bar'], iterable_filter($iterable, $filter));
+    assertSame([1 => 'bar'], iterable_to_array(iterable_filter($iterable, $filter)));
 });
 
 it('filters a Travsersable object with a callback', function (): void {

tests/IterableMapTest.php

@@ -12,23 +12,23 @@
 
 use function assert;
 use function BenTools\IterableFunctions\iterable_map;
+use function BenTools\IterableFunctions\iterable_to_array;
 use function it;
-use function iterator_to_array;
 use function PHPUnit\Framework\assertInstanceOf;
 use function PHPUnit\Framework\assertSame;
 
 it('maps an array', function (): void {
     $iterable = ['foo', 'bar'];
     $map = 'strtoupper';
-    assertSame(['FOO', 'BAR'], iterable_map($iterable, $map));
+    assertSame(['FOO', 'BAR'], iterable_to_array(iterable_map($iterable, $map)));
 });
 
 it('maps a Traversable object', function (): void {
     $iterable = SplFixedArray::fromArray(['foo', 'bar']);
     $map = 'strtoupper';
     $mapped = iterable_map($iterable, $map);
     assert($mapped instanceof Traversable);
-    assertSame(['FOO', 'BAR'], iterator_to_array($mapped));
+    assertSame(['FOO', 'BAR'], iterable_to_array($mapped));
 });
 
 it('maps iterable with object keys', function (): void {