From acd0dfdd82b2076373e4e6c868f1675cd8bffc0d Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Wed, 4 Sep 2024 16:07:59 +0200
Subject: [PATCH] Update dependencies

---
 .github/workflows/dependencies.yml |  6 +++---
 .github/workflows/fix-cs-php.yml   |  2 +-
 .github/workflows/tests.yml        |  3 ++-
 composer.json                      | 30 +++++++++++++++---------------
 phpunit.xml.dist                   | 27 +++++++++++----------------
 5 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index 0390448..e05ebbe 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -7,12 +7,12 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 8.1
+    PHP_VERSION: 8.3
 
 jobs:
     composer-require-checker:
         name: Check missing composer requirements
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v4
             -   name: Konfiguriere PHP-Version und -Einstellungen im Worker-Node
@@ -35,4 +35,4 @@ jobs:
                     composer require webfactory/http-cache-bundle
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.12.0
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
index 1009446..1bd889c 100644
--- a/.github/workflows/fix-cs-php.yml
+++ b/.github/workflows/fix-cs-php.yml
@@ -9,7 +9,7 @@ name: Coding Standards
 jobs:
     open-pr-for-cs-violations:
         name: PHP-CS-Fixer
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         if: github.actor != 'dependabot[bot]'
         steps:
             -   name: Checkout code
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6ec1b1a..b7f7768 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,12 +13,13 @@ env:
 
 jobs:
     PHPUnit:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
                 include:
                     - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-lowest }
+                    - { php-version: 8.2, symfony-locked-version: 5.4.*, dependency-version: prefer-stable }
                     - { php-version: 8.2, symfony-locked-version: 6.4.*, 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 }})
diff --git a/composer.json b/composer.json
index b93a556..48c0936 100644
--- a/composer.json
+++ b/composer.json
@@ -16,21 +16,21 @@
 
     "require": {
         "php": ">= 8.1",
-        "doctrine/dbal": "^2.12|^3.0",
-        "doctrine/orm": "^2.0",
-        "doctrine/persistence": "^1.3|^2.1|^3.0",
+        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/orm": "^2.8|^3.0",
+        "doctrine/persistence": "^2.1|^3.0",
         "psr/container": "^1.0",
-        "psr/log": "^1.0",
-        "symfony/config": "^5.1|^6.0|^7.0",
-        "symfony/service-contracts": "^1.0|^2.0|^3.0",
-        "symfony/dependency-injection": "^5.1|^6.0|^7.0",
-        "symfony/filesystem": "^5.1|^6.0|^7.0",
-        "symfony/finder": "^5.1|^6.0|^7.0",
-        "symfony/http-foundation": "^5.1|^6.0|^7.0",
-        "symfony/http-kernel": "^5.1|^6.0|^7.0",
-        "symfony/lock": "^5.1|^6.0|^7.0",
-        "symfony/twig-bundle": "^5.1|^6.0|^7.0",
-        "twig/twig": "^1.0|^2.0|^3.0"
+        "psr/log": "^1|^2|^3",
+        "symfony/config": "^5.4|^6.4|^7.0",
+        "symfony/service-contracts": "^2.5|^3.0",
+        "symfony/dependency-injection": "^5.4|^6.4|^7.0",
+        "symfony/filesystem": "^5.4|^6.4|^7.0",
+        "symfony/finder": "^5.4|^6.4|^7.0",
+        "symfony/http-foundation": "^5.4|^6.4|^7.0",
+        "symfony/http-kernel": "^5.4|^6.4|^7.0",
+        "symfony/lock": "^5.4|^6.4|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.4|^7.0",
+        "twig/twig": "^2.0|^3.0"
     },
 
     "suggest": {
@@ -38,7 +38,7 @@
     },
 
     "require-dev": {
-        "phpunit/phpunit": "^9.6.18",
+        "phpunit/phpunit": "^9.6.18|^10.5",
         "symfony/phpunit-bridge": ">=7.0"
     },
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 88afbbc..8bc2ffe 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">.</directory>
+        </include>
+        <exclude>
+            <directory>Resources</directory>
+            <directory>Tests</directory>
+            <directory>vendor</directory>
+        </exclude>
+    </coverage>
     <testsuites>
         <testsuite name="Full test suite">
             <directory>Tests</directory>
         </testsuite>
     </testsuites>
-
     <!-- Filter for code coverage -->
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">.</directory>
-            <exclude>
-                <directory>Resources</directory>
-                <directory>Tests</directory>
-                <directory>vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>