fetchCol improved

thephpleague · Jan 28, 2014 · 020a790 · 020a790
1 parent 12787f2
commit 020a790
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/Bakame/Csv/Reader.php b/src/Bakame/Csv/Reader.php
@@ -307,17 +307,16 @@ public function fetchCol($columnIndex, callable $callable = null, $strict = fals
         }
 
         $iterator = $this->query($callable);
+        $iterator = new MapIterator($iterator, function ($row) use ($columnIndex) {
+            if (! array_key_exists($columnIndex, $row)) {
+                $row[$columnIndex] = null;
+            }
+
+            return $row;
+        });
         if ($strict) {
             $iterator = new CallbackFilterIterator($iterator, function ($row) use ($columnIndex) {
-                return array_key_exists($columnIndex, $row);
-            });
-        } else {
-            $iterator = new MapIterator($iterator, function ($row) use ($columnIndex) {
-                if (! array_key_exists($columnIndex, $row)) {
-                    $row[$columnIndex] = null;
-                }
-
-                return $row;
+                return array_key_exists($columnIndex, $row) && ! is_null($row[$columnIndex]);
             });
         }