From a9d84c2e60afae1f5be6d93d2dac0f8db497ad5a Mon Sep 17 00:00:00 2001
From: Doug Wright <github@dougweb.org>
Date: Sat, 4 Feb 2023 16:29:29 +0000
Subject: [PATCH] Fix number of runs sent to Scrutinizer, bump devtool versions

---
 .github/workflows/ci.yml | 8 ++++----
 .scrutinizer.yml         | 4 ++--
 composer.json            | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aba847f..7a230b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,7 +108,7 @@ jobs:
       run: composer require --no-update "phpunit/php-code-coverage:${{ matrix.php-code-coverage-version }}"
 
     - name: Remove PHP-CS-Fixer if not called
-      if: matrix.php-version != '8.0' || matrix.symfony-version != '^5.0' || matrix.dependencies != 'highest'
+      if: matrix.php-version != '8.1' || matrix.symfony-version != '^5.0' || matrix.dependencies != 'highest'
       run: composer remove --dev --no-update "friendsofphp/php-cs-fixer";
 
     - name: Install dependencies (low)
@@ -146,7 +146,7 @@ jobs:
         else
           php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=build/coverage-phpunit/clover.xml;
         fi;
-        if [ "${{ matrix.php-version }}" = "8.0" ] && [ "${{ matrix.driver }}" != "none" ]; then
+        if [ "${{ matrix.php-version }}" = "8.1" ] && [ "${{ matrix.driver }}" != "none" ]; then
           composer global require scrutinizer/ocular;
           ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover build/coverage-phpunit/clover.xml;
         fi;
@@ -154,11 +154,11 @@ jobs:
     - name: Behat
       run: |
         php -dmemory_limit=-1 vendor/behat/behat/bin/behat --strict;
-        if [ "${{ matrix.php-version }}" = "8.0" ] && [ "${{ matrix.driver }}" != "none" ]; then
+        if [ "${{ matrix.php-version }}" = "8.1" ] && [ "${{ matrix.driver }}" != "none" ]; then
           composer global require scrutinizer/ocular;
           ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover build/coverage-behat/clover.xml;
         fi;
 
     - name: Check code style
-      if: matrix.php-version == '8.0' && matrix.symfony-version == '^5.0' && matrix.dependencies == 'highest'
+      if: matrix.php-version == '8.1' && matrix.symfony-version == '^5.0' && matrix.dependencies == 'highest'
       run: vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --allow-risky=yes
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 8848127..ffecb7a 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -3,7 +3,7 @@ checks:
 
 tools:
   external_code_coverage:
-    runs: 8    # Scrutinizer will wait for this many code coverage submissions
+    runs: 72    # Scrutinizer will wait for this many code coverage submissions
     timeout: 600    # Timeout in seconds.
 
 filter:
@@ -15,7 +15,7 @@ build:
   environment:
     # Languages
     php:
-      version: "8.0"
+      version: "8.1"
       ini:
         memory_limit: "-1"
 
diff --git a/composer.json b/composer.json
index 82f3e5d..9f6c897 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
     },
     "config": {
         "preferred-install": {
+            "phpunit/php-code-coverage": "source",
             "*": "dist"
         },
         "sort-packages": true,