Merge branch '3.4' into 4.0

javiereguiluz · javiereguiluz · commit 43ac5267e47b · 2018-01-07T19:10:49.000+01:00
* 3.4: Update collection.rst Mention that PSR-1 doesn't recommend CamelCase or anything else Fixed the XML and PHP config instead of the YAML config minor #8091 Update js-datepicker usage for new jQuery UI (AdrianBorodziuk, javiereguiluz) minor #8983 cross-reference console command testing from testing guide (dbu) Fix YAML config bug
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -459,8 +459,9 @@ CamelCase to snake_case
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 In many formats, it's common to use underscores to separate words (also known
-as snake_case). However, PSR-1 specifies that the preferred style for PHP
-properties and methods is CamelCase.
+as snake_case). However, in Symfony applications is common to use CamelCase to
+name properties (even though the `PSR-1 standard`_ doesn't recommend any
+specific case for property names).
 
 Symfony provides a built-in name converter designed to transform between
 snake_case and CamelCased styles during serialization and deserialization
@@ -994,6 +995,7 @@ Learn more
     A popular alternative to the Symfony Serializer Component is the third-party
     library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
 
+.. _`PSR-1 standard`: http://www.php-fig.org/psr/psr-1/
 .. _`JMS serializer`: https://github.com/schmittjoh/serializer
 .. _Packagist: https://packagist.org/packages/symfony/serializer
 .. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
@@ -91,9 +91,7 @@ using a special "tag":
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.exception_listener"
-                    class="App\EventListener\ExceptionListener">
-
+                <service id="AppBundle\EventListener\ExceptionListener">
                     <tag name="kernel.event_listener" event="kernel.exception" />
                 </service>
             </services>
@@ -105,7 +103,7 @@ using a special "tag":
         use App\EventListener\ExceptionListener;
 
         $container
-            ->register('app.exception_listener', ExceptionListener::class)
+            ->autowire(ExceptionListener::class)
             ->addTag('kernel.event_listener', array('event' => 'kernel.exception'))
         ;
 
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -334,7 +334,7 @@ type::
 entry_type
 ~~~~~~~~~~
 
-**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required**
+**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **default**: Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType
 
 This is the field type for each item in this collection (e.g. ``TextType``,
 ``ChoiceType``, etc). For example, if you have an array of email addresses,
