Cleanup

Author: cleptric

.github/workflows/tests.yaml

@@ -1,11 +1,10 @@
-name: Continuous Integration
+name: CI
 
 on:
-  pull_request: null
+  pull_request:
   push:
     branches:
       - master
-      - develop
       - release/**
 
 permissions:
@@ -35,6 +34,7 @@ jobs:
           - 6.*
           - 7.*
         dependencies:
+          - lowest
           - highest
         exclude:
           - php: '7.2'
@@ -55,19 +55,6 @@ jobs:
             symfony-version: 7.*
           - php: '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
@@ -85,14 +72,14 @@ jobs:
       - 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: Update PHPUnit
+        run: composer require --dev phpunit/phpunit ^8.5.40 --no-update
+        if: matrix.php == '7.2'
+
       - name: Install dependencies
         uses: ramsey/composer-install@v3
         with:

composer.json

@@ -36,7 +36,7 @@
         "phpstan/phpstan": "1.12.5",
         "phpstan/phpstan-phpunit": "1.4.0",
         "phpstan/phpstan-symfony": "1.4.10",
-        "phpunit/phpunit": "^8.5|^9.6",
+        "phpunit/phpunit": "^8.5||^9.6",
         "symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0",
         "symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0",
         "symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0||^7.0",