From d52813b27ab1e64ad3d158c7b2bde4172e2abbfd Mon Sep 17 00:00:00 2001
From: alexpozzi <alexpozzi@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:40:27 +0100
Subject: [PATCH] upgrade test matrix

---
 .github/workflows/build.yaml | 27 +++++++++++----------------
 composer.json                |  6 +-----
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d406053..eb847ba 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,6 +20,9 @@ jobs:
             fail-fast: false
             matrix:
                 include:
+                    - description: 'Symfony 7.1 DEV'
+                      php: '8.2'
+                      symfony: '7.1.*@dev'
                     - description: 'Symfony 7.0'
                       php: '8.3'
                       symfony: '7.0.*'
@@ -35,23 +38,13 @@ jobs:
                     - description: 'Symfony 5.0'
                       php: '8.3'
                       symfony: '5.0.*'
-                    - description: 'Dev deps'
-                      php: '8.3'
-                      symfony: '7.0.*'
-                      dev: true
-                    - description: 'Lowest deps'
+                    - description: 'Beta deps'
                       php: '8.1'
-                      composer_option: '--prefer-lowest'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: max[self]=0
+                      beta: true
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-            - run: |
-                phpenv config-rm xdebug.ini || true
-                composer global config --no-plugins allow-plugins.symfony/flex true
-                composer global require --no-progress --no-scripts --no-plugins symfony/flex 1.*
             - name: Cache
               uses: actions/cache@v3
               with:
@@ -64,7 +57,9 @@ jobs:
             - run: |
                   sed -ri 's/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' composer.json;
               if: matrix.symfony
-            - run: composer config minimum-stability dev && composer config prefer-stable true
-              if: matrix.dev
-            - run: composer update --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
-            - run: vendor/bin/simple-phpunit -v
+            - run: |
+                  composer config minimum-stability dev
+                  composer config prefer-stable true
+              if: matrix.beta
+            - run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
+            - run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index cc01e9d..82bf074 100644
--- a/composer.json
+++ b/composer.json
@@ -31,11 +31,7 @@
         }
     },
     "require-dev": {
-        "symfony/asset": "^5.1|^6.0|^7.0",
-        "symfony/finder": "^5.1|^6.0|^7.0",
-        "symfony/phpunit-bridge": "^5.1|^6.0|^7.0",
-        "symfony/security-csrf": "^5.1|^6.0|^7.0",
-        "symfony/validator": "^5.1|^6.0|^7.0",
+        "phpunit/phpunit": "^8.5",
         "symfony/yaml": "^5.1|^6.0|^7.0"
     }
 }