PHPUnit 10

composer.json

@@ -43,7 +43,7 @@
         "doctrine/coding-standard": "^9.0.2 || ^11.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
         "phpstan/phpstan": "~1.4.10 || 1.9.14",
-        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -29,6 +29,7 @@
 use Doctrine\Tests\DbalExtensions\QueryLog;
 use Doctrine\Tests\DbalTypes\Rot13Type;
 use Doctrine\Tests\EventListener\CacheMetadataListener;
+use Doctrine\Tests\PHPUnitCompatibility\OnNotSuccessfulTestCompat;
 use Exception;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Count;
@@ -62,6 +63,8 @@
  */
 abstract class OrmFunctionalTestCase extends OrmTestCase
 {
+     use OnNotSuccessfulTestCompat;
+
     /**
      * The metadata cache shared between all functional tests.
      *
@@ -840,7 +843,7 @@ final protected function createSchemaManager(): AbstractSchemaManager
     }
 
     /** @throws Throwable */
-    protected function onNotSuccessfulTest(Throwable $e): void
+    private function doOnNotSuccessfulTest(Throwable $e): void
     {
         if ($e instanceof AssertionFailedError || $e instanceof Warning) {
             throw $e;

tests/Doctrine/Tests/PHPUnitCompatibility/OnNotSuccessfulTestCompat.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\PHPUnitCompatibility;
+
+use Throwable;
+
+use const PHP_VERSION_ID;
+
+if (PHP_VERSION_ID >= 80100) {
+    trait OnNotSuccessfulTestCompat
+    {
+        protected function onNotSuccessfulTest(Throwable $e): never
+        {
+            $this->doOnNotSuccessfulTest($e);
+        }
+    }
+} else {
+    trait OnNotSuccessfulTestCompat
+    {
+        protected function onNotSuccessfulTest(Throwable $e): void
+        {
+            $this->doOnNotSuccessfulTest($e);
+        }
+    }
+}