Merge branch '2.8' into 3.4

* 2.8:
  Fix missing trailling commas
  [Serializer] Added missing ObjectNormalizer
  [Serializer] By default the serializer do not convert to lower case properties
  Added a note about named form types
  Update translation.rst
  Fixed the path of an image
  Fix UrlMatcher::match() URL
  Updated a diagram to SVG format

Author: javiereguiluz

_images/security/authentication-guard-methods.png

@@ -111,7 +111,7 @@ for the homepage of our app:
                 ->findLatest();
 
             return $this->render('default/index.html.twig', array(
-                'posts' => $posts
+                'posts' => $posts,
             ));
         }
     }

_images/security/authentication-guard-methods.svg

@@ -127,7 +127,7 @@ some developers configure form buttons in the controller::
             $form = $this->createForm(PostType::class, $post);
             $form->add('submit', SubmitType::class, array(
                 'label' => 'Create',
-                'attr'  => array('class' => 'btn btn-default pull-right')
+                'attr'  => array('class' => 'btn btn-default pull-right'),
             ));
 
             // ...

_images/sources/security/authentication-guard-methods.dia

@@ -470,7 +470,7 @@ Pass an array of values::
     // sets multiple fields at once
     $form->setValues(array('multi' => array(
         1             => 'value',
-        'dimensional' => 'an other value'
+        'dimensional' => 'an other value',
     )));
 
 This is great, but it gets better! The ``Form`` object allows you to interact

best_practices/controllers.rst

@@ -62,7 +62,7 @@ URL path and some array of custom variables in its constructor. This array
 of custom variables can be *anything* that's significant to your application,
 and is returned when that route is matched.
 
-The :method:`UrlMatcher::match() <Symfony\\Component\\Routing\\UrlMatcher::match>`
+The :method:`UrlMatcher::match() <Symfony\\Component\\Routing\\Matcher\\UrlMatcher::match>`
 returns the variables you set on the route as well as the wildcard placeholders
 (see below). Your application can now use this information to continue
 processing the request. In addition to the configured variables, a ``_route``

best_practices/forms.rst

@@ -554,9 +554,10 @@ There are several types of normalizers available:
     directly and through getters, setters, hassers, adders and removers. It supports
     calling the constructor during the denormalization process.
 
-    Objects are normalized to a map of property names (method name stripped of
-    the "get"/"set"/"has"/"remove" prefix and converted to lower case) to property
-    values.
+    Objects are normalized to a map of property names and values (names are
+    generated removing the ``get``, ``set``, ``has`` or ``remove`` prefix from
+    the method name and lowercasing the first letter; e.g. ``getFirstName()`` ->
+    ``firstName``).
 
     The ``ObjectNormalizer`` is the most powerful normalizer. It is configured by
     default when using the Symfony Standard Edition with the serializer enabled.
@@ -566,8 +567,9 @@ There are several types of normalizers available:
     (public methods starting with "get"). It will denormalize data by calling
     the constructor and the "setters" (public methods starting with "set").
 
-    Objects are normalized to a map of property names (method name stripped of
-    the "get" prefix and converted to lower case) to property values.
+    Objects are normalized to a map of property names and values (names are
+    generated removing the ``get`` prefix from the method name and lowercasing
+    the first letter; e.g. ``getFirstName()`` -> ``firstName``).
 
 :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`
     This normalizer directly reads and writes public properties as well as
@@ -699,7 +701,8 @@ Circular references are common when dealing with entity relations::
     }
 
 To avoid infinite loops, :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
-throws a :class:`Symfony\\Component\\Serializer\\Exception\\CircularReferenceException`
+or :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer`
+throw a :class:`Symfony\\Component\\Serializer\\Exception\\CircularReferenceException`
 when such a case is encountered::
 
     $member = new Member();

components/dom_crawler.rst

@@ -34,9 +34,8 @@ The constructor of the ``Translator`` class needs one argument: The locale.
 .. code-block:: php
 
     use Symfony\Component\Translation\Translator;
-    use Symfony\Component\Translation\MessageSelector;
 
-    $translator = new Translator('fr_FR', new MessageSelector());
+    $translator = new Translator('fr_FR');
 
 .. note::
 

components/routing.rst

@@ -139,7 +139,6 @@ configuration file:
 
         $container->loadFromExtension('web_profiler', array(
             'toolbar' => true,
-
             // ...
         ));
 

components/serializer.rst

@@ -369,7 +369,6 @@ of your commands to change their appearance::
 
             // After
             $io = new CustomStyle($input, $output);
-
             // ...
         }
     }

components/translation.rst

@@ -78,7 +78,7 @@ managers that use this connection.
         $container->autowire(SearchIndexer2::class)
             ->addTag('doctrine.event_listener', array(
                 'event' => 'postPersist',
-                'connection' => 'default'
+                'connection' => 'default',
             ))
         ;
         $container->autowire(SearchIndexerSubscriber::class)

configuration/environments.rst

