Merge 984be6c into 0a1b535

thephpleague · Feb 11, 2016 · c133730 · c133730
2 parents 0a1b535 + 984be6c
commit c133730
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Modifier/RowFilter.php b/src/Modifier/RowFilter.php
@@ -160,7 +160,7 @@ public function clearValidators()
      *
      * @return array
      */
-    protected function formatRow(array $row)
+    protected function formatRow($row)
     {
         foreach ($this->formatters as $formatter) {
             $row = call_user_func($formatter, $row);

diff --git a/src/Writer.php b/src/Writer.php
@@ -62,6 +62,7 @@ protected function __construct($path, $open_mode = 'r+')
     {
         parent::__construct($path, $open_mode);
         static::initFputcsv();
+        $this->addDefaultFormatters();
     }
 
     /**
@@ -110,9 +111,6 @@ public function insertAll($rows)
      */
     public function insertOne($row)
     {
-        if (!is_array($row)) {
-            $row = str_getcsv($row, $this->delimiter, $this->enclosure, $this->escape);
-        }
         $row = $this->formatRow($row);
         $this->validateRow($row);
 
@@ -146,6 +144,24 @@ protected function getFputcsvParameters(array $fields)
         return $parameters;
     }
 
+    /**
+     * Adds default formatters.
+     *
+     * @return static
+     */
+    private function addDefaultFormatters()
+    {
+        $this->addFormatter(function ($row) {
+            if (is_array($row)) {
+                return $row;
+            }
+
+            return str_getcsv($row, $this->delimiter, $this->enclosure, $this->escape);
+        });
+
+        return $this;
+    }
+
     /**
      *  {@inheritdoc}
      */