Merge branch '2.8'

Author: wouterj

components/serializer.rst

@@ -224,7 +224,7 @@ and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::
     $nameConverter = new OrgPrefixNameConverter();
     $normalizer = new PropertyNormalizer(null, $nameConverter);
 
-    $serializer = new Serializer(array(new JsonEncoder()), array($normalizer));
+    $serializer = new Serializer(array($normalizer), array(new JsonEncoder()));
 
     $obj = new Company();
     $obj->name = 'Acme Inc.';

contributing/code/standards.rst

@@ -165,10 +165,7 @@ Service Naming Conventions
 
 * Use lowercase letters for service and parameter names;
 
-* A group name uses the underscore notation;
-
-* Each service has a corresponding parameter containing the class name,
-  following the ``SERVICE NAME.class`` convention.
+* A group name uses the underscore notation.
 
 Documentation
 -------------

cookbook/logging/monolog_email.rst

@@ -7,7 +7,7 @@ How to Configure Monolog to Email Errors
 Monolog_ can be configured to send an email when an error occurs with an
 application. The configuration for this requires a few nested handlers
 in order to avoid receiving too many emails. This configuration looks
-complicated at first but each handler is fairly straight forward when
+complicated at first but each handler is fairly straightforward when
 it is broken down.
 
 .. configuration-block::

cookbook/security/form_login_setup.rst

@@ -215,7 +215,7 @@ Finally, create the template:
         {# ... you will probably extends your base template, like base.html.twig #}
 
         {% if error %}
-            <div>{{ error.messageKey|trans(error.messageData) }}</div>
+            <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
         {% endif %}
 
         <form action="{{ path('login_check') }}" method="post">

cookbook/security/voters_data_permission.rst

@@ -203,7 +203,6 @@ from the authorization checker is called.
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
     class PostController extends Controller
     {
@@ -213,9 +212,14 @@ from the authorization checker is called.
             $post = ...;
 
             // keep in mind, this will call all registered security voters
-            if (false === $this->get('security.authorization_checker')->isGranted('view', $post)) {
-                throw new AccessDeniedException('Unauthorised access!');
-            }
+            $this->denyAccessUnlessGranted('view', $post, 'Unauthorized access!');
+            
+            // the equivalent code without using the denyAccessUnlessGranted() shortcut
+            // use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+            //
+            // if (false === $this->get('security.authorization_checker')->isGranted('view', $post)) {
+            //     throw new AccessDeniedException('Unauthorized access!');
+            // }
 
             return new Response('<h1>'.$post->getName().'</h1>');
         }
@@ -225,4 +229,8 @@ from the authorization checker is called.
     The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
     to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
+.. versionadded:: 2.6
+    The ``denyAccessUnlessGranted()`` method was introduced in Symfony 2.6 as a shortcut.
+    It uses ``security.authorization_checker`` and throws an ``AccessDeniedException`` if needed.
+
 It's that easy!

quick_tour/the_big_picture.rst

@@ -156,7 +156,7 @@ because that will be explained in the next section)::
     class DefaultController extends Controller
     {
         /**
-         * @Route("/", name="homepage")
+         * @Route("/app/example", name="homepage")
          */
         public function indexAction()
         {
@@ -198,7 +198,7 @@ at the three lines of code above the ``indexAction`` method::
     class DefaultController extends Controller
     {
         /**
-         * @Route("/", name="homepage")
+         * @Route("/app/example", name="homepage")
          */
         public function indexAction()
         {
@@ -219,10 +219,10 @@ the application homepage. The second value of ``@Route()`` (e.g.
 ``name="homepage"``) is optional and sets the name of this route. For now
 this name is not needed, but later it'll be useful for linking pages.
 
-Considering all this, the ``@Route("/", name="homepage")`` annotation creates
-a new route called ``homepage`` which makes Symfony execute the ``index``
-action of the ``Default`` controller when the user browses the ``/`` path
-of the application.
+Considering all this, the ``@Route("/app/example", name="homepage")`` annotation
+creates a new route called ``homepage`` which makes Symfony execute the
+``index`` action of the ``Default`` controller when the user browses the 
+``/app/example`` path of the application.
 
 .. tip::
 

reference/constraints/All.rst

@@ -4,21 +4,21 @@ All
 When applied to an array (or Traversable object), this constraint allows
 you to apply a collection of constraints to each element of the array.
 
-+----------------+------------------------------------------------------------------------+
-| Applies to     | :ref:`property or method <validation-property-target>`                 |
-+----------------+------------------------------------------------------------------------+
-| Options        | - `constraints`_                                                       |
-|                | - `payload`_                                                           |
-+----------------+------------------------------------------------------------------------+
-| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\All`               |
-+----------------+------------------------------------------------------------------------+
-| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\AllValidator`      |
-+----------------+------------------------------------------------------------------------+
++----------------+-------------------------------------------------------------------+
+| Applies to     | :ref:`property or method <validation-property-target>`            |
++----------------+-------------------------------------------------------------------+
+| Options        | - `constraints`_                                                  |
+|                | - `payload`_                                                      |
++----------------+-------------------------------------------------------------------+
+| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\All`          |
++----------------+-------------------------------------------------------------------+
+| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\AllValidator` |
++----------------+-------------------------------------------------------------------+
 
 Basic Usage
 -----------
 
-Suppose that you have an array of strings, and you want to validate each
+Suppose that you have an array of strings and you want to validate each
 entry in that array:
 
 .. configuration-block::

reference/constraints/Blank.rst

@@ -3,19 +3,19 @@ Blank
 
 Validates that a value is blank, defined as equal to a blank string or equal
 to ``null``. To force that a value strictly be equal to ``null``, see the
-:doc:`/reference/constraints/Null` constraint. To force that a value is *not*
-blank, see :doc:`/reference/constraints/NotBlank`.
-
-+----------------+-----------------------------------------------------------------------+
-| Applies to     | :ref:`property or method <validation-property-target>`                |
-+----------------+-----------------------------------------------------------------------+
-| Options        | - `message`_                                                          |
-|                | - `payload`_                                                          |
-+----------------+-----------------------------------------------------------------------+
-| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Blank`            |
-+----------------+-----------------------------------------------------------------------+
-| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\BlankValidator`   |
-+----------------+-----------------------------------------------------------------------+
+:doc:`/reference/constraints/Null` constraint. To force that a value is
+*not* blank, see :doc:`/reference/constraints/NotBlank`.
+
++----------------+---------------------------------------------------------------------+
+| Applies to     | :ref:`property or method <validation-property-target>`              |
++----------------+---------------------------------------------------------------------+
+| Options        | - `message`_                                                        |
+|                | - `payload`_                                                        |
++----------------+---------------------------------------------------------------------+
+| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Blank`          |
++----------------+---------------------------------------------------------------------+
+| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\BlankValidator` |
++----------------+---------------------------------------------------------------------+
 
 Basic Usage
 -----------

reference/constraints/Callback.rst

@@ -2,10 +2,10 @@ Callback
 ========
 
 The purpose of the Callback constraint is to create completely custom
-validation rules and to assign any validation errors to specific fields on
-your object. If you're using validation with forms, this means that you can
-make these custom errors display next to a specific field, instead of simply
-at the top of your form.
+validation rules and to assign any validation errors to specific fields
+on your object. If you're using validation with forms, this means that you
+can make these custom errors display next to a specific field, instead of
+simply at the top of your form.
 
 This process works by specifying one or more *callback* methods, each of
 which will be called during the validation process. Each of those methods
@@ -93,9 +93,9 @@ Configuration
 The Callback Method
 -------------------
 
-The callback method is passed a special ``ExecutionContextInterface`` object. You
-can set "violations" directly on this object and determine to which field
-those errors should be attributed::
+The callback method is passed a special ``ExecutionContextInterface`` object.
+You can set "violations" directly on this object and determine to which
+field those errors should be attributed::
 
     // ...
     use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -160,10 +160,10 @@ have access to the object instance, they receive the object as the first argumen
 External Callbacks and Closures
 -------------------------------
 
-If you want to execute a static callback method that is not located in the class
-of the validated object, you can configure the constraint to invoke an array
-callable as supported by PHP's :phpfunction:`call_user_func` function. Suppose
-your validation function is ``Vendor\Package\Validator::validate()``::
+If you want to execute a static callback method that is not located in the
+class of the validated object, you can configure the constraint to invoke
+an array callable as supported by PHP's :phpfunction:`call_user_func` function.
+Suppose your validation function is ``Vendor\Package\Validator::validate()``::
 
     namespace Vendor\Package;
 
@@ -243,8 +243,8 @@ You can then use the following configuration to invoke this validator:
 
 .. note::
 
-    The Callback constraint does *not* support global callback functions nor
-    is it possible to specify a global function or a :term:`service` method
+    The Callback constraint does *not* support global callback functions
+    nor is it possible to specify a global function or a :term:`service` method
     as callback. To validate using a service, you should
     :doc:`create a custom validation constraint </cookbook/validation/custom_constraint>`
     and add that new constraint to your class.

reference/constraints/CardScheme.rst

@@ -1,9 +1,9 @@
 CardScheme
 ==========
 
-This constraint ensures that a credit card number is valid for a given credit card
-company. It can be used to validate the number before trying to initiate a payment
-through a payment gateway.
+This constraint ensures that a credit card number is valid for a given credit
+card company. It can be used to validate the number before trying to initiate
+a payment through a payment gateway.
 
 +----------------+--------------------------------------------------------------------------+
 | Applies to     | :ref:`property or method <validation-property-target>`                   |
@@ -35,7 +35,10 @@ on an object that will contain a credit card number.
         class Transaction
         {
             /**
-             * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")
+             * @Assert\CardScheme(
+             *     schemes={"VISA"},
+             *     message="Your credit card number is invalid."
+             * )
              */
             protected $cardNumber;
         }
@@ -101,9 +104,9 @@ schemes
 
 **type**: ``mixed`` [:ref:`default option <validation-default-option>`]
 
-This option is required and represents the name of the number scheme used to
-validate the credit card number, it can either be a string or an array. Valid
-values are:
+This option is required and represents the name of the number scheme used
+to validate the credit card number, it can either be a string or an array.
+Valid values are:
 
 * ``AMEX``
 * ``CHINA_UNIONPAY``
@@ -116,7 +119,8 @@ values are:
 * ``MASTERCARD``
 * ``VISA``
 
-For more information about the used schemes, see `Wikipedia: Issuer identification number (IIN)`_.
+For more information about the used schemes, see
+`Wikipedia: Issuer identification number (IIN)`_.
 
 message
 ~~~~~~~