Use never return type declaration instead of never-return type annotation

Author: sebastianbergmann

src/Framework/Assert.php

@@ -2353,10 +2353,8 @@ final public static function objectEquals(object $object, string $method = 'equa
      * Fails a test with the given message.
      *
      * @throws AssertionFailedError
-     *
-     * @psalm-return never-return
      */
-    final public static function fail(string $message = ''): void
+    final public static function fail(string $message = ''): never
     {
         self::$count++;
 
@@ -2367,10 +2365,8 @@ final public static function fail(string $message = ''): void
      * Mark the test as incomplete.
      *
      * @throws IncompleteTestError
-     *
-     * @psalm-return never-return
      */
-    final public static function markTestIncomplete(string $message = ''): void
+    final public static function markTestIncomplete(string $message = ''): never
     {
         throw new IncompleteTestError($message);
     }
@@ -2380,10 +2376,8 @@ final public static function markTestIncomplete(string $message = ''): void
      *
      * @throws SkippedWithMessageException
      * @throws SyntheticSkippedError
-     *
-     * @psalm-return never-return
      */
-    final public static function markTestSkipped(string $message = ''): void
+    final public static function markTestSkipped(string $message = ''): never
     {
         if ($hint = self::detectLocationHint($message)) {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);

src/Framework/Constraint/Constraint.php

@@ -88,10 +88,8 @@ protected function matches(mixed $other): bool
      * Throws an exception for the given compared value and test description.
      *
      * @throws ExpectationFailedException
-     *
-     * @psalm-return never-return
      */
-    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): void
+    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never
     {
         $failureDescription = sprintf(
             'Failed asserting that %s.',

src/Framework/Constraint/JsonMatches.php

@@ -66,10 +66,8 @@ protected function matches(mixed $other): bool
      *
      * @throws \PHPUnit\Framework\Exception
      * @throws ExpectationFailedException
-     *
-     * @psalm-return never-return
      */
-    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): void
+    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never
     {
         if ($comparisonFailure === null) {
             [$error, $recodedOther] = Json::canonicalize($other);

src/Framework/ErrorTestCase.php

@@ -67,10 +67,8 @@ public function toString(): string
 
     /**
      * @throws Exception
-     *
-     * @psalm-return never-return
      */
-    protected function runTest(): mixed
+    protected function runTest(): never
     {
         throw new Error($this->message);
     }

src/Framework/IncompleteTestCase.php

@@ -66,10 +66,8 @@ public function toString(): string
 
     /**
      * @throws Exception
-     *
-     * @psalm-return never-return
      */
-    protected function runTest(): mixed
+    protected function runTest(): never
     {
         $this->markTestIncomplete($this->message);
     }

src/Framework/MockObject/Stub/Exception.php

@@ -28,10 +28,8 @@ public function __construct(Throwable $exception)
 
     /**
      * @throws Throwable
-     *
-     * @psalm-return never-return
      */
-    public function invoke(Invocation $invocation): mixed
+    public function invoke(Invocation $invocation): never
     {
         throw $this->exception;
     }

src/Framework/SkippedTestCase.php

@@ -66,10 +66,8 @@ public function toString(): string
 
     /**
      * @throws Exception
-     *
-     * @psalm-return never-return
      */
-    protected function runTest(): mixed
+    protected function runTest(): never
     {
         $this->markTestSkipped($this->message);
     }

src/Framework/TestSuite.php

@@ -573,10 +573,8 @@ public function setTests(array $tests): void
      * Mark the test suite as skipped.
      *
      * @throws SkippedTestSuiteError
-     *
-     * @psalm-return never-return
      */
-    public function markTestSuiteSkipped(string $message = ''): void
+    public function markTestSuiteSkipped(string $message = ''): never
     {
         throw new SkippedTestSuiteError($message);
     }

src/Framework/WarningTestCase.php

@@ -66,10 +66,8 @@ public function toString(): string
 
     /**
      * @throws Exception
-     *
-     * @psalm-return never-return
      */
-    protected function runTest(): mixed
+    protected function runTest(): never
     {
         throw new Warning($this->message);
     }

tests/unit/Framework/Constraint/ConstraintTest.php

@@ -42,7 +42,7 @@ final protected function reduce(): Constraint
                 return parent::reduce();
             }
 
-            final protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): void
+            final protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never
             {
                 parent::fail($other, $description, $comparisonFailure);
             }