Merge pull request #7 from php-etl/fix-ci-and-tests

gplanchat · web-flow · commit 8e479843cab7 · 2022-06-17T11:57:00.000+02:00
update ci, fix tests
diff --git a/.github/workflows/infection.yaml b/.github/workflows/infection.yaml
@@ -7,7 +7,7 @@ jobs:
             -   uses: actions/checkout@v2
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.0'
+                    php-version: '8.1'
                     tools: composer:v2
                     coverage: pcov
             -   uses: actions/cache@v2
@@ -19,12 +19,12 @@ jobs:
             -   uses: php-actions/composer@v5
                 with:
                     args: --prefer-dist
-                    php_version: 8.0
+                    php_version: 8.1
 
             -   name: Infection
                 run: |
-                    wget -q https://github.com/infection/infection/releases/download/0.20.0/infection.phar
-                    wget -q https://github.com/infection/infection/releases/download/0.20.0/infection.phar.asc
+                    wget -q https://github.com/infection/infection/releases/download/0.26.10/infection.phar
+                    wget -q https://github.com/infection/infection/releases/download/0.26.10/infection.phar.asc
                     chmod +x infection.phar
                     ./infection.phar
 
diff --git a/.github/workflows/phpstan-5.yaml b/.github/workflows/phpstan-5.yaml
@@ -14,10 +14,10 @@ jobs:
       - uses: php-actions/composer@v5
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: 8.1
       - name: PHPStan
         uses: php-actions/phpstan@v2
         with:
           path: src/
-          level: 5
-          php_version: 8.0
+          args: --level=5
+          php_version: 8.1
diff --git a/.github/workflows/phpstan-7.yaml b/.github/workflows/phpstan-7.yaml
@@ -14,10 +14,10 @@ jobs:
       - uses: php-actions/composer@v5
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: 8.1
       - name: PHPStan
         uses: php-actions/phpstan@v2
         with:
           path: src/
-          level: 7
-          php_version: 8.0
+          args: --level=7
+          php_version: 8.1
diff --git a/.github/workflows/phpstan-8.yaml b/.github/workflows/phpstan-8.yaml
@@ -14,10 +14,10 @@ jobs:
       - uses: php-actions/composer@v5
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: 8.1
       - name: PHPStan
         uses: php-actions/phpstan@v2
         with:
           path: src/
-          level: 8
-          php_version: 8.0
+          args: --level=8
+          php_version: 8.1
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -1,4 +1,4 @@
-name: Quality (PHPStan level 4)
+name: Quality
 on: push
 jobs:
   cs-fixer:
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Cs-Fixer
         run: |
-            wget -q https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer
+            wget -q https://cs.symfony.com/download/php-cs-fixer-v3.phar -O php-cs-fixer
             chmod a+x php-cs-fixer
             PHP_CS_FIXER_IGNORE_ENV=true ./php-cs-fixer fix src --dry-run
 
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: composer:v2
           coverage: pcov
       - uses: actions/cache@v2
@@ -29,7 +29,7 @@ jobs:
       - uses: php-actions/composer@v5
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: 8.1
       - name: Run tests & generate Coverage
         run: bin/phpunit --configuration=phpunit.xml tests --coverage-html var/coverage --whitelist=src
       - name: Store coverage files
@@ -50,10 +50,11 @@ jobs:
       - uses: php-actions/composer@v5
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: 8.1
+
       - name: PHPStan
         uses: php-actions/phpstan@v2
         with:
           path: src/
-          level: 4
-          php_version: 8.0
+          args: --level=4
+          php_version: 8.1
diff --git a/src/Assert/BuilderAssertTrait.php b/src/Assert/BuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/ExtractorAssertTrait.php b/src/Assert/ExtractorAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/ExtractorBuilderAssertTrait.php b/src/Assert/ExtractorBuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/LoaderAssertTrait.php b/src/Assert/LoaderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/LoaderBuilderAssertTrait.php b/src/Assert/LoaderBuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/PipelineAssertTrait.php b/src/Assert/PipelineAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/PipelineBuilderAssertTrait.php b/src/Assert/PipelineBuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/TransformerAssertTrait.php b/src/Assert/TransformerAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/Assert/TransformerBuilderAssertTrait.php b/src/Assert/TransformerBuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Assert;
 
diff --git a/src/BuilderAssertTrait.php b/src/BuilderAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension;
 
diff --git a/src/BuilderTestCase.php b/src/BuilderTestCase.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension;
 
diff --git a/src/Constraint/Pipeline/IteratesLike.php b/src/Constraint/Pipeline/IteratesLike.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
diff --git a/src/Constraint/Pipeline/PipelineExtractsLike.php b/src/Constraint/Pipeline/PipelineExtractsLike.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
diff --git a/src/Constraint/Pipeline/PipelineLoadsLike.php b/src/Constraint/Pipeline/PipelineLoadsLike.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
diff --git a/src/Constraint/Pipeline/PipelineTransformsLike.php b/src/Constraint/Pipeline/PipelineTransformsLike.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
diff --git a/src/Constraint/Pipeline/PipelineWritesFile.php b/src/Constraint/Pipeline/PipelineWritesFile.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Constraint\Pipeline;
 
diff --git a/src/Mock/ApiClientMockBuilder.php b/src/Mock/ApiClientMockBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/ExceptionBuilder.php b/src/Mock/ExceptionBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/FileSystemBuilder.php b/src/Mock/FileSystemBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/HttpClientBuilder.php b/src/Mock/HttpClientBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
@@ -9,7 +11,7 @@
 
 final class HttpClientBuilder implements Builder
 {
-    /** @var Node\expr[] */
+    /** @var Node\Expr[] */
     private array $nodes;
 
     public function __construct(
@@ -41,7 +43,7 @@ public function expectException(
         Mock\RequestMatcher\RequestMatcherBuilderInterface $requestMatcher,
         Mock\ExceptionBuilder $exception,
     ): self {
-        $this->node = new Node\Expr\MethodCall(
+        $this->nodes[] = new Node\Expr\MethodCall(
             var: new Node\Expr\Variable('client'),
             name: new Node\Identifier('on'),
             args: [
diff --git a/src/Mock/RequestFactory.php b/src/Mock/RequestFactory.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/RequestFactoryBuilder.php b/src/Mock/RequestFactoryBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/RequestMatcher/RequestMatcherBuilder.php b/src/Mock/RequestMatcher/RequestMatcherBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock\RequestMatcher;
 
@@ -11,7 +13,8 @@ public function __construct(
         private ?string $host = null,
         private $methods = [],
         private $schemes = []
-    ) {}
+    ) {
+    }
 
     public function getNode(): Node
     {
diff --git a/src/Mock/RequestMatcher/RequestMatcherBuilderInterface.php b/src/Mock/RequestMatcher/RequestMatcherBuilderInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock\RequestMatcher;
 
diff --git a/src/Mock/ResponseBuilder.php b/src/Mock/ResponseBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/ResponseFactory.php b/src/Mock/ResponseFactory.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/ResponseFactoryBuilder.php b/src/Mock/ResponseFactoryBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/Mock/StreamFactoryBuilder.php b/src/Mock/StreamFactoryBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension\Mock;
 
diff --git a/src/PipelineAssertTrait.php b/src/PipelineAssertTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension;
 
diff --git a/src/PipelineRunner.php b/src/PipelineRunner.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Kiboko\Component\PHPUnitExtension;
 
diff --git a/tests/functional/Constraint/Builder/BuilderProducesCodeThatTest.php b/tests/functional/Constraint/Builder/BuilderProducesCodeThatTest.php
