From 2fa858540eba3c5dd8bbddde36584f2e286fa51f Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Mon, 15 Dec 2025 09:51:17 +0100
Subject: [PATCH 1/2] Bump requirement to currently supported Symfony versions

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 3bf034a..8281363 100644
--- a/composer.json
+++ b/composer.json
@@ -10,17 +10,17 @@
     "require": {
         "php": ">= 8.1",
         "jms/metadata": "^2.6.1",
-        "symfony/expression-language": "^3.4|^4.0|^5.0|^6.0|^7.0",
-        "symfony/property-access": "^3.4|^4.0|^5.0|^6.0|^7.0"
+        "symfony/expression-language": "^6.4 || ^7.3 || ^8.0",
+        "symfony/property-access": "^6.4 || ^7.3 || ^8.0"
     },
 
     "require-dev": {
-        "doctrine/common": "^2.2",
+        "doctrine/common": "^2.2 || ^3.0",
         "phpunit/phpunit": "^9.6",
         "symfony/phpunit-bridge": ">5.0",
-        "symfony/routing": "^2.2|^3.0|^4.0",
-        "symfony/yaml": "^3.0|^4.0|^5.0",
-        "twig/twig": "^2.0|^3.0"
+        "symfony/routing": "^6.4 || ^7.3 || ^8.0",
+        "symfony/yaml": "^6.4 || ^7.3 || ^8.0",
+        "twig/twig": "^2.0 || ^3.0"
     },
 
     "conflict": {

From fcba5de20e6c597e4eb1a07dfd29915686e93d1c Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Mon, 15 Dec 2025 09:56:30 +0100
Subject: [PATCH 2/2] Bump PHPUnit to 10.5

---
 composer.json       |  4 ++--
 phpunit.xml.dist    | 30 ++++++++++++------------------
 tests/bootstrap.php | 21 ++++-----------------
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/composer.json b/composer.json
index 8281363..464296f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
 
     "require-dev": {
         "doctrine/common": "^2.2 || ^3.0",
-        "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": ">5.0",
+        "phpunit/phpunit": "^10.5.58",
+        "symfony/error-handler": "^6.4 || ^7.3 || ^8.0",
         "symfony/routing": "^6.4 || ^7.3 || ^8.0",
         "symfony/yaml": "^6.4 || ^7.3 || ^8.0",
         "twig/twig": "^2.0 || ^3.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ad0e64d..4ee1605 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
->
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    bootstrap="tests/bootstrap.php"
+    colors="true"
+    cacheDirectory=".phpunit.cache">
+    <source ignoreSuppressionOfDeprecations="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
     <testsuites>
         <testsuite name="Object Routing Test Suite">
-            <directory>./tests/JMS/</directory>
+            <directory>tests/JMS</directory>
         </testsuite>
     </testsuites>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 79fcc41..9f42edb 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,21 +1,8 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
-    echo 'Could not find "vendor/autoload.php". Did you forget to run "composer install --dev"?'.\PHP_EOL;
-    exit(1);
-}
+use Symfony\Component\ErrorHandler\ErrorHandler;
 
-require_once $autoloadFile;
+// Work around https://github.com/symfony/symfony/issues/53812 for the time being (Symfony (6.4-7.1)/PHPUnit 11 issue)
+set_exception_handler([new ErrorHandler(), 'handleException']);
 
-Doctrine\Common\Annotations\AnnotationRegistry::registerLoader('class_exists');
-
-spl_autoload_register(function ($class) {
-    if (str_starts_with($class, 'JMS\Tests\\')) {
-        $path = __DIR__.'/../tests/'.strtr($class, '\\', '/').'.php';
-        if (file_exists($path) && is_readable($path)) {
-            require_once $path;
-
-            return true;
-        }
-    }
-});
+require_once __DIR__.'/../vendor/autoload.php';