feat: allow PHPUnit 11

TheBigBrainsCompany · Jun 13, 2024 · eb7e7ce · eb7e7ce
1 parent 2f93d26
commit eb7e7ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
     },