improve fetchAssoc

1 files changed, 8 insertions, 28 deletions

diff --git a/src/Reader.php b/src/Reader.php
index d01e60d..bf3e37f 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -176,11 +176,15 @@ class Reader extends AbstractCsv
      */
     public function fetchAssoc($offset_or_keys = 0, callable $callable = null)
     {
-        $keys = $this->getAssocKeys($offset_or_keys);
+        $keys       = $this->getAssocKeys($offset_or_keys);
+        $keys_count = count($keys);
+        $iterator   = $this->query($callable);
+        $iterator   = new Modifier\MapIterator($iterator, function (array $row) use ($keys, $keys_count) {
+            if ($keys_count != count($row)) {
+                $row = array_slice(array_pad($row, $keys_count, null), 0, $keys_count);
+            }
 
-        $iterator = $this->query($callable);
-        $iterator = new Modifier\MapIterator($iterator, function ($row) use ($keys) {
-            return static::combineArray($keys, $row);
+            return array_combine($keys, $row);
         });
 
         return iterator_to_array($iterator, false);
@@ -252,28 +256,4 @@ class Reader extends AbstractCsv
             return is_scalar($value) || (is_object($value) && method_exists($value, '__toString'));
         }));
     }
-
-    /**
-     * Intelligent Array Combine
-     *
-     * add or remove values from the $value array to
-     * match array $keys length before using PHP array_combine function
-     *
-     * @param array $keys
-     * @param array $value
-     *
-     * @return array
-     */
-    protected static function combineArray(array $keys, array $value)
-    {
-        $nbKeys = count($keys);
-        $diff = $nbKeys - count($value);
-        if ($diff > 0) {
-            $value = array_merge($value, array_fill(0, $diff, null));
-        } elseif ($diff < 0) {
-            $value = array_slice($value, 0, $nbKeys);
-        }
-
-        return array_combine($keys, $value);
-    }
 }