Improved the writer Management + ran php-cs-fixer

src/CSV/FingersCrossed/Extractor.php

@@ -12,13 +12,14 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 readonly class Extractor implements ExtractorInterface
 {
     public function __construct(
         private ReaderInterface $reader,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function extract(): iterable
     {

src/CSV/FingersCrossed/Loader.php

@@ -18,12 +18,13 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 readonly class Loader implements LoaderInterface, FlushableInterface
 {
     public function __construct(
         private WriterInterface $writer,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function load(): \Generator
     {

src/CSV/Safe/Extractor.php

@@ -12,13 +12,14 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 readonly class Extractor implements ExtractorInterface
 {
     public function __construct(
         private ReaderInterface $reader,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function extract(): iterable
     {

src/CSV/Safe/Loader.php

@@ -18,12 +18,13 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 readonly class Loader implements LoaderInterface, FlushableInterface
 {
     public function __construct(
         private WriterInterface $writer,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function load(): \Generator
     {
@@ -60,7 +61,7 @@
         }
     }
 
     private function orderColumns(array $headers, array $line): Row
     {
         $result = [];
         foreach ($headers as $cell) {

src/Sheet/FingersCrossed/Extractor.php

@@ -14,14 +14,15 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 readonly class Extractor implements ExtractorInterface
 {
     public function __construct(
         private ReaderInterface $reader,
         private string $sheetName,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function extract(): iterable
     {
@@ -59,7 +60,7 @@
         }
     }
 
     public function flush(): ResultBucketInterface
     {
         $this->reader->close();
 

src/Sheet/FingersCrossed/Loader.php

@@ -12,21 +12,16 @@
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
 use Kiboko\Component\Bucket\EmptyResultBucket;
 use Kiboko\Component\Bucket\RejectionResultBucket;
-use Kiboko\Contract\Bucket\ResultBucketInterface;
-use Kiboko\Contract\Pipeline\FlushableInterface;
 use Kiboko\Contract\Pipeline\LoaderInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
-final readonly class Loader implements LoaderInterface, FlushableInterface
+final readonly class Loader implements LoaderInterface
 {
     public function __construct(
         private WriterInterface $writer,
-        private string $sheetName,
         private LoggerInterface $logger = new NullLogger()
     ) {
-        /* @phpstan-ignore-next-line */
-        $this->writer->getCurrentSheet()->setName($this->sheetName);
     }
 
     public function load(): \Generator
@@ -65,11 +60,4 @@ public function load(): \Generator
             $line = yield new AcceptanceResultBucket($line);
         }
     }
-
-    public function flush(): ResultBucketInterface
-    {
-        $this->writer->close();
-
-        return new EmptyResultBucket();
-    }
 }

src/Sheet/Safe/Extractor.php

@@ -21,7 +21,8 @@ public function __construct(
         private string $sheetName,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {}
+    ) {
+    }
 
     public function extract(): iterable
     {

src/Sheet/Safe/Loader.php

@@ -10,54 +10,37 @@
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 use Box\Spout\Writer\WriterInterface;
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
-use Kiboko\Component\Bucket\EmptyResultBucket;
-use Kiboko\Component\Bucket\RejectionResultBucket;
-use Kiboko\Contract\Bucket\ResultBucketInterface;
-use Kiboko\Contract\Pipeline\FlushableInterface;
 use Kiboko\Contract\Pipeline\LoaderInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
-final readonly class Loader implements LoaderInterface, FlushableInterface
+final readonly class Loader implements LoaderInterface
 {
     public function __construct(
         private WriterInterface $writer,
-        private string $sheetName,
         private LoggerInterface $logger = new NullLogger()
     ) {
-        /* @phpstan-ignore-next-line */
-        $this->writer->getCurrentSheet()->setName($this->sheetName);
     }
 
     public function load(): \Generator
     {
-        $line = yield new EmptyResultBucket();
+        $line = yield;
         $headers = array_keys($line);
         try {
             $this->writer->addRow(
                 new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
             );
-        } catch (IOException|WriterNotOpenedException $exception) {
+        } catch (WriterNotOpenedException|IOException $exception) {
             $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
-            $line = yield new RejectionResultBucket(
-                'Impossible to load data to the given CSV file.',
-                $exception,
-                $line
-            );
+
+            return;
         }
 
-        /* @phpstan-ignore-next-line */
         while (true) {
             try {
                 $this->writer->addRow($this->orderColumns($headers, $line));
-            } catch (IOException|WriterNotOpenedException $exception) {
+            } catch (WriterNotOpenedException|IOException $exception) {
                 $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
-                $line = yield new RejectionResultBucket(
-                    'Impossible to load data to the given CSV file.',
-                    $exception,
-                    $line
-                );
-                continue;
             }
 
             $line = yield new AcceptanceResultBucket($line);
@@ -73,11 +56,4 @@
 
         return new Row($result, null);
     }
-
-    public function flush(): ResultBucketInterface
-    {
-        $this->writer->close();
-
-        return new EmptyResultBucket();
-    }
 }