From 6ee4d79d858bba17053e0317e1711974116ecd47 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Thu, 4 Dec 2025 11:43:31 +0100
Subject: [PATCH 1/2] Upgrade PHPUnit to 10.5, use built-in deprecation
 reporting

---
 composer.json    |  3 +--
 phpunit.xml.dist | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index a2f9fc9..b5d12a0 100644
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,7 @@
     },
 
     "require-dev": {
-        "phpunit/phpunit": "^9.6.18|^10.5",
-        "symfony/phpunit-bridge": ">=7.0"
+        "phpunit/phpunit": "^10.5.59"
     },
 
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2da3b41..00136bb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+    displayDetailsOnPhpunitDeprecations="true"
+>
+    <source ignoreSuppressionOfDeprecations="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
     <testsuites>
         <testsuite name="Full test suite">
             <directory>Tests</directory>
         </testsuite>
     </testsuites>
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-    </php>
 </phpunit>

From 5078208fbece427f326236ea52a4f95e34b6208e Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Thu, 4 Dec 2025 11:46:12 +0100
Subject: [PATCH 2/2] Fix test namespace usage/autoloading declaration

---
 composer.json                                 | 8 +++++++-
 phpunit.xml.dist                              | 2 +-
 {Tests => tests}/ProviderTest.php             | 0
 {Tests => tests}/Util/CriticalSectionTest.php | 0
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename {Tests => tests}/ProviderTest.php (100%)
 rename {Tests => tests}/Util/CriticalSectionTest.php (100%)

diff --git a/composer.json b/composer.json
index b5d12a0..0267eb6 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,13 @@
             "Webfactory\\Bundle\\WfdMetaBundle\\": "src"
         }
     },
-    
+
+    "autoload-dev": {
+        "psr-4": {
+            "Webfactory\\Bundle\\WfdMetaBundle\\Tests\\": "tests"
+        }
+    },
+
     "config": {
         "sort-packages": true
     }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 00136bb..00f0755 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,7 @@
     </source>
     <testsuites>
         <testsuite name="Full test suite">
-            <directory>Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/Tests/ProviderTest.php b/tests/ProviderTest.php
similarity index 100%
rename from Tests/ProviderTest.php
rename to tests/ProviderTest.php
diff --git a/Tests/Util/CriticalSectionTest.php b/tests/Util/CriticalSectionTest.php
similarity index 100%
rename from Tests/Util/CriticalSectionTest.php
rename to tests/Util/CriticalSectionTest.php