Fixing PHPStan level 4 issues

php-etl · Nov 14, 2023 · f5f87d2 · f5f87d2
1 parent 141ef98
commit f5f87d2
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 84 deletions.
diff --git a/composer.json b/composer.json
@@ -19,8 +19,7 @@
         "php": "^8.2",
         "psr/log": "^3.0",
         "php-etl/bucket": "*",
-        "php-etl/pipeline-contracts": "0.5.*",
-        "php-etl/bucket-contracts": "0.2.*"
+        "php-etl/pipeline-contracts": "0.5.*"
     },
     "require-dev": {
         "phpunit/php-invoker": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Extractor/ArrayExtractor.php b/src/Extractor/ArrayExtractor.php
@@ -7,7 +7,7 @@
 use Kiboko\Contract\Pipeline\ExtractorInterface;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  * @implements ExtractorInterface<Type>
  */
 class ArrayExtractor implements ExtractorInterface

diff --git a/src/Extractor/IteratorExtractor.php b/src/Extractor/IteratorExtractor.php
@@ -7,7 +7,7 @@
 use Kiboko\Contract\Pipeline\ExtractorInterface;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  * @implements ExtractorInterface<Type>
  */
 class IteratorExtractor implements ExtractorInterface

diff --git a/src/GeneratorWrapper.php b/src/GeneratorWrapper.php
@@ -7,27 +7,27 @@
 use Kiboko\Contract\Bucket\ResultBucketInterface;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  */
 class GeneratorWrapper
 {
-    /** @param \Iterator<array-key, Type> ...$iterators */
+    /** @param \Iterator<positive-int, Type> ...$iterators */
     public function rewind(\Iterator ...$iterators): void
     {
         foreach ($iterators as $iterator) {
             $iterator->rewind();
         }
     }
 
-    /** @param \Iterator<array-key, Type> ...$iterators */
+    /** @param \Iterator<positive-int, Type> ...$iterators */
     public function next(\Iterator ...$iterators): void
     {
         foreach ($iterators as $iterator) {
             $iterator->next();
         }
     }
 
-    /** @param \Iterator<array-key, Type> ...$iterators */
+    /** @param \Iterator<positive-int, 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<array-key, ResultBucketInterface<Type>, Type, void> ...$generators
+     * @param \Generator<positive-int, ResultBucketInterface<Type>, Type, void> ...$generators
      */
     public function send($value, \Generator ...$generators): \Generator
     {

diff --git a/src/Loader/DebugLoader.php b/src/Loader/DebugLoader.php
@@ -5,7 +5,7 @@
 namespace Kiboko\Component\Pipeline\Loader;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @extends StreamLoader<Type>
  */

diff --git a/src/Loader/JSONStreamLoader.php b/src/Loader/JSONStreamLoader.php
@@ -5,7 +5,7 @@
 namespace Kiboko\Component\Pipeline\Loader;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @extends StreamLoader<Type>
  */

diff --git a/src/Loader/LogLoader.php b/src/Loader/LogLoader.php
@@ -11,7 +11,7 @@
 use Psr\Log\LogLevel;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @implements LoaderInterface<Type, Type>
  */
@@ -21,12 +21,17 @@ public function __construct(private LoggerInterface $logger, private string $log
     {
     }
 
-    /** @return \Generator<mixed, AcceptanceResultBucket<Type|null>|EmptyResultBucket, Type|null, void> */
+    /** @return \Generator<positive-int, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();
         /** @phpstan-ignore-next-line */
         while (true) {
+            if ($line === null) {
+                $line = yield new EmptyResultBucket();
+                continue;
+            }
+
             $this->logger->log($this->logLevel, var_export($line, true));
             $line = yield new AcceptanceResultBucket($line);
         }

diff --git a/src/Loader/StderrLoader.php b/src/Loader/StderrLoader.php
@@ -5,7 +5,7 @@
 namespace Kiboko\Component\Pipeline\Loader;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @extends StreamLoader<Type>
  */

diff --git a/src/Loader/StdoutLoader.php b/src/Loader/StdoutLoader.php
@@ -5,7 +5,7 @@
 namespace Kiboko\Component\Pipeline\Loader;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @extends StreamLoader<Type>
  */

diff --git a/src/Loader/StreamLoader.php b/src/Loader/StreamLoader.php
@@ -9,7 +9,7 @@
 use Kiboko\Contract\Pipeline\LoaderInterface;
 
 /**
- * @template Type
+ * @template Type of non-empty-array<array-key, mixed>|object
  *
  * @implements LoaderInterface<Type, Type>
  */
@@ -28,12 +28,17 @@ public function __construct($stream)
         $this->stream = $stream;
     }
 
-    /** @return \Generator<mixed, AcceptanceResultBucket<Type|null>|EmptyResultBucket, Type|null, void> */
+    /** @return \Generator<positive-int, AcceptanceResultBucket<Type>|EmptyResultBucket, Type|null, void> */
     public function load(): \Generator
     {
         $line = yield new EmptyResultBucket();
         /** @phpstan-ignore-next-line */
         while (true) {
+            if ($line === null) {
+                $line = yield new EmptyResultBucket();
+                continue;
+            }
+
             fwrite($this->stream, $this->formatLine($line));
             $line = yield new AcceptanceResultBucket($line);
         }