Simplify with iterable, fix test

Author: spawnia

src/CSVArray.php

@@ -46,17 +46,13 @@ public static function toArray(string $csv, string $delimiter = ';', string $enc
         return $result;
     }
 
-    /** @param array<array<string, CSVPrimitive>> $data */
-    public static function toCSV(array $data, string $delimiter = ';', string $lineSeparator = "\r\n"): string
+    /** @param iterable<array<string, CSVPrimitive>> $data */
+    public static function toCSV(iterable $data, string $delimiter = ';', string $lineSeparator = "\r\n"): string
     {
-        if ($data === []) {
-            throw new \Exception('Array is empty');
-        }
-
         // Use the keys of the array as the headers of the CSV
         $headerItem = Arr::first($data);
-        if (! is_array($headerItem)) {
-            throw new \Exception('Missing column headers.');
+        if ($headerItem === null) {
+            throw new \Exception('Missing data.');
         }
         $headerKeys = array_keys($headerItem);
 

src/LightcyclerSampleSheet/AbsoluteQuantificationSheet.php

@@ -12,13 +12,10 @@ public function generate(Collection $samples): string
     {
         $replicationMapping = $this->calculateReplicationMapping($samples);
 
-        $data = $samples
-            ->map(fn (AbsoluteQuantificationSample $well, string $coordinateFromKey): array => $well->toSerializableArray(
-                $coordinateFromKey,
-                $replicationMapping[$coordinateFromKey]
-            ))
-            ->values()
-            ->all();
+        $data = $samples->map(fn (AbsoluteQuantificationSample $well, string $coordinateFromKey): array => $well->toSerializableArray(
+            $coordinateFromKey,
+            $replicationMapping[$coordinateFromKey]
+        ));
 
         return CSVArray::toCSV($data, "\t");
     }

tests/LightcyclerSampleSheet/AbsoluteQuantificationSheetTest.php

@@ -31,19 +31,19 @@ public function testGenerateWithFakeData(): void
         $result = $sheet->generate($samples);
 
         $expected = <<<EOT
-"General:Pos"\t"General:Sample Name"\t"General:Repl. Of"\t"General:Filt. Comb."\t"Sample Preferences:Color"\t"Abs Quant:Sample Type"\t"Abs Quant:Concentration"
-A1\t"Standard_1"\tA1\t485-520\t$00FF0000\t"Standard"\t1.00E3
-B1\t"Standard_1"\tA1\t485-520\t$00FF0001\t"Standard"\t1.00E3
-C1\t"Standard_2"\tC1\t485-520\t$0000FF00\t"Standard"\t1.00E2
-D1\t"Standard_2"\tC1\t485-520\t$0000FF01\t"Standard"\t1.00E2
-E1\t"Sample_001"\tE1\t485-520\t$000000FF\t"Unknown"\t
-F1\t"Sample_001"\tE1\t485-520\t$000000FE\t"Unknown"\t
-G1\t"Sample_002"\tG1\t485-520\t$00FFFF00\t"Unknown"\t
-H1\t"Sample_002"\tG1\t485-520\t$00FFFF01\t"Unknown"\t
-A2\t"NTC"\tA2\t485-520\t$00000000\t"Negative Control"\t
-B2\t"NTC"\tA2\t485-520\t$00000001\t"Negative Control"\t
-C2\t"Standard_1"\tC2\t485-520\t$00FF0000\t"Standard"\t1.00E3
-D2\t"Standard_1"\tC2\t485-520\t$00FF0001\t"Standard"\t1.00E3
+General:Pos\t"General:Sample Name"\t"General:Repl. Of"\t"General:Filt. Comb."\t"Sample Preferences:Color"\t"Abs Quant:Sample Type"\t"Abs Quant:Concentration"
+A1\tStandard_1\tA1\t485-520\t$00FF0000\tStandard\t1.00E3
+B1\tStandard_1\tA1\t485-520\t$00FF0001\tStandard\t1.00E3
+C1\tStandard_2\tC1\t485-520\t$0000FF00\tStandard\t1.00E2
+D1\tStandard_2\tC1\t485-520\t$0000FF01\tStandard\t1.00E2
+E1\tSample_001\tE1\t485-520\t$000000FF\tUnknown\t
+F1\tSample_001\tE1\t485-520\t$000000FE\tUnknown\t
+G1\tSample_002\tG1\t485-520\t$00FFFF00\tUnknown\t
+H1\tSample_002\tG1\t485-520\t$00FFFF01\tUnknown\t
+A2\tNTC\tA2\t485-520\t$00000000\t"Negative Control"\t
+B2\tNTC\tA2\t485-520\t$00000001\t"Negative Control"\t
+C2\tStandard_1\tC2\t485-520\t$00FF0000\tStandard\t1.00E3
+D2\tStandard_1\tC2\t485-520\t$00FF0001\tStandard\t1.00E3
 
 EOT;