Merge pull request #12 from php-etl/fix/update-constraints

Updated constraints (used new interfaces)
php-etl · Nov 21, 2023 · 5a61287 · 5a61287
2 parents fd1758d + c69f259
commit 5a61287
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 142 deletions.
diff --git a/.github/workflows/phpstan-6.yaml b/.github/workflows/phpstan-6.yaml
diff --git a/.github/workflows/phpstan-7.yaml b/.github/workflows/phpstan-7.yaml
diff --git a/.github/workflows/phpstan-8.yaml b/.github/workflows/phpstan-8.yaml
diff --git a/.github/workflows/phpstan-5.yaml → .github/workflows/phpstan-9.yaml b/.github/workflows/phpstan-5.yaml → .github/workflows/phpstan-9.yaml
@@ -1,4 +1,4 @@
-name: PHPStan level 5
+name: PHPStan level 9
 on: push
 jobs:
   phpstan:
@@ -19,5 +19,5 @@ jobs:
         uses: php-actions/phpstan@v3
         with:
           path: src/
-          level: 5
+          level: 9
           php_version: '8.2'
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -1,4 +1,4 @@
-name: Quality
+name: Quality (PHPSpec level 8)
 on: push
 jobs:
   cs-fixer:
@@ -34,5 +34,5 @@ jobs:
         uses: php-actions/phpstan@v3
         with:
           path: src/
-          level: 3
+          level: 8
           php_version: '8.2'
diff --git a/src/BuilderTestCase.php b/src/BuilderTestCase.php
@@ -25,6 +25,10 @@ protected function tearDown(): void
 
     protected function getBuilderCompilePath(): string
     {
+        if ($this->fs === null) {
+            throw new \RuntimeException('The virtual file system was not initialized. The '.__METHOD__.' method should be called after the '.static::class.'::setUp() method was called and after the '.static::class.'::tearDown() method is called.');
+        }
+
         return $this->fs->url();
     }
 

diff --git a/src/Constraint/Builder/BuilderProducesCodeThat.php b/src/Constraint/Builder/BuilderProducesCodeThat.php
@@ -14,7 +14,7 @@ final class BuilderProducesCodeThat extends UnaryOperator
 {
     public function __construct(
         private readonly string $builderCompilePath,
-        $constraint,
+        mixed $constraint,
     ) {
         parent::__construct($constraint);
     }

diff --git a/src/Constraint/Pipeline/IteratesLike.php b/src/Constraint/Pipeline/IteratesLike.php
@@ -37,7 +37,7 @@ private function asIterator(iterable $iterable): \Iterator
         return new \IteratorIterator($iterable);
     }
 
-    public function matches($other): bool
+    public function matches(mixed $other): bool
     {
         $both = new \MultipleIterator(\MultipleIterator::MIT_NEED_ANY);
 
@@ -54,7 +54,7 @@ public function matches($other): bool
         return !$iterator->valid();
     }
 
