CS Fixing classes

php-etl · Nov 14, 2023 · e61319b · e61319b
1 parent d1e6ba2
commit e61319b
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 55 deletions.
diff --git a/src/Extractor/ArrayExtractor.php b/src/Extractor/ArrayExtractor.php
@@ -8,14 +8,13 @@
 
 /**
  * @template Type of non-empty-array<array-key, mixed>|object
+ *
  * @implements ExtractorInterface<Type>
  */
 class ArrayExtractor implements ExtractorInterface
 {
     /** @param non-empty-array<array-key, Type> $data */
-    public function __construct(private readonly array $data)
-    {
-    }
+    public function __construct(private readonly array $data) {}
 
     /**
      * @return \Generator

diff --git a/src/Extractor/IteratorExtractor.php b/src/Extractor/IteratorExtractor.php
@@ -8,14 +8,13 @@
 
 /**
  * @template Type of non-empty-array<array-key, mixed>|object
+ *
  * @implements ExtractorInterface<Type>
  */
 class IteratorExtractor implements ExtractorInterface
 {
     /** @param \Traversable<mixed, Type> $traversable */
-    public function __construct(private readonly \Traversable $traversable)
-    {
-    }
+    public function __construct(private readonly \Traversable $traversable) {}
 
     /**
      * @return \Generator

diff --git a/src/GeneratorWrapper.php b/src/GeneratorWrapper.php
@@ -40,7 +40,7 @@ public function valid(\Iterator ...$iterators): bool
     }
 
     /**
-     * @param Type $value
+     * @param Type                                                             $value
      * @param \Generator<int<0, max>, ResultBucketInterface<Type>, Type, void> ...$generators
      */
     public function send($value, \Generator ...$generators): \Generator

diff --git a/src/Loader/LogLoader.php b/src/Loader/LogLoader.php
@@ -17,17 +17,15 @@
  */
 final readonly class LogLoader implements LoaderInterface
 {
-    public function __construct(private LoggerInterface $logger, private string $logLevel = LogLevel::DEBUG)
-    {
-    }
+    public function __construct(private LoggerInterface $logger, private string $logLevel = LogLevel::DEBUG) {}
 
     /** @return \Generator<int<0, max>, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
-            if ($line === null) {
+            if (null === $line) {
                 $line = yield new EmptyResultBucket();
                 continue;
             }

diff --git a/src/Loader/StreamLoader.php b/src/Loader/StreamLoader.php
@@ -32,9 +32,9 @@ public function __construct($stream)
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
-            if ($line === null) {
+            if (null === $line) {
                 $line = yield new EmptyResultBucket();
                 continue;
             }
@@ -46,7 +46,6 @@ public function load(): \Generator
 
     /**
      * @param Type|null $line
-     * @return string
      */
     abstract protected function formatLine(mixed $line): string;
 }
diff --git a/src/Pipeline.php b/src/Pipeline.php
@@ -30,7 +30,7 @@ class Pipeline implements PipelineInterface, WalkableInterface, RunnableInterfac
     public function __construct(
         private readonly PipelineRunnerInterface $runner,
         private readonly StateInterface $state,
-        ?\Iterator $source = null
+        \Iterator $source = null
     ) {
         $this->source = new \AppendIterator();
         $this->source->append($source ?? new \EmptyIterator());
@@ -42,7 +42,6 @@ public function __construct(
      * @template InputType of non-empty-array<array-key, mixed>|object
      *
      * @param InputType ...$data
-     * @return void
      */
     public function feed(...$data): void
     {
@@ -52,7 +51,7 @@ public function feed(...$data): void
     private function passThroughCoroutine(): \Generator
     {
         $line = yield;
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
             $line = yield $line;
         }
@@ -61,7 +60,7 @@ private function passThroughCoroutine(): \Generator
     /**
      * @template Type of non-empty-array<array-key, mixed>|object
      *
-     * @param ExtractorInterface<Type> $extractor
+     * @param ExtractorInterface<Type>     $extractor
      * @param StepRejectionInterface<Type> $rejection
      */
     public function extract(
@@ -110,7 +109,7 @@ public function extract(
      * @template OutputType of non-empty-array<array-key, mixed>|object
      *
      * @param TransformerInterface<InputType, OutputType> $transformer
-     * @param StepRejectionInterface<InputType> $rejection
+     * @param StepRejectionInterface<InputType>           $rejection
      */
     public function transform(
         StepCodeInterface $stepCode,
@@ -159,7 +158,7 @@ public function transform(
      * @template OutputType of non-empty-array<array-key, mixed>|object
      *
      * @param LoaderInterface<InputType, OutputType> $loader
-     * @param StepRejectionInterface<InputType> $rejection
+     * @param StepRejectionInterface<InputType>      $rejection
      */
     public function load(
         StepCodeInterface $stepCode,

diff --git a/src/PipelineRunner.php b/src/PipelineRunner.php
@@ -4,14 +4,10 @@
 
 namespace Kiboko\Component\Pipeline;
 
-use Kiboko\Component\Bucket\RejectionResultBucket;
-use Kiboko\Component\Bucket\RejectionWithReasonResultBucket;
 use Kiboko\Contract\Bucket\AcceptanceResultBucketInterface;
 use Kiboko\Contract\Bucket\RejectionResultBucketInterface;
 use Kiboko\Contract\Bucket\ResultBucketInterface;
 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;
 use Psr\Log\LoggerInterface;
@@ -23,17 +19,16 @@ class PipelineRunner implements PipelineRunnerInterface
     public function __construct(
         private readonly LoggerInterface $logger = new NullLogger(),
         private readonly LogLevel|string $rejectionLevel = LogLevel::WARNING
-    ) {
-    }
+    ) {}
 
     /**
      * @template InputType of non-empty-array<array-key, mixed>|object
      * @template OutputType of non-empty-array<array-key, mixed>|object
      *
-     * @param \Iterator<int<0, max>, InputType|null> $source
+     * @param \Iterator<int<0, max>, InputType|null>                                                                                                                                $source
      * @param \Generator<int<0, max>, ResultBucketInterface<OutputType>|AcceptanceResultBucketInterface<InputType>|RejectionResultBucketInterface<InputType>|null, InputType, void> $coroutine
-     * @param StepRejectionInterface<InputType> $rejection
-     * @param StepStateInterface $state
+     * @param StepRejectionInterface<InputType>                                                                                                                                     $rejection
+     *
      * @return \Iterator<int<0, max>, ResultBucketInterface<OutputType>>
      */
     public function run(
@@ -59,8 +54,8 @@ public function run(
             if ($bucket instanceof RejectionResultBucketInterface) {
                 $reasons = $bucket->reasons();
                 foreach ($bucket->walkRejection() as $line) {
-                    if ($reasons !== null) {
-                        $rejection->rejectWithReason($line, implode(PHP_EOL, $reasons));
+                    if (null !== $reasons) {
+                        $rejection->rejectWithReason($line, implode(\PHP_EOL, $reasons));
                     } else {
                         $rejection->reject($line);
                     }

diff --git a/src/StepCode.php b/src/StepCode.php
@@ -10,8 +10,7 @@
 {
     private function __construct(
         private string $reference,
-    ) {
-    }
+    ) {}
 
     public static function fromString(string $reference): self
     {

diff --git a/src/Transformer/BatchingTransformer.php b/src/Transformer/BatchingTransformer.php
@@ -27,24 +27,23 @@ class BatchingTransformer implements TransformerInterface, FlushableInterface
      */
     public function __construct(
         private readonly int $batchSize
-    ) {
-    }
+    ) {}
 
     /** @return \Generator<int<0, max>, ResultBucketInterface<OutputType>|EmptyResultBucket, InputType|null, void> */
     public function transform(): \Generator
     {
         $this->batch = [];
 
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
-            if ($line === null) {
+            if (null === $line) {
                 $line = yield new EmptyResultBucket();
                 continue;
             }
             $this->batch[] = $line;
 
-            if (count($this->batch) >= $this->batchSize) {
+            if (\count($this->batch) >= $this->batchSize) {
                 /** @phpstan-ignore-next-line */
                 $line = yield new AcceptanceResultBucket($this->batch);
                 $this->batch = [];
@@ -58,10 +57,11 @@ public function transform(): \Generator
     /** @return AcceptanceResultBucket<OutputType>|EmptyResultBucket */
     public function flush(): ResultBucketInterface
     {
-        if (count($this->batch) <= 0) {
+        if (\count($this->batch) <= 0) {
             return new EmptyResultBucket();
         }
-        /** @phpstan-ignore-next-line */
+
+        /* @phpstan-ignore-next-line */
         return new AcceptanceResultBucket($this->batch);
     }
 }
diff --git a/src/Transformer/CallableTransformer.php b/src/Transformer/CallableTransformer.php
@@ -16,7 +16,7 @@
  */
 class CallableTransformer implements TransformerInterface
 {
-    /** @var callable(InputType|null $item): OutputType */
+    /** @var callable(InputType|null): OutputType */
     private $callback;
 
     /**
@@ -36,9 +36,9 @@ public function transform(): \Generator
         $callback = $this->callback;
 
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
-            if ($line === null) {
+            if (null === $line) {
                 $line = yield new EmptyResultBucket();
                 continue;
             }

diff --git a/src/Transformer/ColumnTrimTransformer.php b/src/Transformer/ColumnTrimTransformer.php
@@ -19,14 +19,13 @@ class ColumnTrimTransformer implements TransformerInterface
     /** @param list<string> $columnsToTrim */
     public function __construct(
         private readonly array $columnsToTrim
-    ) {
-    }
+    ) {}
 
     /** @return \Generator<int<0, max>, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void> */
     public function transform(): \Generator
     {
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
             if (null === $line) {
                 $line = yield new EmptyResultBucket();

diff --git a/src/Transformer/FilterTransformer.php b/src/Transformer/FilterTransformer.php
@@ -15,7 +15,7 @@
  */
 class FilterTransformer implements TransformerInterface
 {
-    /** @var callable(Type $item): bool */
+    /** @var callable(Type): bool */
     private $callback;
 
     /** @param callable(Type $item): bool $callback */
@@ -33,7 +33,7 @@ public function transform(): \Generator
         $callback = $this->callback;
 
         $line = yield new EmptyResultBucket();
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         while (true) {
             if (null === $line || !$callback($line)) {
                 $line = yield new EmptyResultBucket();

diff --git a/src/UnexpectedYieldedValueType.php b/src/UnexpectedYieldedValueType.php
@@ -16,7 +16,7 @@ public function __construct(
         private readonly \Generator $coroutine,
         string $message = '',
         int $code = 0,
-        ?\Throwable $previous = null
+        \Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }
@@ -28,12 +28,11 @@ public function getCoroutine(): \Generator
 
     /**
      * @param \Generator<int<0, max>, ResultBucketInterface<OutputType>, InputType, void> $actual
-     * @param list<string> $expectedTypes
-     * @param mixed $actual
+     * @param list<string>                                                                $expectedTypes
      *
      * @return UnexpectedYieldedValueType<InputType, OutputType>
      */
-    public static function expectingTypes(\Generator $coroutine, array $expectedTypes, $actual, int $code = 0, ?\Throwable $previous = null): self
+    public static function expectingTypes(\Generator $coroutine, array $expectedTypes, $actual, int $code = 0, \Throwable $previous = null): self
     {
         try {
             $re = new \ReflectionGenerator($coroutine);
@@ -48,7 +47,7 @@ public static function expectingTypes(\Generator $coroutine, array $expectedType
             $executionFile = $re->getExecutingFile();
             $executionLine = $re->getExecutingLine();
 
-            /** @phpstan-ignore-next-line */
+            /* @phpstan-ignore-next-line */
             return new self(
                 $coroutine,
                 strtr(
@@ -65,7 +64,7 @@ public static function expectingTypes(\Generator $coroutine, array $expectedType
                 $previous
             );
         } catch (\ReflectionException) {
-            /** @phpstan-ignore-next-line */
+            /* @phpstan-ignore-next-line */
             return new self(
                 $coroutine,
                 strtr(