Skip to content

Commit e851aa5

Browse files
feature #32470 Rename ErrorCatcher to ErrorRenderer (rendering part only) (yceruto)
This PR was squashed before being merged into the 4.4 branch (closes #32470). Discussion ---------- Rename ErrorCatcher to ErrorRenderer (rendering part only) | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Follow up symfony/symfony#32377 Commits ------- fb5b042 Rename ErrorCatcher to ErrorRenderer (rendering part only)
2 parents 887be66 + 015f0ef commit e851aa5

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

DataCollector/ExceptionDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\HttpKernel\DataCollector;
1313

14-
use Symfony\Component\ErrorCatcher\Exception\FlattenException;
14+
use Symfony\Component\ErrorRenderer\Exception\FlattenException;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717

EventListener/DebugHandlersListener.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
use Symfony\Component\Console\Output\ConsoleOutputInterface;
1818
use Symfony\Component\Debug\ErrorHandler;
1919
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;
2323
use Symfony\Component\EventDispatcher\Event;
2424
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
2525
use Symfony\Component\HttpFoundation\Request;
@@ -46,7 +46,7 @@ class DebugHandlersListener implements EventSubscriberInterface
4646
private $fileLinkFormat;
4747
private $scope;
4848
private $charset;
49-
private $errorFormatter;
49+
private $errorRenderer;
5050
private $firstCall = true;
5151
private $hasTerminatedWithException;
5252

@@ -59,7 +59,7 @@ class DebugHandlersListener implements EventSubscriberInterface
5959
* @param string|FileLinkFormatter|null $fileLinkFormat The format for links to source files
6060
* @param bool $scope Enables/disables scoping mode
6161
*/
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)
6363
{
6464
$this->exceptionHandler = $exceptionHandler;
6565
$this->logger = $logger;
@@ -69,7 +69,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
6969
$this->fileLinkFormat = $fileLinkFormat;
7070
$this->scope = $scope;
7171
$this->charset = $charset;
72-
$this->errorFormatter = $errorFormatter;
72+
$this->errorRenderer = $errorRenderer;
7373
}
7474

7575
/**
@@ -167,16 +167,16 @@ public function onKernelException(GetResponseForExceptionEvent $event)
167167

168168
$debug = $this->scream && $this->scope;
169169
$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)]);
172172
}
173173

174174
$e = $request->attributes->get('exception');
175175

176176
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());
178178
} 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());
180180
}
181181
};
182182

EventListener/ExceptionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\EventListener;
1313

1414
use Psr\Log\LoggerInterface;
15-
use Symfony\Component\ErrorCatcher\Exception\FlattenException;
15+
use Symfony\Component\ErrorRenderer\Exception\FlattenException;
1616
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1717
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1818
use Symfony\Component\HttpFoundation\Request;

Tests/DataCollector/ExceptionDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Tests\DataCollector;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\ErrorCatcher\Exception\FlattenException;
15+
use Symfony\Component\ErrorRenderer\Exception\FlattenException;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\Response;
1818
use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/debug": "^4.4|^5.0",
21-
"symfony/error-catcher": "^4.4|^5.0",
21+
"symfony/error-renderer": "^4.4|^5.0",
2222
"symfony/event-dispatcher": "^4.3",
2323
"symfony/http-foundation": "^4.4|^5.0",
2424
"symfony/polyfill-ctype": "^1.8",

0 commit comments

Comments
 (0)