@@ -52,7 +52,7 @@ swiftmailer with the memory option, use the following configuration:
         // app/config/config.php
         $container->loadFromExtension('swiftmailer', array(
              // ...
-            'spool' => array('type' => 'memory')
+            'spool' => array('type' => 'memory'),
         ));
 
 .. _spool-using-a-file:

console/style.rst

@@ -106,7 +106,7 @@ for that::
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
-                'inherit_data' => true
+                'inherit_data' => true,
             ));
         }
     }

doctrine/event_listeners_subscribers.rst

@@ -683,6 +683,13 @@ the choice is ultimately up to you.
 
         $form->get('agreeTerms')->setData(true);
 
+
+.. note::
+
+    The form name is automatically generated from the type class name. If you want
+    to modify it, use the :method:`Symfony\\Component\\Form\\FormFactoryInterface::createNamed` method.
+    You can even suppress the name completely by setting it to an empty string.
+
 Final Thoughts
 --------------
 

email/spool.rst

@@ -218,7 +218,7 @@ exposing a simple and efficient pattern::
             // or render a template with the $response you've already started
             return $this->render('article/show.html.twig', array(
                 'article' => $article,
-                'comments' => $comments
+                'comments' => $comments,
             ), $response);
         }
     }

form/inherit_data_option.rst

@@ -70,7 +70,7 @@ a new method called ``helloAction()`` with the following content::
         public function helloAction($name)
         {
             return $this->render('default/hello.html.twig', array(
-                'name' => $name
+                'name' => $name,
             ));
         }
     }
@@ -124,7 +124,7 @@ as its default value::
     public function helloAction($name, $_format)
     {
         return $this->render('default/hello.'.$_format.'.twig', array(
-            'name' => $name
+            'name' => $name,
         ));
     }
 
@@ -167,7 +167,7 @@ option of the ``@Route()`` annotation::
     public function helloAction($name, $_format)
     {
         return $this->render('default/hello.'.$_format.'.twig', array(
-            'name' => $name
+            'name' => $name,
         ));
     }
 

forms.rst

@@ -68,8 +68,8 @@ on its type:
 
     {# 1. Simple variables #}
     {# $this->render('template.html.twig', array(
-           'name' => 'Fabien')
-       ) #}
+           'name' => 'Fabien',
+       )) #}
     {{ name }}
 
     {# 2. Arrays #}

http_cache/validation.rst

@@ -1462,7 +1462,7 @@ Assume you have custom global form themes in
             'templating' => array(
                 'form' => array(
                     'resources' => array(
-                        'WebsiteBundle:Form'
+                        'WebsiteBundle:Form',
                     ),
                 ),
             ),

quick_tour/the_controller.rst

@@ -739,11 +739,11 @@ multiple firewalls, the "context" could actually be shared:
             'firewalls' => array(
                 'somename' => array(
                     // ...
-                    'context' => 'my_context'
+                    'context' => 'my_context',
                 ),
                 'othername' => array(
                     // ...
-                    'context' => 'my_context'
+                    'context' => 'my_context',
                 ),
             ),
         ));

quick_tour/the_view.rst

@@ -89,7 +89,7 @@ on an object that will contain a credit card number.
             {
                 $metadata->addPropertyConstraint('cardNumber', new Assert\CardScheme(array(
                     'schemes' => array(
-                        'VISA'
+                        'VISA',
                     ),
                     'message' => 'Your credit card number is invalid.',
                 )));

reference/configuration/framework.rst

@@ -89,7 +89,7 @@ on an object that will contain an ISBN.
             {
                 $metadata->addPropertyConstraint('isbn', new Assert\Isbn(array(
                     'type'    => 'isbn10',
-                    'message' => 'This value is not valid.'
+                    'message' => 'This value is not valid.',
                 )));
             }
         }

reference/configuration/security.rst

@@ -59,10 +59,10 @@ address as its own input text box::
 
     $builder->add('emails', CollectionType::class, array(
         // each entry in the array will be an "email" field
-        'entry_type'   => EmailType::class,
+        'entry_type' => EmailType::class,
         // these options are passed to each "email" type
-        'entry_options'  => array(
-            'attr'      => array('class' => 'email-box')
+        'entry_options' => array(
+            'attr' => array('class' => 'email-box'),
         ),
     ));
 

reference/constraints/CardScheme.rst

@@ -152,7 +152,7 @@ values for the year, month and day fields::
 
     $builder->add('dueDate', DateType::class, array(
         'placeholder' => array(
-            'year' => 'Year', 'month' => 'Month', 'day' => 'Day'
+            'year' => 'Year', 'month' => 'Month', 'day' => 'Day',
         )
     ));
 

reference/constraints/Isbn.rst

@@ -20,7 +20,7 @@ Take the following example::
             'now' => new \DateTime('now'),
             'tomorrow' => new \DateTime('+1 day'),
             '1 week' => new \DateTime('+1 week'),
-            '1 month' => new \DateTime('+1 month')
+            '1 month' => new \DateTime('+1 month'),
         ),
         'group_by' => function($val, $key, $index) {
             if ($val <= new \DateTime('+3 days')) {

reference/forms/types/collection.rst

@@ -15,9 +15,9 @@ you can list the most popular on top, like Bork Bork and Pirate::
             'English' => 'en',
             'Spanish' => 'es',
             'Bork'   => 'muppets',
-            'Pirate' => 'arr'
+            'Pirate' => 'arr',
         ),
-        'preferred_choices' => array('muppets', 'arr')
+        'preferred_choices' => array('muppets', 'arr'),
     ));
 
 This options can also be a callback function to give you more flexibility. This might
