Merge pull request #63 from RobinDev/master

Add default keys when keys are not set when use Reader::fetchAssoc()

2 files changed, 38 insertions, 1 deletions

diff --git a/src/Reader.php b/src/Reader.php
index 03221aa..5b9f23b 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -38,6 +38,12 @@ class Reader extends AbstractCsv
     protected $stream_filter_mode = STREAM_FILTER_READ;
 
     /**
+     * Contain the header (csv first line)
+     * @var array
+     */
+    protected $header;
+
+    /**
      * Return a Filtered Iterator
      *
      * @param callable $callable a callable function to be applied to each Iterator item
@@ -133,8 +139,12 @@ class Reader extends AbstractCsv
      *
      * @return array
      */
-    public function fetchAssoc(array $keys, callable $callable = null)
+    public function fetchAssoc(array $keys = [], callable $callable = null)
     {
+        if (empty($keys)) {
+            $keys = $this->getDefaultKeys();
+        }
+
         $validKeys = array_unique(array_filter($keys, function ($value) {
             return self::isValidString($value);
         }));
@@ -154,6 +164,24 @@ class Reader extends AbstractCsv
     }
 
     /**
+     * Get the first line and add a filter to not get it again when
+     * fetching.
+     *
+     * @return array
+     */
+    protected function getDefaultKeys()
+    {
+        if (isset($this->header)) {
+            return $this->header;
+        }
+
+        $this->header = $this->fetchOne();
+        $this->addFilter(function ($row, $index) { return $index > 0; });
+
+        return $this->header;
+    }
+
+    /**
      * Intelligent Array Combine
      *
      * add or remove values from the $value array to
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 36d4dc1..47e38fb 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -286,4 +286,13 @@ EOF;
         $csv = Reader::createFromPath(__DIR__.'/foo.csv')->newWriter('a+');
         $this->assertInstanceOf('\League\Csv\Writer', $csv);
     }
+
+    public function testFetchAssocWithoutKeys()
+    {
+        $csv = Reader::createFromPath(__DIR__.'/data/prenoms.csv');
+        $csv->setDelimiter(';');
+        $csv->setEncodingFrom("iso-8859-15");
+        $data = $csv->fetchAssoc();
+        $this->assertTrue($data[0]['prenoms'] == 'Aaron');
+    }
 }