Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 29664fb

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.5'
2 parents 8f69f0e + c042934 commit 29664fb
Copy full SHA for 29664fb

File tree

Expand file treeCollapse file tree

7 files changed

+52
-25
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+52
-25
lines changed

‎book/translation.rst

Copy file name to clipboardExpand all lines: book/translation.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ Translating Database Content
647647

648648
The translation of database content should be handled by Doctrine through
649649
the `Translatable Extension`_ or the `Translatable Behavior`_ (PHP 5.4+).
650-
For more information, see the documentation for thes libraries.
650+
For more information, see the documentation for these libraries.
651651

652652
Debugging Translations
653653
----------------------

‎components/event_dispatcher/traceable_dispatcher.rst

Copy file name to clipboardExpand all lines: components/event_dispatcher/traceable_dispatcher.rst
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
The Traceable Event Dispatcher
66
==============================
77

8-
The :class:`Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher`
8+
.. versionadded:: 2.5
9+
The ``TraceableEventDispatcher`` class was moved to the EventDispatcher
10+
component in Symfony 2.5. Before, it was located in the HttpKernel component.
11+
12+
The :class:`Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher`
913
is an event dispatcher that wraps any other event dispatcher and can then
1014
be used to determine which event listeners have been called by the dispatcher.
1115
Pass the event dispatcher to be wrapped and an instance of the
1216
:class:`Symfony\\Component\\Stopwatch\\Stopwatch` to its constructor::
1317

14-
use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
18+
use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
1519
use Symfony\Component\Stopwatch\Stopwatch;
1620

1721
// the event dispatcher to debug

‎contributing/documentation/standards.rst

Copy file name to clipboardExpand all lines: contributing/documentation/standards.rst
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ Files and Directories
9292
* When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
9393
top level directory. E.g.
9494

95+
.. code-block:: text
96+
9597
your-project/
9698
├─ app/
9799
├─ src/

‎cookbook/console/commands_as_services.rst

Copy file name to clipboardExpand all lines: cookbook/console/commands_as_services.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ have some ``NameRepository`` service that you'll use to get your default value::
9090

9191
public function __construct(NameRepository $nameRepository)
9292
{
93-
parent::__construct();
94-
9593
$this->nameRepository = $nameRepository;
94+
95+
parent::__construct();
9696
}
9797

9898
protected function configure()

‎cookbook/controller/error_pages.rst

Copy file name to clipboardExpand all lines: cookbook/controller/error_pages.rst
+37-13Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,12 @@ the status code that should be set for the given exception.
1414
Error pages can be customized in two different ways, depending on how much
1515
control you need:
1616

17-
1. Customize the error templates of the different error pages (explained below);
17+
1. Customize the error templates of the different error pages;
1818

19-
2. Replace the default exception controller ``twig.controller.exception:showAction``
20-
with your own controller and handle it however you want (see
21-
:ref:`exception_controller in the Twig reference <config-twig-exception-controller>`).
22-
The default exception controller is registered as a service - the actual
23-
class is ``Symfony\Bundle\TwigBundle\Controller\ExceptionController``.
19+
2. Replace the default exception controller ``twig.controller.exception:showAction``.
2420

25-
.. tip::
26-
27-
The customization of exception handling is actually much more powerful
28-
than what's written here. An internal event, ``kernel.exception``, is thrown
29-
which allows complete control over exception handling. For more
30-
information, see :ref:`kernel-kernel.exception`.
21+
The default ExceptionController
22+
-------------------------------
3123

3224
The default ``ExceptionController`` will either display an
3325
*exception* or *error* page, depending on the setting of the ``kernel.debug``
@@ -43,9 +35,12 @@ shown to the end-user.
4335

4436
The third-party `WebfactoryExceptionsBundle`_ provides a special
4537
test controller that allows you to display your custom error
46-
pages for arbitrary HTTP status codes even with
38+
pages for arbitrary HTTP status codes even with
4739
``kernel.debug`` set to ``true``.
4840

41+
Override Error Templates
42+
------------------------
43+
4944
All of the error templates live inside the TwigBundle. To override the
5045
templates, simply rely on the standard method for overriding templates that
5146
live inside a bundle. For more information, see
@@ -129,3 +124,32 @@ Symfony uses the following algorithm to determine which template to use:
129124
``exception.json.twig`` for the JSON exception page.
130125

131126
.. _`WebfactoryExceptionsBundle`: https://github.com/webfactory/exceptions-bundle
127+
128+
Replace the default Exception Controller
129+
----------------------------------------
130+
131+
If you need a little more flexibility beyond just overriding the template
132+
(e.g. you need to pass some additional variables into your template),
133+
then you can override the controller that renders the error page.
134+
135+
The default exception controller is registered as a service - the actual
136+
class is ``Symfony\Bundle\TwigBundle\Controller\ExceptionController``.
137+
138+
To do this, create a new controller class and make it extend Symfony's default
139+
``Symfony\Bundle\TwigBundle\Controller\ExceptionController`` class.
140+
141+
There are several methods you can override to customize different parts of how
142+
the error page is rendered. You could, for example, override the entire
143+
``showAction`` or just the ``findTemplate`` method, which locates which
144+
template should be rendered.
145+
146+
To make Symfony use your exception controller instead of the default, set the
147+
:ref:`twig.exception_controller <config-twig-exception-controller>` option
148+
in app/config/config.yml.
149+
150+
.. tip::
151+
152+
The customization of exception handling is actually much more powerful
153+
than what's written here. An internal event, ``kernel.exception``, is thrown
154+
which allows complete control over exception handling. For more
155+
information, see :ref:`kernel-kernel.exception`.

‎cookbook/security/custom_authentication_provider.rst

Copy file name to clipboardExpand all lines: cookbook/security/custom_authentication_provider.rst
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,6 @@ set an authenticated token in the security context if successful.
159159
// $this->securityContext->setToken(null);
160160
// }
161161
// return;
162-
163-
// Deny authentication with a '403 Forbidden' HTTP response
164-
$response = new Response();
165-
$response->setStatusCode(Response::HTTP_FORBIDDEN);
166-
$event->setResponse($response);
167-
168162
}
169163
170164
// By default deny authorization

‎cookbook/security/pre_authenticated.rst

Copy file name to clipboardExpand all lines: cookbook/security/pre_authenticated.rst
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ in the x509 firewall configuration respectively.
7070

7171
An authentication provider will only inform the user provider of the username
7272
that made the request. You will need to create (or use) a "user provider" that
73-
turns that username into a User object of your choice:
73+
is referenced by the ``provider`` configuration parameter (``your_user_provider``
74+
in the configuration example). This provider will turn the username into a User
75+
object of your choice. For more information on creating or configuring a user
76+
provider, see:
7477

7578
* :doc:`/cookbook/security/custom_provider`
7679
* :doc:`/cookbook/security/entity_provider`

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.