Updated the pipeline runner used for tests

php-etl · Nov 21, 2023 · 59df091 · 59df091
1 parent c340893
commit 59df091
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 35 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/CSV/FingersCrossed/Extractor.php b/src/CSV/FingersCrossed/Extractor.php
@@ -18,8 +18,7 @@ public function __construct(
         private ReaderInterface $reader,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function extract(): iterable
     {

diff --git a/src/CSV/FingersCrossed/Loader.php b/src/CSV/FingersCrossed/Loader.php
@@ -22,8 +22,7 @@
     public function __construct(
         private WriterInterface $writer,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function load(): \Generator
     {
@@ -32,7 +31,7 @@ public function load(): \Generator
             $this->writer->addRow(
                 new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
             );
-        } catch (WriterNotOpenedException|IOException $exception) {
+        } catch (IOException|WriterNotOpenedException $exception) {
             $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
 
             return;
@@ -43,7 +42,7 @@ public function load(): \Generator
                 $this->writer->addRow(
                     new Row(array_map(fn ($value) => new Cell($value), $line), null)
                 );
-            } catch (WriterNotOpenedException|IOException $exception) {
+            } catch (IOException|WriterNotOpenedException $exception) {
                 $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
             }
 

diff --git a/src/CSV/Safe/Extractor.php b/src/CSV/Safe/Extractor.php
@@ -18,8 +18,7 @@ public function __construct(
         private ReaderInterface $reader,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function extract(): iterable
     {

diff --git a/src/CSV/Safe/Loader.php b/src/CSV/Safe/Loader.php
@@ -22,8 +22,7 @@
     public function __construct(
         private WriterInterface $writer,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function load(): \Generator
     {
@@ -33,7 +32,7 @@ public function load(): \Generator
             $this->writer->addRow(
                 new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
             );
-        } catch (WriterNotOpenedException|IOException $exception) {
+        } catch (IOException|WriterNotOpenedException $exception) {
             $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
 
             return;
@@ -42,7 +41,7 @@ public function load(): \Generator
         while (true) {
             try {
                 $this->writer->addRow($this->orderColumns($headers, $line));
-            } catch (WriterNotOpenedException|IOException $exception) {
+            } catch (IOException|WriterNotOpenedException $exception) {
                 $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
             }
 

diff --git a/src/Sheet/FingersCrossed/Extractor.php b/src/Sheet/FingersCrossed/Extractor.php
@@ -21,8 +21,7 @@ public function __construct(
         private string $sheetName,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function extract(): iterable
     {

diff --git a/src/Sheet/FingersCrossed/Loader.php b/src/Sheet/FingersCrossed/Loader.php
@@ -36,7 +36,7 @@ public function load(): \Generator
             $this->writer->addRow(
                 new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
             );
-        } catch (WriterNotOpenedException|IOException $exception) {
+        } catch (IOException|WriterNotOpenedException $exception) {
             $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
 
             return;
@@ -47,7 +47,7 @@ public function load(): \Generator
                 $this->writer->addRow(
                     new Row(array_map(fn ($value) => new Cell($value), $line), null)
                 );
-            } catch (WriterNotOpenedException|IOException $exception) {
+            } catch (IOException|WriterNotOpenedException $exception) {
                 $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
             }
 

diff --git a/src/Sheet/Safe/Extractor.php b/src/Sheet/Safe/Extractor.php
@@ -21,8 +21,7 @@ public function __construct(
         private string $sheetName,
         private int $skipLines = 0,
         private LoggerInterface $logger = new NullLogger()
-    ) {
-    }
+    ) {}
 
     public function extract(): iterable
     {

diff --git a/src/Sheet/Safe/Loader.php b/src/Sheet/Safe/Loader.php
@@ -36,7 +36,7 @@ public function load(): \Generator
             $this->writer->addRow(
                 new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
             );
-        } catch (WriterNotOpenedException|IOException $exception) {
+        } catch (IOException|WriterNotOpenedException $exception) {
             $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
 
             return;
@@ -45,7 +45,7 @@ public function load(): \Generator
         while (true) {
             try {
                 $this->writer->addRow($this->orderColumns($headers, $line));
-            } catch (WriterNotOpenedException|IOException $exception) {
+            } catch (IOException|WriterNotOpenedException $exception) {
                 $this->logger->error('Impossible to load data to the given CSV file.', ['line' => $line, 'message' => $exception->getMessage(), 'previous' => $exception->getPrevious()]);
             }
 

diff --git a/tests/functional/PipelineRunner.php b/tests/functional/PipelineRunner.php
@@ -7,20 +7,18 @@
 use Kiboko\Contract\Bucket\AcceptanceResultBucketInterface;
 use Kiboko\Contract\Bucket\RejectionResultBucketInterface;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
-use Kiboko\Contract\Pipeline\RejectionInterface;
-use Kiboko\Contract\Pipeline\StateInterface;
+use Kiboko\Contract\Pipeline\StepRejectionInterface;
+use Kiboko\Contract\Pipeline\StepStateInterface;
 
 final class PipelineRunner implements PipelineRunnerInterface
 {
     public function run(
         \Iterator $source,
         \Generator $async,
-        RejectionInterface $rejection,
-        StateInterface $state,
-    ): \Iterator {
-        $state->initialize();
-        $rejection->initialize();
-
+        StepRejectionInterface $rejection,
+        StepStateInterface $state,
+    ): \Iterator
+    {
         $source->rewind();
         $async->rewind();
 
@@ -40,8 +38,5 @@ public function run(
 
             $source->next();
         }
-
-        $rejection->teardown();
-        $state->teardown();
     }
 }