diff --git a/src/Symfony/Component/ErrorCatcher/CHANGELOG.md b/src/Symfony/Component/ErrorCatcher/CHANGELOG.md index 094072510d..1d43626850 100644 --- a/src/Symfony/Component/ErrorCatcher/CHANGELOG.md +++ b/src/Symfony/Component/ErrorCatcher/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +5.0.0 +----- + + * removed `FlattenException::setTraceFromException()` in favor of `setTraceFromThrowable()` + 4.4.0 ----- diff --git a/src/Symfony/Component/ErrorCatcher/ErrorHandler.php b/src/Symfony/Component/ErrorCatcher/ErrorHandler.php index 635482d42a..1c6a5fd916 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorHandler.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorHandler.php @@ -378,11 +378,6 @@ class ErrorHandler */ public function handleError(int $type, string $message, string $file, int $line): bool { - // @deprecated to be removed in Symfony 5.0 - if (\PHP_VERSION_ID >= 70300 && $message && '"' === $message[0] && 0 === strpos($message, '"continue') && preg_match('/^"continue(?: \d++)?" targeting switch is equivalent to "break(?: \d++)?"\. Did you mean to use "continue(?: \d++)?"\?$/', $message)) { - $type = E_DEPRECATED; - } - // Level is the current error reporting level to manage silent error. $level = error_reporting(); $silenced = 0 === ($level & $type); diff --git a/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php b/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php index 5f6c81047f..69dd20c762 100644 --- a/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php @@ -244,16 +244,6 @@ class FlattenException return $this->trace; } - /** - * @deprecated since 4.1, use {@see setTraceFromThrowable()} instead. - */ - public function setTraceFromException(\Exception $exception) - { - @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use "setTraceFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED); - - $this->setTraceFromThrowable($exception); - } - public function setTraceFromThrowable(\Throwable $throwable) { $this->traceAsString = $throwable->getTraceAsString();