From 14f39fe0cefc7d7683791533fa46b28d6cd235d4 Mon Sep 17 00:00:00 2001 From: Dan Hemberger <846186+hemberger@users.noreply.github.com> Date: Tue, 19 Apr 2022 12:50:32 -0700 Subject: [PATCH] Use never return typehint (#1654) The `never` return typehint was added in PHP 8.1 and can be used to indicate that a function will never return. RFC: https://wiki.php.net/rfc/noreturn_type --- src/Monolog/ErrorHandler.php | 5 +---- src/Monolog/Utils.php | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php index 16794be6..3fb86bce 100644 --- a/src/Monolog/ErrorHandler.php +++ b/src/Monolog/ErrorHandler.php @@ -175,10 +175,7 @@ class ErrorHandler ]; } - /** - * @phpstan-return never - */ - private function handleException(\Throwable $e): void + private function handleException(\Throwable $e): never { $level = LogLevel::ERROR; foreach ($this->uncaughtExceptionLevelMap as $class => $candidate) { diff --git a/src/Monolog/Utils.php b/src/Monolog/Utils.php index e8c9d893..9ad8cecc 100644 --- a/src/Monolog/Utils.php +++ b/src/Monolog/Utils.php @@ -165,10 +165,8 @@ final class Utils * @param int $code return code of json_last_error function * @param mixed $data data that was meant to be encoded * @throws \RuntimeException - * - * @return never */ - private static function throwEncodeError(int $code, $data): void + private static function throwEncodeError(int $code, $data): never { switch ($code) { case JSON_ERROR_DEPTH: