Skip to content

Commit 0444876

Browse files
committed
renamed the ErrorHandler component to ErrorCatcher
1 parent 8acece1 commit 0444876

File tree

8 files changed

+14
-15
lines changed

8 files changed

+14
-15
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\ErrorHandler\Exception\FlattenException;
14+
use Symfony\Component\ErrorCatcher\Exception\FlattenException;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717

DataCollector/LoggerDataCollector.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\ErrorHandler\Exception\SilencedErrorContext;
14+
use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\RequestStack;
1717
use Symfony\Component\HttpFoundation\Response;

EventListener/DebugHandlersListener.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
use Symfony\Component\Console\ConsoleEvents;
1616
use Symfony\Component\Console\Event\ConsoleEvent;
1717
use Symfony\Component\Console\Output\ConsoleOutputInterface;
18-
use Symfony\Component\ErrorHandler\ErrorHandler;
19-
use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRenderer;
20-
use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
21-
use Symfony\Component\ErrorHandler\Exception\ErrorRendererNotFoundException;
22-
use Symfony\Component\ErrorHandler\ExceptionHandler;
18+
use Symfony\Component\ErrorCatcher\ErrorHandler;
19+
use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRenderer;
20+
use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer;
21+
use Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException;
22+
use Symfony\Component\ErrorCatcher\ExceptionHandler;
2323
use Symfony\Component\EventDispatcher\Event;
2424
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
2525
use Symfony\Component\HttpFoundation\Request;

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\ErrorHandler\Exception\FlattenException;
15+
use Symfony\Component\ErrorCatcher\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\ErrorHandler\Exception\FlattenException;
15+
use Symfony\Component\ErrorCatcher\Exception\FlattenException;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\Response;
1818
use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;

Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 2 additions & 2 deletions
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\ErrorHandler\Exception\SilencedErrorContext;
15+
use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\RequestStack;
1818
use Symfony\Component\HttpFoundation\Response;
@@ -106,7 +106,7 @@ public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount
106106
$logs = array_map(function ($v) {
107107
if (isset($v['context']['exception'])) {
108108
$e = &$v['context']['exception'];
109-
$e = isset($e["\0*\0message"]) ? [$e["\0*\0message"], $e["\0*\0severity"]] : [$e["\0Symfony\Component\ErrorHandler\Exception\SilencedErrorContext\0severity"]];
109+
$e = isset($e["\0*\0message"]) ? [$e["\0*\0message"], $e["\0*\0severity"]] : [$e["\0Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext\0severity"]];
110110
}
111111

112112
return $v;

Tests/EventListener/DebugHandlersListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
use Symfony\Component\Console\Helper\HelperSet;
2020
use Symfony\Component\Console\Input\ArgvInput;
2121
use Symfony\Component\Console\Output\ConsoleOutput;
22-
use Symfony\Component\ErrorHandler\ErrorHandler;
23-
use Symfony\Component\ErrorHandler\ExceptionHandler;
22+
use Symfony\Component\ErrorCatcher\ErrorHandler;
23+
use Symfony\Component\ErrorCatcher\ExceptionHandler;
2424
use Symfony\Component\EventDispatcher\EventDispatcher;
2525
use Symfony\Component\HttpFoundation\Request;
2626
use Symfony\Component\HttpKernel\Event\KernelEvent;

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/error-handler": "^4.4",
20+
"symfony/error-catcher": "^4.4|^5.0",
2121
"symfony/event-dispatcher": "^4.3",
2222
"symfony/http-foundation": "^4.4|^5.0",
23-
"symfony/debug": "^4.4|^5.0",
2423
"symfony/polyfill-ctype": "^1.8",
2524
"symfony/polyfill-php73": "^1.9",
2625
"psr/log": "~1.0"

0 commit comments

Comments
 (0)