Upgrade test runners

Author: Greg Bowler

.github/workflows/ci.yml

@@ -3,45 +3,64 @@ name: CI
 on: [push]
 
 jobs:
-  build:
+  composer:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - uses: php-actions/composer@v4
-      - name: Upload build for test runner
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+
+      - uses: php-actions/composer@v5
+
+      - name: Archive build
+        run: mkdir /tmp/github-actions/ && tar -cvf /tmp/github-actions/build.tar ./
+
+      - name: Upload build archive for test runners
         uses: actions/upload-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
 
   phpunit:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [composer]
 
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
+
+      - name: Extract build archive
+        run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Unit tests
-        uses: php-actions/phpunit@v1
+        uses: php-actions/phpunit@v2
         with:
-          bootstrap: vendor/autoload.php
+          php_version: 8.0
+          php_extensions: xdebug
           configuration: test/phpunit/phpunit.xml
+          bootstrap: vendor/autoload.php
 
   phpstan:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [composer]
 
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: build-artifact
-          path: ./
+          path: /tmp/github-actions
+
+      - name: Extract build archive
+        run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Static Analysis
-        uses: php-actions/phpstan@v1
+        uses: php-actions/phpstan@v2
         with:
           path: src/

.scrutinizer.yml

@@ -1,16 +1,25 @@
 build:
   environment:
-    php:
-      version: 7.4.0
-  tests:
-    override:
-      - php-scrutinizer-run
-      - phpcs-run ./src
-      -
-        command: 'vendor/bin/phpunit test/phpunit --coverage-clover coverage --whitelist src'
-        coverage:
-          file: 'coverage'
-          format: 'php-clover'
+    php: 8.0.0
+
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+
+    tests-and-coverage:
+      environment:
+        php:
+          ini:
+            "xdebug.mode": coverage
+      tests:
+        override:
+          - phpcs-run ./src
+          - command: "vendor/bin/phpunit test/phpunit --coverage-clover test/phpunit/_coverage --whitelist src"
+            coverage:
+              file: "test/phpunit/_coverage"
+              format: "php-clover"
 
 checks:
   php: