Merge pull request #1 from php-etl/feature/qualityflow-improvments

Change phpstan action on pull request, add a phpstan lvl 6
php-etl · Apr 3, 2023 · 46119db · 46119db
2 parents e85477e + 077b333
commit 46119db
Show file tree

Hide file tree

Showing 11 changed files with 2,198 additions and 79 deletions.
diff --git a/.github/workflows/phpstan-5.yaml b/.github/workflows/phpstan-5.yaml
@@ -4,20 +4,20 @@ jobs:
   phpstan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - 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@v5
+      - uses: php-actions/composer@v6
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: '8.2'
       - name: PHPStan
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
           path: src/
-          level: 4
-          php_version: 8.0
+          level: 5
+          php_version: '8.2'
diff --git a/.github/workflows/phpstan-6.yaml b/.github/workflows/phpstan-6.yaml
@@ -0,0 +1,23 @@
+name: PHPStan level 6
+on: push
+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: 6
+          php_version: '8.2'
diff --git a/.github/workflows/phpstan-7.yaml b/.github/workflows/phpstan-7.yaml
@@ -4,20 +4,20 @@ jobs:
   phpstan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - 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@v5
+      - uses: php-actions/composer@v6
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: '8.2'
       - name: PHPStan
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
           path: src/
           level: 7
-          php_version: 8.0
+          php_version: '8.2'
diff --git a/.github/workflows/phpstan-8.yaml b/.github/workflows/phpstan-8.yaml
@@ -4,20 +4,20 @@ jobs:
   phpstan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - 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@v5
+      - uses: php-actions/composer@v6
         with:
           args: --prefer-dist
-          php_version: 8.0
+          php_version: '8.2'
       - name: PHPStan
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
           path: src/
           level: 8
-          php_version: 8.0
+          php_version: '8.2'
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -4,30 +4,35 @@ jobs:
   cs-fixer:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          tools: composer:v2
+          coverage: none
       - 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
 
   phpstan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - 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@v5
+      - uses: php-actions/composer@v6
         with:
           args: --prefer-dist
           php_version: 8.0
       - name: PHPStan
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
           path: src/
           level: 4
-          php_version: 8.0
+          php_version: '8.2'
diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml
@@ -0,0 +1,33 @@
+# github action that checks code with Rector
+name: Rector
+
+on: pull_request
+
+jobs:
+    rector:
+        # Don't run on forks.
+        if: github.repository == 'php-etl/packaging-contracts'
+        runs-on: ubuntu-latest
+        steps:
+            # workaround for missing secret in fork PRs - see https://github.com/actions/checkout/issues/298
+            # see https://github.com/rectorphp/rector/commit/d395e1c28b8e6a56711dcc2e10490a82965850e4
+            -   uses: actions/checkout@v3
+
+            -
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+                    coverage: none
+
+            -   uses: "ramsey/composer-install@v2"
+
+            -   run: bin/rector --ansi
+
+            -
+                # commit only to core contributors who have repository access
+                if: github.event.pull_request.head.repo.full_name == github.repository
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    commit_message: '[rector] Rector fixes'
+                    commit_author: 'GitHub Action <actions@github.com>'
+                    commit_user_email: 'action@github.com'
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /vendor/
+bin/
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -7,6 +7,7 @@
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
+        '@PHP82Migration' => true,
         '@PHP81Migration' => true,
         '@PHP80Migration:risky' => true,
         '@PHPUnit84Migration:risky' => true,

diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ This package brings interfaces for packaging, such as creating archives or Docke
 
 [![Quality](https://github.com/php-etl/packaging-contracts/actions/workflows/quality.yaml/badge.svg)](https://github.com/php-etl/packaging-contracts/actions/workflows/quality.yaml)
 [![PHPStan level 5](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-5.yaml/badge.svg)](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-5.yaml)
+[![PHPStan level 5](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-6.yaml/badge.svg)](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-6.yaml)
 [![PHPStan level 7](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-7.yaml/badge.svg)](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-7.yaml)
 [![PHPStan level 8](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-8.yaml/badge.svg)](https://github.com/php-etl/packaging-contracts/actions/workflows/phpstan-8.yaml)
 ![PHP](https://img.shields.io/packagist/php-v/php-etl/packaging-contracts)

diff --git a/composer.json b/composer.json
@@ -19,19 +19,24 @@
         "nikic/php-parser": "^4.10"
     },
     "require-dev": {
-        "rector/rector": "^0.15"
+        "rector/rector": "^0.15",
+        "phpstan/phpstan": "^1.10",
+        "friendsofphp/php-cs-fixer": "^3.0"
     },
     "autoload": {
         "psr-4": {
             "Kiboko\\Contract\\Packaging\\": "src/"
         }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "0.2.x-dev"
+            "dev-main": "0.3.x-dev"
         }
     }
 }