From a47e3638ab9f10c82eabe9d348d79b8d864067e5 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Thu, 4 Jan 2024 15:47:51 +0100
Subject: [PATCH] Update test matrix for PHP 8.1 and above, Symfony 6.4 and
 above

---
 .github/workflows/dependencies.yml |  6 +++---
 .github/workflows/fix-cs-php.yml   |  4 ++--
 .github/workflows/tests.yml        | 10 +++++-----
 composer.json                      | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index 0e6c814..78e3f20 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -7,12 +7,12 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 7.2
+    PHP_VERSION: 8.1
 
 jobs:
     composer-require-checker:
         name: Check missing composer requirements
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             -   uses: actions/checkout@v3
             -   name: Konfiguriere PHP-Version und -Einstellungen im Worker-Node
@@ -33,4 +33,4 @@ jobs:
                     composer install --no-interaction --no-scripts --no-progress --no-suggest
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://webfactory/composer-require-checker:3.2.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
index ba59f55..6f38346 100644
--- a/.github/workflows/fix-cs-php.yml
+++ b/.github/workflows/fix-cs-php.yml
@@ -12,7 +12,7 @@ name: Coding Standards
 jobs:
     open-pr-for-cs-violations:
         name: PHP-CS-Fixer
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         if: github.actor != 'dependabot[bot]'
         steps:
             -   name: Checkout code
@@ -21,7 +21,7 @@ jobs:
                     ref: ${{ github.head_ref }}
 
             -   name: Run PHP-CS-Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga:3.11.0
+                uses: docker://oskarstark/php-cs-fixer-ga:3.26.0
 
             -   name: Commit and push back changes
                 uses: stefanzweifel/git-auto-commit-action@v4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 263eff3..e68193e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,15 +12,15 @@ env:
 jobs:
     PHPUnit:
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
                 include:
-                    - { php-version: 7.2, symfony-locked-version: none, dependency-version: prefer-lowest }
-                    - { php-version: 7.2, symfony-locked-version: 3.4.*, dependency-version: prefer-stable }
-                    - { php-version: 7.4, symfony-locked-version: 4.4.*, dependency-version: prefer-stable }
-                    - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-stable }
+                    - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-lowest }
+                    - { php-version: 8.1, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
+                    - { php-version: 8.2, symfony-locked-version: none, dependency-version: prefer-stable }
+                    - { php-version: 8.3, symfony-locked-version: none, dependency-version: prefer-stable }
         name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
         steps:
             -   uses: actions/checkout@v3
diff --git a/composer.json b/composer.json
index 893c31b..40f0ea8 100644
--- a/composer.json
+++ b/composer.json
@@ -20,22 +20,22 @@
     },
 
     "require": {
-        "php": "^7.2|8.0.*|8.1.*",
+        "php": "8.1.*|8.2.*|8.3.*",
         "doctrine/annotations": "^1.11",
         "doctrine/collections": "^1.0",
         "doctrine/orm": "^2.2",
         "doctrine/persistence": "^1.3.8 | ^2.1",
         "psr/log": "^1.0",
-        "symfony/config": "^2.0|^3.0|^4.0|^5.0|^6.0",
-        "symfony/dependency-injection": "^2.0|^3.0|^4.0|^5.0|^6.0",
-        "symfony/event-dispatcher": "^2.0|^3.0|^4.0|^5.0|^6.0",
-        "symfony/http-kernel": "^4.3|^5.0|^6.0"
+        "symfony/config": "^5.4|^6.4|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.4|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.4|^7.0",
+        "symfony/http-kernel": "^5.4|^6.4|^7.0"
     },
 
     "require-dev": {
-        "phpunit/phpunit": "^8.5.22",
-        "symfony/error-handler": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": ">= 4.4",
+        "phpunit/phpunit": "^8.5.36|^9.6",
+        "symfony/error-handler": "^5.4|^6.4|^7.0",
+        "symfony/phpunit-bridge": ">= 7.0",
         "webfactory/doctrine-orm-test-infrastructure": "^1.9"
     },