From a0850660006b47c284161868a5f061ecc6cbd430 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 8 Oct 2019 20:15:43 +0200 Subject: [PATCH 1/3] Fix bc compatiblity between ErrorRenderer FlattenException and Debug FlattenException --- .../ErrorRenderer/Exception/FlattenException.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php index 56a5221ed86ca..6c6348a672fee 100644 --- a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php @@ -37,6 +37,14 @@ class FlattenException private $file; private $line; + /** + * @deprecated since Symfony 4.4, use createFromThrowable instead. + */ + public static function create(\Exception $exception, $statusCode = null, array $headers = []) + { + return static::createFromThrowable($exception, $statusCode, $headers); + } + public static function createFromThrowable(\Throwable $exception, int $statusCode = null, array $headers = []): self { $e = new static(); From 6ca18809f26175428c5c19aa752024d2676f429e Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 8 Oct 2019 20:17:53 +0200 Subject: [PATCH 2/3] Add bc trigger message --- .../Component/ErrorRenderer/Exception/FlattenException.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php index 6c6348a672fee..8a9309bd45fa6 100644 --- a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php @@ -38,10 +38,12 @@ class FlattenException private $line; /** - * @deprecated since Symfony 4.4, use createFromThrowable instead. + * @deprecated since Symfony 4.4, use createFromThrowable() instead. */ public static function create(\Exception $exception, $statusCode = null, array $headers = []) { + @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.4, use "createFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED); + return static::createFromThrowable($exception, $statusCode, $headers); } From 2784403d8d6a9b50808e471b37e999277b1d8f3c Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 8 Oct 2019 20:18:40 +0200 Subject: [PATCH 3/3] Fix coding style --- .../Component/ErrorRenderer/Exception/FlattenException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php index 8a9309bd45fa6..b02ecf5d22b47 100644 --- a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php @@ -43,7 +43,7 @@ class FlattenException public static function create(\Exception $exception, $statusCode = null, array $headers = []) { @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.4, use "createFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED); - + return static::createFromThrowable($exception, $statusCode, $headers); }