update package

thephpleague · May 5, 2015 · 3428566 · 3428566
1 parent f17b721
commit 3428566
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Reader.php b/src/Reader.php
@@ -164,6 +164,7 @@ public function fetchColumn($column_index = 0, callable $callable = null)
      *
      * @param array|int $offset_or_keys the name for each key member OR the row Index to be
      *                                  used as the associated named keys
+     *
      * @param callable  $callable       a callable function
      *
      * @throws \InvalidArgumentException If the submitted keys are invalid
@@ -247,7 +248,7 @@ protected function getRow($offset)
      *
      * @param array $keys
      *
-     * @return boolean
+     * @throws \InvalidArgumentException If the submitted array fails the assertion
      */
     protected function assertValidAssocKeys(array $keys)
     {

diff --git a/src/Writer.php b/src/Writer.php
@@ -140,12 +140,12 @@ public function insertOne($row)
      */
     protected function getFputcsvParameters(array $fields)
     {
-        $parameters = [$this->delimiter, $this->enclosure];
+        $parameters = [$fields, $this->delimiter, $this->enclosure];
         if (4 == static::$fputcsv_param_count) {
             $parameters[] = $this->escape;
         }
 
-        return array_merge([$fields], $parameters);
+        return $parameters;
     }
 
     /**