fix merge conflict

thephpleague · Mar 24, 2014 · e9dd521 · e9dd521
2 parents eaf2799 + a2a0cd9
commit e9dd521
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Writer.php b/src/Writer.php
@@ -119,7 +119,9 @@ private function formatRow(array $row)
     {
         if (self::NULL_AS_EXCEPTION == $this->null_handling_mode) {
             return $row;
-        } elseif (self::NULL_AS_EMPTY == $this->null_handling_mode) {
+        }
+
+        if (self::NULL_AS_EMPTY == $this->null_handling_mode) {
             foreach ($row as &$value) {
                 if (is_null($value)) {
                     $value = '';

diff --git a/test/WriterTest.php b/test/WriterTest.php
@@ -57,6 +57,7 @@ public function testInsertNullToSkipCell()
             'john,doe,[email protected]',
             ['john', null, '[email protected]'],
         ];
+
         $this->csv->setNullHandlingMode(Writer::NULL_AS_SKIP_CELL);
         foreach ($expected as $row) {
             $this->csv->insertOne($row);