Pass column names to data writer

SAM-IT · Jan 29, 2020 · e5912a4 · e5912a4
1 parent 71531d8
commit e5912a4
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/CsvResponseFormatter.php b/src/CsvResponseFormatter.php
@@ -79,26 +79,20 @@ public function format($response): void
     }
 
 
-    private function writeData(Response $response, $handle)
+    private function writeData(Response $response, $handle, array $columns)
     {
         foreach($response->data as $row) {
 
             if ($row instanceof Arrayable) {
                 $row = $row->toArray();
             }
             $rowData = [];
-            if (isset($columns)) {
                 // Map columns.
-                foreach($columns as $column) {
-                    if (array_key_exists($column, $row)) {
-                        $rowData[] = $row[$column] ?? $this->nullValue;
-                    } else {
-                        $rowData[] = $this->missingValue;
-                    }
-                }
-            } else {
-                foreach($row as $column => $value) {
-                    $rowData[] = $value ?? $this->nullValue;
+            foreach($columns as $column) {
+                if (array_key_exists($column, $row)) {
+                    $rowData[] = $row[$column] ?? $this->nullValue;
+                } else {
+                    $rowData[] = $this->missingValue;
                 }
             }
             $this->put($handle, $rowData);