Updated tests + fixed PhpStan errors

php-etl · Jul 2, 2024 · 862da99 · 862da99
1 parent 5ac1548
commit 862da99
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/src/Sheet/Safe/Loader.php b/src/Sheet/Safe/Loader.php
@@ -10,6 +10,9 @@
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 use Box\Spout\Writer\WriterInterface;
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
+use Kiboko\Component\Bucket\EmptyResultBucket;
+use Kiboko\Contract\Bucket\ResultBucketInterface;
+use Kiboko\Contract\Pipeline\FlushableInterface;
 use Kiboko\Contract\Pipeline\LoaderInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -24,7 +27,7 @@ public function __construct(
 
     public function load(): \Generator
     {
-        $line = yield;
+        $line = yield new EmptyResultBucket();
         $headers = array_keys($line);
         try {
             $this->writer->addRow(
@@ -36,6 +39,7 @@ public function load(): \Generator
             return;
         }
 
+        /* @phpstan-ignore-next-line */
         while (true) {
             try {
                 $this->writer->addRow($this->orderColumns($headers, $line));

diff --git a/tests/functional/Sheet/FingersCrossed/ExcelLoaderTest.php b/tests/functional/Sheet/FingersCrossed/ExcelLoaderTest.php
@@ -74,9 +74,11 @@ public function load(): void
                     'last name' => 'dupont',
                 ],
             ],
-            new Loader($this->writer, 'Sheet1')
+            new Loader($this->writer)
         );
 
+        $this->writer->close();
+
         $this->assertRowWasWrittenToExcel(
             /* 'vfs://test.xlsx' */ $path,
             'Sheet1',

diff --git a/tests/functional/Sheet/FingersCrossed/OpenDocumentLoaderTest.php b/tests/functional/Sheet/FingersCrossed/OpenDocumentLoaderTest.php
@@ -74,9 +74,11 @@ public function load(): void
                     'last name' => 'dupont',
                 ],
             ],
-            new Loader($this->writer, 'Sheet1')
+            new Loader($this->writer)
         );
 
+        $this->writer->close();
+
         $this->assertRowWasWrittenToOpenDocument(
             /* 'vfs://test.ods' */ $path,
             'Sheet1',

diff --git a/tests/functional/Sheet/Safe/ExcelLoaderTest.php b/tests/functional/Sheet/Safe/ExcelLoaderTest.php
@@ -74,9 +74,11 @@ public function load(): void
                     'last name' => 'dupont',
                 ],
             ],
-            new Loader($this->writer, 'Sheet1')
+            new Loader($this->writer)
         );
 
+        $this->writer->close();
+
         $this->assertRowWasWrittenToExcel(
             /* 'vfs://test.xlsx' */ $path,
             'Sheet1',

diff --git a/tests/functional/Sheet/Safe/OpenDocumentLoaderTest.php b/tests/functional/Sheet/Safe/OpenDocumentLoaderTest.php
@@ -74,9 +74,11 @@ public function load(): void
                     'last name' => 'dupont',
                 ],
             ],
-            new Loader($this->writer, 'Sheet1')
+            new Loader($this->writer)
         );
 
+        $this->writer->close();
+
         $this->assertRowWasWrittenToOpenDocument(
             /* 'vfs://test.ods' */ $path,
             'Sheet1',