From 218608980e91b3a9a66c233758129279c1a312b4 Mon Sep 17 00:00:00 2001
From: Olda Salek <mzk@mozektevidi.net>
Date: Tue, 28 Feb 2023 12:58:43 +0100
Subject: [PATCH 1/3] Add support for phpunit 10

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b19cf1c7..65e4e985 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "phpunit/phpunit": "^7.5.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^7.5.0 || ^8.0 || ^9.0 || ^10.0",
         "symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
         "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0"
     },

From 512fb4e31ac063f4a031424bae6c0bb1d7b1bdbd Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Tue, 11 Apr 2023 20:48:08 +0200
Subject: [PATCH 2/3] HttpAssertions: fail test instead of throwing a warning

---
 src/Utils/HttpAssertions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Utils/HttpAssertions.php b/src/Utils/HttpAssertions.php
index 5e9c6adc..c561218c 100644
--- a/src/Utils/HttpAssertions.php
+++ b/src/Utils/HttpAssertions.php
@@ -98,7 +98,10 @@ public static function assertValidationErrors(array $expected, ContainerInterfac
         }
 
         if (!$container->has('liip_functional_test.validator')) {
-            trigger_error(sprintf('Method %s() can not be used as the validation component of the Symfony framework is disabled.', __METHOD__), \E_USER_WARNING);
+            self::fail(sprintf(
+                'Method %s() can not be used as the validation component of the Symfony framework is disabled.',
+                __METHOD__
+            ));
         }
 
         self::assertThat(

From 8eabc5b89563394d67cbbcfd87ce45ccac95a99f Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Tue, 11 Apr 2023 20:53:20 +0200
Subject: [PATCH 3/3] update phpunit.xml.dist

---
 phpunit.xml.dist | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 95a886a8..25fdef43 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/3.7/en/appendixes.configuration.html -->
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
     bootstrap="tests/App/bootstrap.php"
     colors="true"
     beStrictAboutOutputDuringTests="true"
+    cacheDirectory=".phpunit.cache"
 >
-
     <php>
-        <server name="KERNEL_CLASS" value="Liip\Acme\Tests\App\AppKernel" />
+        <server name="KERNEL_CLASS" value="Liip\Acme\Tests\App\AppKernel"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
     </php>
-
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>tests/Command</directory>
@@ -21,10 +19,9 @@
             <directory>tests/Test</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>