merge conflict resolved

thephpleague · Jan 13, 2014 · 43591db · 43591db
2 parents 1c449f3 + 25b264e
commit 43591db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -176,6 +176,8 @@ $data = $csv->fetchAssoc(['firstname', 'lastname', 'email'], function ($value) {
 //
 ```
 
+
+
 #### `Reader::fetchCol`
 
 This method returns an sequentials array for a given CSV column.

diff --git a/test/Bakame/Csv/ReaderTest.php b/test/Bakame/Csv/ReaderTest.php
@@ -69,15 +69,18 @@ public function testFetchAssoc()
         }
 
         $keys = ['firstname'];
+
         $res = $this->csv->fetchAssoc($keys);
         $this->assertSame([['firstname' => 'john'], ['firstname' => 'jane']], $res);
 
         $keys = ['firstname', 'lastname', 'email', 'age'];
         $res = $this->csv->fetchAssoc($keys);
+
         foreach ($res as $index => $row) {
             $this->assertCount(4, array_values($row));
             $this->assertNull($row['age']);
         }
+
         $this->csv->fetchAssoc([['firstname', 'lastname', 'email', 'age']]);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     //
     ```
     #### `Reader::fetchCol`
     This method returns an sequentials array for a given CSV column.
@@ Expand Down @@