@@ -31,7 +31,7 @@ be especially useful if your values are objects::
             'now' => new \DateTime('now'),
             'tomorrow' => new \DateTime('+1 day'),
             '1 week' => new \DateTime('+1 week'),
-            '1 month' => new \DateTime('+1 month')
+            '1 month' => new \DateTime('+1 month'),
         ),
         'preferred_choices' => function ($val, $key) {
             // prefer options within 3 days

reference/forms/types/date.rst

@@ -65,7 +65,7 @@ a routing ``{wildcard}`` to only match some regular expression:
         $collection->add('blog_list', new Route('/blog/{page}', array(
             '_controller' => 'AppBundle:Blog:list',
         ), array(
-            'page' => '\d+'
+            'page' => '\d+',
         )));
 
         // ...

reference/forms/types/options/group_by.rst.inc

@@ -209,11 +209,11 @@ pattern so that it is only accessible by requests from the local server itself:
                 array(
                     'path' => '^/internal',
                     'role' => 'IS_AUTHENTICATED_ANONYMOUSLY',
-                    'ips' => '127.0.0.1, ::1'
+                    'ips' => '127.0.0.1, ::1',
                 ),
                 array(
                     'path' => '^/internal',
-                    'role' => 'ROLE_NO_ACCESS'
+                    'role' => 'ROLE_NO_ACCESS',
                 ),
             ),
         ));

reference/forms/types/options/preferred_choices.rst.inc

@@ -217,7 +217,7 @@ After this, you have protected your login form against CSRF attacks.
                         'form_login' => array(
                             // ...
                             'csrf_parameter' => '_csrf_security_token',
-                            'csrf_token_id'     => 'a_private_string'
+                            'csrf_token_id'  => 'a_private_string',
                         ),
                     ),
                 ),

routing/requirements.rst

@@ -371,14 +371,14 @@ so you only need the new interface::
         {
             return serialize(array(
                 // ...
-                $this->isActive
+                $this->isActive,
             ));
         }
         public function unserialize($serialized)
         {
             list (
                 // ...
-                $this->isActive
+                $this->isActive,
             ) = unserialize($serialized);
         }
     }

security/access_control.rst

@@ -424,8 +424,9 @@ Each authenticator needs the following methods:
 
 The picture below shows how Symfony calls Guard Authenticator methods:
 
-.. image:: /_images/security/authentication-guard-methods.png
-   :align: center
+.. raw:: html
+
+    <object data="../_images/security/authentication-guard-methods.svg" type="image/svg+xml"></object>
 
 .. _guard-customize-error:
 

security/csrf_in_login_form.rst

@@ -185,32 +185,32 @@ The :doc:`/session/locale_sticky_session` article does not update the locale
 when you impersonate a user. If you *do* want to be sure to update the locale when
 you switch users, add an event subscriber on this event::
 
-        // src/AppBundle/EventListener/SwitchUserListener.php
-        namespace AppBundle\EventListener;
+    // src/AppBundle/EventListener/SwitchUserListener.php
+    namespace AppBundle\EventListener;
 
-        use Symfony\Component\Security\Http\Event\SwitchUserEvent;
-        use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-        use Symfony\Component\Security\Http\SecurityEvents;
+    use Symfony\Component\Security\Http\Event\SwitchUserEvent;
+    use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+    use Symfony\Component\Security\Http\SecurityEvents;
 
-        class SwitchUserSubscriber implements EventSubscriberInterface
+    class SwitchUserSubscriber implements EventSubscriberInterface
+    {
+        public function onSwitchUser(SwitchUserEvent $event)
         {
-            public function onSwitchUser(SwitchUserEvent $event)
-            {
-                $event->getRequest()->getSession()->set(
-                    '_locale',
-                    // assuming your User has some getLocale() method
-                    $event->getTargetUser()->getLocale()
-                );
-            }
+            $event->getRequest()->getSession()->set(
+                '_locale',
+                // assuming your User has some getLocale() method
+                $event->getTargetUser()->getLocale()
+            );
+        }
 
-            public static function getSubscribedEvents()
-            {
-                return array(
-                    // constant for security.switch_user
-                    SecurityEvents::SWITCH_USER => 'onSwitchUser',
-                );
-            }
+        public static function getSubscribedEvents()
+        {
+            return array(
+                // constant for security.switch_user
+                SecurityEvents::SWITCH_USER => 'onSwitchUser',
+            );
         }
+    }
 
 That's it! If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
 Symfony will automatically discover your service and call ``onSwitchUser`` whenever