-    protected function failureDescription($other): string
+    protected function failureDescription(mixed $other): string
     {
         return sprintf(
             '%s iterates like %s',

diff --git a/src/Constraint/Pipeline/PipelineExtractsLike.php b/src/Constraint/Pipeline/PipelineExtractsLike.php
@@ -4,9 +4,10 @@
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
+use Kiboko\Contract\Bucket\ResultBucketInterface;
 use Kiboko\Contract\Pipeline\ExtractorInterface;
-use Kiboko\Contract\Pipeline\NullRejection;
-use Kiboko\Contract\Pipeline\NullState;
+use Kiboko\Contract\Pipeline\NullStepRejection;
+use Kiboko\Contract\Pipeline\NullStepState;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use PHPUnit\Framework\Constraint\Constraint;
 
@@ -26,9 +27,11 @@ public function __construct(
     }
 
     /**
-     * @param list<Type> $iterable
+     * @template ItemType
      *
-     * @return \Iterator<Type>
+     * @param list<ItemType> $iterable
+     *
+     * @return \Iterator<ItemType>
      */
     private function asIterator(iterable $iterable): \Iterator
     {
@@ -50,7 +53,7 @@ private function passThroughCoroutine(): \Generator
         }
     }
 
-    public function matches($other): bool
+    public function matches(mixed $other): bool
     {
         $both = new \MultipleIterator(\MultipleIterator::MIT_NEED_ANY);
 
@@ -67,8 +70,8 @@ public function matches($other): bool
         $iterator = $this->runner->run(
             $this->asIterator($extract),
             $this->passThroughCoroutine(),
-            new NullRejection(),
-            new NullState(),
+            new NullStepRejection(),
+            new NullStepState(),
         );
         $both->attachIterator($iterator);
 
@@ -82,7 +85,7 @@ public function matches($other): bool
         return !$iterator->valid();
     }
 
-    protected function failureDescription($other): string
+    protected function failureDescription(mixed $other): string
     {
         return sprintf(
             '%s pipeline extracts like %s',

diff --git a/src/Constraint/Pipeline/PipelineLoadsLike.php b/src/Constraint/Pipeline/PipelineLoadsLike.php
@@ -6,8 +6,8 @@
 
 use Kiboko\Contract\Pipeline\FlushableInterface;
 use Kiboko\Contract\Pipeline\LoaderInterface;
-use Kiboko\Contract\Pipeline\NullRejection;
-use Kiboko\Contract\Pipeline\NullState;
+use Kiboko\Contract\Pipeline\NullStepRejection;
+use Kiboko\Contract\Pipeline\NullStepState;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use PHPUnit\Framework\Constraint\Constraint;
 
@@ -47,7 +47,7 @@ private function asIterator(iterable $iterable): \Iterator
         return new \IteratorIterator($iterable);
     }
 
-    public function matches($other): bool
+    public function matches(mixed $other): bool
     {
         $both = new \MultipleIterator(\MultipleIterator::MIT_NEED_ANY);
 
@@ -67,8 +67,8 @@ public function matches($other): bool
                 $this->runner->run(
                     $this->asIterator($this->source),
                     $other->load(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
             $iterator->append(
@@ -78,16 +78,16 @@ public function matches($other): bool
                         yield;
                         yield $other->flush();
                     })(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
         } else {
             $iterator = $this->runner->run(
                 $this->asIterator($this->source),
                 $other->load(),
-                new NullRejection(),
-                new NullState(),
+                new NullStepRejection(),
+                new NullStepState(),
             );
         }
         $both->attachIterator($iterator);
@@ -102,7 +102,7 @@ public function matches($other): bool
         return !$iterator->valid();
     }
 
-    protected function failureDescription($other): string
+    protected function failureDescription(mixed $other): string
     {
         return sprintf(
             '%s pipeline loads like %s',

diff --git a/src/Constraint/Pipeline/PipelineTransformsLike.php b/src/Constraint/Pipeline/PipelineTransformsLike.php
@@ -5,8 +5,8 @@
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
 use Kiboko\Contract\Pipeline\FlushableInterface;
-use Kiboko\Contract\Pipeline\NullRejection;
-use Kiboko\Contract\Pipeline\NullState;
+use Kiboko\Contract\Pipeline\NullStepRejection;
+use Kiboko\Contract\Pipeline\NullStepState;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use Kiboko\Contract\Pipeline\TransformerInterface;
 use PHPUnit\Framework\Constraint\Constraint;
@@ -47,7 +47,7 @@ private function asIterator(iterable $iterable): \Iterator
         return new \IteratorIterator($iterable);
     }
 
-    public function matches($other): bool
+    public function matches(mixed $other): bool
     {
         $both = new \MultipleIterator(\MultipleIterator::MIT_NEED_ANY);
 
@@ -67,8 +67,8 @@ public function matches($other): bool
                 $this->runner->run(
                     $this->asIterator($this->source),
                     $other->transform(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
             $iterator->append(
@@ -78,16 +78,16 @@ public function matches($other): bool
                         yield;
                         yield $other->flush();
                     })(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
         } else {
             $iterator = $this->runner->run(
                 $this->asIterator($this->source),
                 $other->transform(),
-                new NullRejection(),
-                new NullState(),
+                new NullStepRejection(),
+                new NullStepState(),
             );
         }
         $both->attachIterator($iterator);
@@ -102,7 +102,7 @@ public function matches($other): bool
         return !$iterator->valid();
     }
 
-    protected function failureDescription($other): string
+    protected function failureDescription(mixed $other): string
     {
         return sprintf(
             '%s pipeline transforms like %s',

diff --git a/src/Constraint/Pipeline/PipelineWritesFile.php b/src/Constraint/Pipeline/PipelineWritesFile.php
@@ -6,8 +6,8 @@
 
 use Kiboko\Contract\Pipeline\FlushableInterface;
 use Kiboko\Contract\Pipeline\LoaderInterface;
-use Kiboko\Contract\Pipeline\NullRejection;
-use Kiboko\Contract\Pipeline\NullState;
+use Kiboko\Contract\Pipeline\NullStepRejection;
+use Kiboko\Contract\Pipeline\NullStepState;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\FileExists;
@@ -22,8 +22,7 @@ public function __construct(
         private readonly iterable $source,
         private readonly string $expected,
         private readonly PipelineRunnerInterface $runner,
-    ) {
-    }
+    ) {}
 
     /**
      * @param list<Type> $iterable
@@ -42,7 +41,7 @@ private function asIterator(iterable $iterable): \Iterator
         return new \IteratorIterator($iterable);
     }
 
-    public function matches($other): bool
+    public function matches(mixed $other): bool
     {
         if (!$other instanceof LoaderInterface) {
             $this->fail($other, strtr('Expected an instance of %expected%, but got %actual%.', [
@@ -58,8 +57,8 @@ public function matches($other): bool
                 $this->runner->run(
                     $this->asIterator($this->source),
                     $other->load(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
             $iterator->append(
@@ -69,28 +68,26 @@ public function matches($other): bool
                         yield;
                         yield $other->flush();
                     })(),
-                    new NullRejection(),
-                    new NullState(),
+                    new NullStepRejection(),
+                    new NullStepState(),
                 )
             );
         } else {
             $iterator = $this->runner->run(
                 $this->asIterator($this->source),
                 $other->load(),
-                new NullRejection(),
-                new NullState(),
+                new NullStepRejection(),
+                new NullStepState(),
             );
         }
 
-        iterator_count($iterator);
-
         $constraint = new FileExists();
         $constraint->evaluate($this->expected);
 
         return !$iterator->valid();
     }
 
-    protected function failureDescription($other): string
+    protected function failureDescription(mixed $other): string
     {
         return sprintf(
             '%s pipeline writes file %s',