Skip to content

Commit

Permalink
minor #4737 [Book][Security] add missing versionadded directive (xabbuh)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.6 branch.

Discussion
----------

[Book][Security] add missing versionadded directive

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6+
| Fixed tickets |

The `versionadded` directive was present when #3995 was merged, but it
apparently got lost in one the refactorings of the chapter afterwards.

Commits
-------

c0c6dab add missing versionadded directive
  • Loading branch information
wouterj committed Jan 2, 2015
2 parents 57fdea6 + c0c6dab commit caa2be6
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions book/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ user to be logged in to access this URL:
# ...
firewalls:
# ...
access_control:
# require ROLE_ADMIN for /admin*
- { path: ^/admin, roles: ROLE_ADMIN }
Expand Down Expand Up @@ -676,7 +676,7 @@ URL pattern. You saw this earlier, where anything matching the regular expressio
# ...
firewalls:
# ...
access_control:
# require ROLE_ADMIN for /admin*
- { path: ^/admin, roles: ROLE_ADMIN }
Expand Down Expand Up @@ -870,9 +870,9 @@ in this chapter).
Be careful with this in your layout or on your error pages! Because of
some internal Symfony details, to avoid broken error pages in the ``prod``
environment, wrap calls in these templates with a check for ``app.user``:

.. code-block:: html+jinja

{% if app.user and is_granted('ROLE_ADMIN') %}

Securing other Services
Expand Down Expand Up @@ -1036,7 +1036,7 @@ the User object, and use the ``isGranted`` method (or

// boo :(. Never check for the User object to see if they're logged in
if ($this->getUser()) {

}

Retrieving the User in a Template
Expand All @@ -1055,7 +1055,7 @@ key:

.. code-block:: html+php

<?php if ($view['security']->isGranted('IS_AUTHENTICATED_FULLY')): ?>
<?php if ($view['security']->isGranted('IS_AUTHENTICATED_FULLY')): ?>
<p>Username: <?php echo $app->getUser()->getUsername() ?></p>
<?php endif; ?>

Expand Down Expand Up @@ -1148,7 +1148,7 @@ Next, you'll need to create a route for this URL (but not a controller):
return $collection;
And that's it! By sending a user to ``/logout`` (or whatever you configure
the ``path`` to be), Symfony will un-authenticate the current user. and
the ``path`` to be), Symfony will un-authenticate the current user. and
redirect them the homepage (the value defined by ``target``).

Once the user has been logged out, they will be redirected to whatever path
Expand Down Expand Up @@ -1180,6 +1180,9 @@ in the following way from a controller::

$user->setPassword($encoded);

.. versionadded:: 2.6
The ``security.password_encoder`` service was introduced in Symfony 2.6.

In order for this to work, just make sure that you have the encoder for your
user class (e.g. ``AppBundle\Entity\User``) configured under the ``encoders``
key in ``app/config/security.yml``.
Expand Down

0 comments on commit caa2be6

Please sign in to comment.