Skip to content

Commit 8e73467

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Updated a link to Debug component Remove ErrorRenderer reference everywhere
2 parents 13b8820 + 1ca59e0 commit 8e73467

File tree

6 files changed

+7
-176
lines changed

6 files changed

+7
-176
lines changed

components/error_handler.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ to enable this error handler::
6767

6868
ErrorHandler::register();
6969

70-
.. tip::
71-
72-
If you want to get even better exception pages, install the
73-
:doc:`ErrorRenderer component </components/error_renderer>` too.
74-
7570
Catching PHP Function Errors and Turning Them into Exceptions
7671
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
7772

@@ -145,11 +140,6 @@ to enable this exception handler::
145140

146141
ExceptionHandler::register();
147142

148-
.. tip::
149-
150-
If you want to get even better exception pages, install the
151-
:doc:`ErrorRenderer component </components/error_renderer>` too.
152-
153143
.. _component-debug-class-loader:
154144

155145
Class Loading Debugger

components/error_renderer.rst

Lines changed: 0 additions & 159 deletions
This file was deleted.

components/http_kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ below for more details).
554554
The listener has several goals:
555555

556556
1) The thrown exception is converted into a
557-
:class:`Symfony\\Component\\ErrorRenderer\\Exception\\FlattenException`
557+
:class:`Symfony\\Component\\ErrorHandler\\Exception\\FlattenException`
558558
object, which contains all the information about the request, but which
559559
can be printed and serialized.
560560

components/phpunit_bridge.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,9 @@ Deprecation Notices at Autoloading Time
311311
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
312312

313313
By default, the PHPUnit Bridge uses ``DebugClassLoader`` from the
314-
`Debug component`_ to throw deprecation notices at class autoloading time.
315-
This can be disabled with the ``debug-class-loader`` option.
314+
:doc:`ErrorHandler component </components/error_handler>`_ to throw deprecation
315+
notices at class autoloading time. This can be disabled with the
316+
``debug-class-loader`` option.
316317

317318
.. code-block:: xml
318319
@@ -962,4 +963,3 @@ not find the SUT:
962963
.. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
963964
.. _`@covers`: https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers
964965
.. _`PHP namespace resolutions rules`: https://php.net/manual/en/language.namespaces.rules.php
965-
.. _Debug component: https://github.com/symfony/debug

controller/error_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ the request that will be dispatched to your controller. In addition, your contro
247247
will be passed two parameters:
248248

249249
``exception``
250-
A :class:`\\Symfony\\Component\\ErrorRenderer\\Exception\\FlattenException`
250+
A :class:`\\Symfony\\Component\\ErrorHandler\\Exception\\FlattenException`
251251
instance created from the exception being handled.
252252

253253
``logger``

create_framework/http_kernel_httpkernel_class.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Our code is now much more concise and surprisingly more robust and more
6969
powerful than ever. For instance, use the built-in ``ExceptionListener`` to
7070
make your error management configurable::
7171

72-
$errorHandler = function (Symfony\Component\ErrorRenderer\Exception\FlattenException $exception) {
72+
$errorHandler = function (Symfony\Component\ErrorHandler\Exception\FlattenException $exception) {
7373
$msg = 'Something went wrong! ('.$exception->getMessage().')';
7474

7575
return new Response($msg, $exception->getStatusCode());
@@ -91,7 +91,7 @@ The error controller reads as follows::
9191
// example.com/src/Calendar/Controller/ErrorController.php
9292
namespace Calendar\Controller;
9393

94-
use Symfony\Component\ErrorRenderer\Exception\FlattenException;
94+
use Symfony\Component\ErrorHandler\Exception\FlattenException;
9595
use Symfony\Component\HttpFoundation\Response;
9696

9797
class ErrorController

0 commit comments

Comments
 (0)