Cleanup

Author: cleptric

.github/workflows/tests.yaml

@@ -1,73 +1,60 @@
-name: Continuous Integration
+name: CI
 
 on:
-  pull_request: null
+  pull_request:
   push:
     branches:
       - master
-      - develop
       - release/**
 
 permissions:
   contents: read
 
 jobs:
   tests:
-    name: Tests
+    name: Tests (${{ matrix.os }}, ${{ matrix.php.version }}, ${{ matrix.dependencies }})
     runs-on: ubuntu-latest
     env:
       SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
     strategy:
       fail-fast: false
       matrix:
         php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
+          - { version: '7.2', phpunit: '^8.5.40' }
+          - { version: '7.3', phpunit: '^9.6.21' }
+          - { version: '7.4', phpunit: '^9.6.21' }
+          - { version: '8.0', phpunit: '^9.6.21' }
+          - { version: '8.1', phpunit: '^9.6.21' }
+          - { version: '8.2', phpunit: '^9.6.21' }
+          - { version: '8.3', phpunit: '^9.6.21' }
+          - { version: '8.4', phpunit: '^9.6.21' }
         symfony-version:
           - 4.4.*
           - 5.*
           - 6.*
           - 7.*
         dependencies:
+          - lowest
           - highest
         exclude:
-          - php: '7.2'
+          - php.version: '7.2'
             symfony-version: 6.*
-          - php: '7.3'
+          - php.version: '7.3'
             symfony-version: 6.*
-          - php: '7.4'
+          - php.version: '7.4'
             symfony-version: 6.*
-          - php: '7.2'
+          - php.version: '7.2'
             symfony-version: 7.*
-          - php: '7.3'
+          - php.version: '7.3'
             symfony-version: 7.*
-          - php: '7.4'
+          - php.version: '7.4'
             symfony-version: 7.*
-          - php: '8.0'
+          - php.version: '8.0'
             symfony-version: 7.*
-          - php: '8.1'
+          - php.version: '8.1'
             symfony-version: 7.*
-          - php: '8.4'
+          - php.version: '8.4'
             symfony-version: 4.4.*
-        include:
-          - php: '7.2'
-            symfony-version: 4.4.*
-            dependencies: lowest
-          - php: '7.2'
-            symfony-version: 5.*
-            dependencies: lowest
-          - php: '8.0'
-            symfony-version: 6.*
-            dependencies: lowest
-          - php: '8.2'
-            symfony-version: 7.*
-            dependencies: lowest
 
     steps:
       - name: Checkout
@@ -78,21 +65,20 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: ${{ matrix.php.version }}
           coverage: pcov
           tools: flex
 
       - name: Setup Problem Matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Update PHPUnit
-        run: composer require --dev phpunit/phpunit ^9.5 --no-update
-        if: matrix.php == '8.0' && matrix.dependencies == 'lowest'
-
       # These dependencies are not used running the tests but can cause deprecation warnings so we remove them before running the tests
       - name: Remove unused dependencies
         run: composer remove vimeo/psalm phpstan/phpstan friendsofphp/php-cs-fixer  --dev --no-interaction --no-update
 
+      - name: Set phpunit/phpunit version constraint
+        run: composer require phpunit/phpunit:'${{ matrix.php.phpunit }}' --dev --no-interaction --no-update
+
       - name: Install dependencies
         uses: ramsey/composer-install@v3
         with: