Fixing PHPStan level 4 issues

php-etl · Nov 14, 2023 · 2d03f6b · 2d03f6b
1 parent f5f87d2
commit 2d03f6b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -33,5 +33,5 @@ jobs:
         uses: php-actions/phpstan@v3
         with:
           path: src/
-          level: 3
+          level: 4
           php_version: '8.2'
diff --git a/composer.lock b/composer.lock
diff --git a/src/GeneratorWrapper.php b/src/GeneratorWrapper.php
@@ -11,23 +11,23 @@
  */
 class GeneratorWrapper
 {
-    /** @param \Iterator<positive-int, Type> ...$iterators */
+    /** @param \Iterator<int<0, max>, Type> ...$iterators */
     public function rewind(\Iterator ...$iterators): void
     {
         foreach ($iterators as $iterator) {
             $iterator->rewind();
         }
     }
 
-    /** @param \Iterator<positive-int, Type> ...$iterators */
+    /** @param \Iterator<int<0, max>, Type> ...$iterators */
     public function next(\Iterator ...$iterators): void
     {
         foreach ($iterators as $iterator) {
             $iterator->next();
         }
     }
 
-    /** @param \Iterator<positive-int, Type> ...$iterators */
+    /** @param \Iterator<int<0, max>, Type> ...$iterators */
     public function valid(\Iterator ...$iterators): bool
     {
         foreach ($iterators as $iterator) {
@@ -41,7 +41,7 @@ public function valid(\Iterator ...$iterators): bool
 
     /**
      * @param Type $value
-     * @param \Generator<positive-int, ResultBucketInterface<Type>, Type, void> ...$generators
+     * @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
@@ -21,7 +21,7 @@ public function __construct(private LoggerInterface $logger, private string $log
     {
     }
 
-    /** @return \Generator<positive-int, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
+    /** @return \Generator<int<0, max>, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();

diff --git a/src/Loader/StreamLoader.php b/src/Loader/StreamLoader.php
@@ -28,7 +28,7 @@ public function __construct($stream)
         $this->stream = $stream;
     }
 
-    /** @return \Generator<positive-int, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
+    /** @return \Generator<int<0, max>, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();

diff --git a/src/Pipeline.php b/src/Pipeline.php
@@ -22,9 +22,9 @@
 
 class Pipeline implements PipelineInterface, WalkableInterface, RunnableInterface
 {
-    /** @var \AppendIterator<positive-int, non-empty-array<array-key, mixed>|object, \Iterator<positive-int, non-empty-array<array-key, mixed>|object>> */
+    /** @var \AppendIterator<int<0, max>, non-empty-array<array-key, mixed>|object, \Iterator<int<0, max>, non-empty-array<array-key, mixed>|object>> */
     private readonly \AppendIterator $source;
-    /** @var \Iterator<positive-int, non-empty-array<array-key, mixed>|object>|\NoRewindIterator */
+    /** @var \Iterator<int<0, max>, non-empty-array<array-key, mixed>|object>|\NoRewindIterator */
     private iterable $subject;
 
     public function __construct(

diff --git a/src/PipelineRunner.php b/src/PipelineRunner.php
@@ -30,11 +30,11 @@ public function __construct(
      * @template InputType of non-empty-array<array-key, mixed>|object
      * @template OutputType of non-empty-array<array-key, mixed>|object
      *
-     * @param \Iterator<positive-int, InputType|null> $source
-     * @param \Generator<positive-int, ResultBucketInterface<OutputType>|AcceptanceResultBucketInterface<InputType>|RejectionResultBucketInterface<InputType>|null, InputType, void> $coroutine
+     * @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
-     * @return \Iterator<positive-int, ResultBucketInterface<OutputType>>
+     * @return \Iterator<int<0, max>, ResultBucketInterface<OutputType>>
      */
     public function run(
         \Iterator $source,

diff --git a/src/Transformer/BatchingTransformer.php b/src/Transformer/BatchingTransformer.php
@@ -19,7 +19,7 @@
  */
 class BatchingTransformer implements TransformerInterface, FlushableInterface
 {
-    /** @var array<array-key, InputType> */
+    /** @var list<InputType> */
     private array $batch = [];
 
     /**
@@ -30,7 +30,7 @@ public function __construct(
     ) {
     }
 
-    /** @return \Generator<positive-int, ResultBucketInterface<OutputType>|EmptyResultBucket, InputType|null, void> */
+    /** @return \Generator<int<0, max>, ResultBucketInterface<OutputType>|EmptyResultBucket, InputType|null, void> */
     public function transform(): \Generator
     {
         $this->batch = [];

diff --git a/src/Transformer/CallableTransformer.php b/src/Transformer/CallableTransformer.php
@@ -29,7 +29,7 @@ public function __construct(
     }
 
     /**
-     * @return \Generator<positive-int, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void>
+     * @return \Generator<int<0, max>, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void>
      */
     public function transform(): \Generator
     {

diff --git a/src/Transformer/ColumnTrimTransformer.php b/src/Transformer/ColumnTrimTransformer.php
@@ -22,7 +22,7 @@ public function __construct(
     ) {
     }
 
-    /** @return \Generator<positive-int, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void> */
+    /** @return \Generator<int<0, max>, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void> */
     public function transform(): \Generator
     {
         $line = yield new EmptyResultBucket();

diff --git a/src/Transformer/FilterTransformer.php b/src/Transformer/FilterTransformer.php
@@ -26,7 +26,7 @@ public function __construct(
     }
 
     /**
-     * @return \Generator<positive-int, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void>
+     * @return \Generator<int<0, max>, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void>
      */
     public function transform(): \Generator
     {

diff --git a/src/UnexpectedYieldedValueType.php b/src/UnexpectedYieldedValueType.php
@@ -27,7 +27,7 @@ public function getCoroutine(): \Generator
     }
 
     /**
-     * @param \Generator<positive-int, ResultBucketInterface<OutputType>, InputType, void> $actual
+     * @param \Generator<int<0, max>, ResultBucketInterface<OutputType>, InputType, void> $actual
      * @param list<string> $expectedTypes
      * @param mixed $actual
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ public function __construct( @@
         }
         /**
-         * @return \Generator<positive-int, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void>
+         * @return \Generator<int<0, max>, AcceptanceResultBucket<OutputType>|EmptyResultBucket, InputType|null, void>
          */
         public function transform(): \Generator
         {
@@ Expand Down @@