Merge pull request #2 from simPod/use_keys

Add `use_keys` for `iterable_to_array()`

Author: bpolaszek

src/iterable-functions.php

@@ -27,12 +27,13 @@ function is_iterable($iterable)
     /**
      * Copy the iterable into an array. If the iterable is already an array, return it.
      *
-     * @param  array|\Traversable $iterable
+     * @param  iterable $iterable
+     * @param  bool $use_keys [optional] Whether to use the iterator element keys as index.
      * @return array
      */
-    function iterable_to_array($iterable)
+    function iterable_to_array($iterable, $use_keys = true)
     {
-        return is_array($iterable) ? $iterable : iterator_to_array($iterable);
+        return is_array($iterable) ? ($use_keys ? $iterable : array_values($iterable)) : iterator_to_array($iterable, $use_keys);
     }
 }
 

tests/TestIterableToArray.php

@@ -16,12 +16,24 @@ public function testIteratorToArray()
         $this->assertEquals(array('foo', 'bar'), iterable_to_array($iterator));
     }
 
+    public function testIteratorWithoutKeysToArray()
+    {
+        $iterator = new ArrayIterator(array(1 => 'foo', 2 => 'bar'));
+        $this->assertEquals(array(0 => 'foo', 1 => 'bar'), iterable_to_array($iterator, false));
+    }
+
     public function testArrayToArray()
     {
         $array = array('foo', 'bar');
         $this->assertEquals(array('foo', 'bar'), iterable_to_array($array));
     }
 
+    public function testArrayWithoutKeysToArray()
+    {
+        $array = array(1 => 'foo', 2 => 'bar');
+        $this->assertEquals(array(0 => 'foo', 1 => 'bar'), iterable_to_array($array, false));
+    }
+
     public function testScalarToArray()
     {
         $scalar = 'foobar';