Merge branch '10.5' into 11.5

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -1224,45 +1224,6 @@ final protected function registerFailureType(string $classOrInterface): void
         $this->failureTypes[$classOrInterface] = true;
     }
 
-    /**
-     * @throws AssertionFailedError
-     * @throws Exception
-     * @throws ExpectationFailedException
-     * @throws Throwable
-     *
-     * @internal This method is not covered by the backward compatibility promise for PHPUnit
-     */
-    final protected function runTest(): mixed
-    {
-        $testArguments       = array_merge($this->data, array_values($this->dependencyInput));
-        $positionalArguments = [];
-        $namedArguments      = [];
-
-        foreach ($testArguments as $key => $value) {
-            if (is_int($key)) {
-                $positionalArguments[] = $value;
-            } else {
-                $namedArguments[$key] = $value;
-            }
-        }
-
-        try {
-            $testResult = $this->{$this->methodName}(...$namedArguments, ...$positionalArguments);
-        } catch (Throwable $exception) {
-            if (!$this->shouldExceptionExpectationsBeVerified($exception)) {
-                throw $exception;
-            }
-
-            $this->verifyExceptionExpectations($exception);
-
-            return null;
-        }
-
-        $this->expectedExceptionWasNotRaised();
-
-        return $testResult;
-    }
-
     /**
      * This method is a wrapper for the ini_set() function that automatically
      * resets the modified php.ini setting to its original value after the
@@ -1681,6 +1642,43 @@ protected function onNotSuccessfulTest(Throwable $t): never
         throw $t;
     }
 
+    /**
+     * @throws AssertionFailedError
+     * @throws Exception
+     * @throws ExpectationFailedException
+     * @throws Throwable
+     */
+    private function runTest(): mixed
+    {
+        $testArguments       = array_merge($this->data, array_values($this->dependencyInput));
+        $positionalArguments = [];
+        $namedArguments      = [];
+
+        foreach ($testArguments as $key => $value) {
+            if (is_int($key)) {
+                $positionalArguments[] = $value;
+            } else {
+                $namedArguments[$key] = $value;
+            }
+        }
+
+        try {
+            $testResult = $this->{$this->methodName}(...$namedArguments, ...$positionalArguments);
+        } catch (Throwable $exception) {
+            if (!$this->shouldExceptionExpectationsBeVerified($exception)) {
+                throw $exception;
+            }
+
+            $this->verifyExceptionExpectations($exception);
+
+            return null;
+        }
+
+        $this->expectedExceptionWasNotRaised();
+
+        return $testResult;
+    }
+
     /**
      * @throws ExpectationFailedException
      */