Merge pull request #12 from php-etl/feature/update-contracts

Fixed phpstan errors

Author: gplanchat

.github/workflows/phpstan-5.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 6
 on: push
 jobs:
-  phpstan:
+  phpstan-6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-6.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 7
 on: push
 jobs:
-  phpstan:
+  phpstan-7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-7.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 8
 on: push
 jobs:
-  phpstan:
+  phpstan-8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-8.yaml

@@ -1,4 +1,4 @@
-name: Quality (PHPStan lvl 4)
+name: Quality (PHPStan lvl 5)
 on: push
 jobs:
     cs-fixer:
@@ -17,20 +17,19 @@ jobs:
     phpstan:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
-            -   uses: actions/cache@v3
-                with:
-                    path: '**/vendor'
-                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-composer-
-            -   uses: php-actions/composer@v6
-                with:
-                    args: --prefer-dist
-                    php_version: '8.2'
-
-            -   name: PHPStan
-                uses: php-actions/phpstan@v3
-                with:
-                    path: src/
-                    level: 4
+            - uses: actions/checkout@v3
+            - uses: actions/cache@v3
+              with:
+                  path: '**/vendor'
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-composer-
+            - uses: php-actions/composer@v6
+              with:
+                  args: --prefer-dist
+                  php_version: '8.2'
+            - name: PHPStan
+              uses: php-actions/phpstan@v3
+              with:
+                  path: src/
+                  level: 5

.github/workflows/quality.yaml

@@ -24,8 +24,12 @@
         'php_unit_construct' => true,
         'no_useless_sprintf' => true,
         'no_homoglyph_names' => true,
-        'native_function_invocation' => true,
-        'native_constant_invocation' => true,
+        'native_function_invocation' => [
+            'include' => ['@all'],
+        ],
+        'native_constant_invocation' => [
+            'include' => ['@all'],
+        ],
         'modernize_types_casting' => true,
         'logical_operators' => true,
         'is_null' => true,
@@ -35,6 +39,7 @@
         'ereg_to_preg' => true,
         'dir_constant' => true,
         'method_chaining_indentation' => false,
+        'nullable_type_declaration_for_default_null_value' => true
     ])
     ->setFinder($finder)
     ->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line

.php-cs-fixer.dist.php

@@ -75,7 +75,7 @@ public function extract(): iterable
             }
             $this->channel->ack($message);
 
-            yield new AcceptanceResultBucket(json_decode($message->content, true, 512, \JSON_THROW_ON_ERROR));
+            yield new AcceptanceResultBucket(\json_decode($message->content, true, 512, \JSON_THROW_ON_ERROR));
         }
     }
 }

src/Extractor.php

@@ -7,6 +7,7 @@
 use Bunny\Channel;
 use Bunny\Client;
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
+use Kiboko\Component\Bucket\EmptyResultBucket;
 use Kiboko\Contract\Pipeline\LoaderInterface;
 
 final readonly class Loader implements LoaderInterface
@@ -71,11 +72,12 @@ public static function withAuthentication(
 
     public function load(): \Generator
     {
-        $line = yield;
+        $line = yield new EmptyResultBucket();
 
+        // @phpstan-ignore-next-line
         while (true) {
             $this->channel->publish(
-                json_encode($line, \JSON_THROW_ON_ERROR),
+                \json_encode($line, \JSON_THROW_ON_ERROR),
                 [
                     'content-type' => 'application/json',
                 ],

src/Loader.php

@@ -29,6 +29,12 @@ public function __construct(
         );
     }
 
+    public function teardown(): void
+    {
+        $this->channel->close();
+        $this->connection->stop();
+    }
+
     public static function withoutAuthentication(
         string $stepUuid,
         string $host,
@@ -71,10 +77,10 @@ public static function withAuthentication(
         return new self($connection, stepUuid: $stepUuid, topic: $topic, exchange: $exchange);
     }
 
-    public function reject(StepCodeInterface $step, object|array $rejection, ?\Throwable $exception = null): void
+    public function reject(StepCodeInterface $step, array|object $rejection, ?\Throwable $exception = null): void
     {
         $this->channel->publish(
-            json_encode([
+            \json_encode([
                 'item' => $rejection,
                 'exception' => $exception,
                 'step' => $this->stepUuid,
@@ -87,10 +93,10 @@ public function reject(StepCodeInterface $step, object|array $rejection, ?\Throw
         );
     }
 
-    public function rejectWithReason(StepCodeInterface $step, object|array $rejection, string $reason, ?\Throwable $exception = null): void
+    public function rejectWithReason(StepCodeInterface $step, array|object $rejection, string $reason, ?\Throwable $exception = null): void
     {
         $this->channel->publish(
-            json_encode([
+            \json_encode([
                 'item' => $rejection,
                 'exception' => $exception,
                 'step' => $this->stepUuid,
@@ -113,10 +119,4 @@ public function initialize(): void
             autoDelete: true,
         );
     }
-
-    public function teardown(): void
-    {
-        $this->channel->close();
-        $this->connection->stop();
-    }
 }

src/Rejection.php

@@ -4,7 +4,6 @@
 
 namespace Kiboko\Component\Flow\RabbitMQ;
 
-use Kiboko\Contract\Pipeline\StepCodeInterface;
 use Kiboko\Contract\Pipeline\StepStateInterface;
 
 final class State implements StepStateInterface
@@ -17,8 +16,7 @@ public function __construct(
         private readonly StateManager $manager,
         private readonly string $stepCode,
         private readonly string $stepLabel,
-    ) {
-    }
+    ) {}
 
     public function accept(int $count = 1): void
     {
@@ -46,7 +44,7 @@ public function toArray(): array
         return [
             'code' => $this->stepCode,
             'label' => $this->stepLabel ?: $this->stepCode,
-            'metrics' => iterator_to_array($this->walkMetrics()),
+            'metrics' => \iterator_to_array($this->walkMetrics()),
         ];
     }