17
17
use Symfony \Component \Console \Output \ConsoleOutputInterface ;
18
18
use Symfony \Component \Debug \ErrorHandler ;
19
19
use Symfony \Component \Debug \ExceptionHandler ;
20
- use Symfony \Component \ErrorCatcher \ ErrorRenderer \ErrorFormatter ;
21
- use Symfony \Component \ErrorCatcher \ErrorRenderer \HtmlErrorRenderer ;
22
- use Symfony \Component \ErrorCatcher \Exception \ErrorRendererNotFoundException ;
20
+ use Symfony \Component \ErrorRenderer \ErrorRenderer ;
21
+ use Symfony \Component \ErrorRenderer \ErrorRenderer \HtmlErrorRenderer ;
22
+ use Symfony \Component \ErrorRenderer \Exception \ErrorRendererNotFoundException ;
23
23
use Symfony \Component \EventDispatcher \Event ;
24
24
use Symfony \Component \EventDispatcher \EventSubscriberInterface ;
25
25
use Symfony \Component \HttpFoundation \Request ;
@@ -46,7 +46,7 @@ class DebugHandlersListener implements EventSubscriberInterface
46
46
private $ fileLinkFormat ;
47
47
private $ scope ;
48
48
private $ charset ;
49
- private $ errorFormatter ;
49
+ private $ errorRenderer ;
50
50
private $ firstCall = true ;
51
51
private $ hasTerminatedWithException ;
52
52
@@ -59,7 +59,7 @@ class DebugHandlersListener implements EventSubscriberInterface
59
59
* @param string|FileLinkFormatter|null $fileLinkFormat The format for links to source files
60
60
* @param bool $scope Enables/disables scoping mode
61
61
*/
62
- public function __construct (callable $ exceptionHandler = null , LoggerInterface $ logger = null , $ levels = E_ALL , ?int $ throwAt = E_ALL , bool $ scream = true , $ fileLinkFormat = null , bool $ scope = true , string $ charset = null , ErrorFormatter $ errorFormatter = null )
62
+ public function __construct (callable $ exceptionHandler = null , LoggerInterface $ logger = null , $ levels = E_ALL , ?int $ throwAt = E_ALL , bool $ scream = true , $ fileLinkFormat = null , bool $ scope = true , string $ charset = null , ErrorRenderer $ errorRenderer = null )
63
63
{
64
64
$ this ->exceptionHandler = $ exceptionHandler ;
65
65
$ this ->logger = $ logger ;
@@ -69,7 +69,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
69
69
$ this ->fileLinkFormat = $ fileLinkFormat ;
70
70
$ this ->scope = $ scope ;
71
71
$ this ->charset = $ charset ;
72
- $ this ->errorFormatter = $ errorFormatter ;
72
+ $ this ->errorRenderer = $ errorRenderer ;
73
73
}
74
74
75
75
/**
@@ -167,16 +167,16 @@ public function onKernelException(GetResponseForExceptionEvent $event)
167
167
168
168
$ debug = $ this ->scream && $ this ->scope ;
169
169
$ controller = function (Request $ request ) use ($ debug ) {
170
- if (null === $ this ->errorFormatter ) {
171
- $ this ->errorFormatter = new ErrorFormatter ([new HtmlErrorRenderer ($ debug , $ this ->charset , $ this ->fileLinkFormat )]);
170
+ if (null === $ this ->errorRenderer ) {
171
+ $ this ->errorRenderer = new ErrorRenderer ([new HtmlErrorRenderer ($ debug , $ this ->charset , $ this ->fileLinkFormat )]);
172
172
}
173
173
174
174
$ e = $ request ->attributes ->get ('exception ' );
175
175
176
176
try {
177
- return new Response ($ this ->errorFormatter ->render ($ e , $ request ->getPreferredFormat ()), $ e ->getStatusCode (), $ e ->getHeaders ());
177
+ return new Response ($ this ->errorRenderer ->render ($ e , $ request ->getPreferredFormat ()), $ e ->getStatusCode (), $ e ->getHeaders ());
178
178
} catch (ErrorRendererNotFoundException $ _ ) {
179
- return new Response ($ this ->errorFormatter ->render ($ e ), $ e ->getStatusCode (), $ e ->getHeaders ());
179
+ return new Response ($ this ->errorRenderer ->render ($ e ), $ e ->getStatusCode (), $ e ->getHeaders ());
180
180
}
181
181
};
182
182
0 commit comments