Permalink
Browse files

bug #4548 Remove ExpressionLanguage reference for 2.3 version (dangar…

…zon)

This PR was merged into the 2.3 branch.

Discussion
----------

Remove ExpressionLanguage reference for 2.3 version

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3 only
| Fixed tickets |

Remove "Using Expressions for Complex Security Restrictions" section using ExpressionLanguage in 2.3 version.

ExpressionLanguage is a 2.4 feature.

Commits
-------

d1e7334 Remove ExpressionLanguage reference for 2.3 version
  • Loading branch information...
weaverryan committed Dec 7, 2014
2 parents 107610e + d1e7334 commit df60ba7d9e74abf5dc0e7ec601874503829358ee
Showing with 6 additions and 2 deletions.
  1. +6 −2 best_practices/security.rst
@@ -123,6 +123,7 @@ Using ``@Security``, this looks like:
// ...
}
<<<<<<< HEAD
Using Expressions for Complex Security Restrictions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -207,6 +208,9 @@ Now you can reuse this method both in the template and in the security expressio
{% endif %}
.. _best-practices-directly-isGranted:
=======
.. _best-practices-directy-isGranted:
>>>>>>> pull/4548
Checking Permissions without @Security
--------------------------------------
@@ -350,9 +354,9 @@ If your company uses a user login method not supported by Symfony, you can
develop :doc:`your own user provider </cookbook/security/custom_provider>` and
:doc:`your own authentication provider </cookbook/security/custom_authentication_provider>`.
.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
.. _`Security Cookbook Section`: http://symfony.com/doc/current/cookbook/security/index.html
.. _`security.yml`: http://symfony.com/doc/current/reference/configuration/security.html
.. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
.. _`security voter`: http://symfony.com/doc/current/cookbook/security/voters_data_permission.html
.. _`ACL's`: http://symfony.com/doc/current/cookbook/security/acl.html
.. _`expression`: http://symfony.com/doc/current/components/expression_language/introduction.html
.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle

0 comments on commit df60ba7

Please sign in to comment.