From 3c0bfca774de44b3af200beff52697999d6ef1b0 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Wed, 18 Aug 2021 12:05:58 -0700
Subject: [PATCH] Update static analyzers

---
 .github/workflows/static.yml | 76 +++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index c6e6bf5..8d94194 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -1,59 +1,66 @@
+on: [ pull_request ]
 name: Static analysis
 
-on:
-    pull_request: ~
-    push:
-        branches:
-            - master
-
 jobs:
     phpstan:
         name: PHPStan
-        runs-on: Ubuntu-20.04
+        runs-on: ubuntu-20.04
 
         steps:
-            -   name: Set up PHP
-                uses: shivammathur/setup-php@2.9.0
-                with:
-                    php-version: '7.4'
-                    coverage: none
-
             -   name: Checkout code
                 uses: actions/checkout@v2
 
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.0
+                    coverage: none
+                    tools: phpstan:0.12.92, cs2pr
+
             -   name: Download dependencies
-                run: composer update --no-interaction --prefer-dist
+                uses: ramsey/composer-install@v1
 
             -   name: PHPStan
-                uses: docker://oskarstark/phpstan-ga:0.12.70
-                with:
-                    entrypoint: /composer/vendor/bin/phpstan
-                    args: analyze --no-progress
+                run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
 
     php-cs-fixer:
         name: PHP-CS-Fixer
-        runs-on: Ubuntu-20.04
+        runs-on: ubuntu-20.04
 
         steps:
             -   name: Checkout code
                 uses: actions/checkout@v2
 
-            -   name: PHP-CS-Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga:2.18.2
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
                 with:
-                    args: --dry-run --diff-format udiff
+                    php-version: 8.0
+                    coverage: none
+                    tools: php-cs-fixer:2.19.0, cs2pr
+
+            -   name: PHP-CS-Fixer
+                run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
 
     psalm:
         name: Psalm
-        runs-on: Ubuntu-20.04
+        runs-on: ubuntu-20.04
         steps:
             -   name: Checkout code
                 uses: actions/checkout@v2
 
-            -   name: Psalm
-                uses: docker://vimeo/psalm-github-actions:4.4.1
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
                 with:
-                    args: --no-progress --show-info=false --stats
+                    php-version: 8.0
+                    coverage: none
+                    tools: vimeo/psalm:4.8.1
+
+            -   name: Download dependencies
+                uses: ramsey/composer-install@v1
+
+            -   name: Psalm
+                run: psalm --no-progress --output-format=github
+
 
     roave-bc-check:
         name: Roave BC Check
@@ -68,21 +75,18 @@ jobs:
 
     composer-normalize:
         name: Composer Normalize
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Set up PHP
-                uses: shivammathur/setup-php@2.9.0
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
+                    php-version: 8.0
                     coverage: none
                     tools: composer-normalize
 
-            -   name: Validate composer.json
-                run: composer validate
+            -   name: Checkout code
+                uses: actions/checkout@v2
 
-            -   name: Normalize composer.json
+            -   name: Normalize
                 run: composer-normalize --dry-run