From eb7e7ceecc4ac5a97e6656e672921961d421904c Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Sat, 24 Feb 2024 20:55:36 +0100
Subject: [PATCH] feat: allow PHPUnit 11

---
 Tests/Twig/Extension/CurrencyExtensionTest.php | 5 ++---
 Tests/Twig/Extension/MoneyExtensionTest.php    | 5 ++---
 Tests/bootstrap.php                            | 7 +++++++
 composer.json                                  | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Tests/Twig/Extension/CurrencyExtensionTest.php b/Tests/Twig/Extension/CurrencyExtensionTest.php
index 3e0b00f6..dfd9fdf0 100644
--- a/Tests/Twig/Extension/CurrencyExtensionTest.php
+++ b/Tests/Twig/Extension/CurrencyExtensionTest.php
@@ -6,6 +6,7 @@
 
 use Locale;
 use Money\Currency;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Tbbc\MoneyBundle\Formatter\MoneyFormatter;
 use Tbbc\MoneyBundle\Twig\Extension\CurrencyExtension;
@@ -30,9 +31,7 @@ public function testName(): void
         self::assertSame('tbbc_money_currency_extension', $this->extension->getName());
     }
 
-    /**
-     * @dataProvider getCurrencyTests
-     */
+    #[DataProvider('getCurrencyTests')]
     public function testCurrency($template, $expected): void
     {
         $this->assertSame($expected, $this->getTemplate($template)->render($this->variables));
diff --git a/Tests/Twig/Extension/MoneyExtensionTest.php b/Tests/Twig/Extension/MoneyExtensionTest.php
index 30fc68af..0b498d3a 100644
--- a/Tests/Twig/Extension/MoneyExtensionTest.php
+++ b/Tests/Twig/Extension/MoneyExtensionTest.php
@@ -7,6 +7,7 @@
 use Locale;
 use Money\Currency;
 use Money\Money;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Tbbc\MoneyBundle\Formatter\MoneyFormatter;
@@ -52,9 +53,7 @@ public function testName(): void
         self::assertSame('tbbc_money_extension', $this->extension->getName());
     }
 
-    /**
-     * @dataProvider getMoneyTests
-     */
+    #[DataProvider('getMoneyTests')]
     public function testMoney($template, $expected): void
     {
         $this->assertSame($expected, $this->getTemplate($template)->render($this->variables));
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index e69de29b..380b8aa9 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+use Symfony\Component\ErrorHandler\ErrorHandler;
+
+# PHPUnit 11 needs this, otherwise there is an error 'Test code or tested code did not remove its own exception handlers'
+ErrorHandler::register(null, false);
diff --git a/composer.json b/composer.json
index dce906d7..b32c6ddf 100644
--- a/composer.json
+++ b/composer.json
@@ -44,9 +44,9 @@
         "florianv/exchanger": "^2.8.1",
         "php-http/message": "^1.0",
         "php-http/guzzle7-adapter": "^1.0",
-        "vimeo/psalm": "^5.20",
-        "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
-        "phpunit/phpunit": "^10.5.9",
+        "vimeo/psalm": "^5.20 || 6.x-dev as 6.0.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "phpunit/phpunit": "^10.5.9|^11.0.3",
         "symfony/yaml": "^5.4|^6.0|^7.0",
         "http-interop/http-factory-guzzle": "^1.2"
     },