Merge branch '3.3' into 3.4

javiereguiluz · javiereguiluz · commit e89ffa0ea045 · 2018-01-07T19:08:25.000+01:00
* 3.3: Update collection.rst Mention that PSR-1 doesn't recommend CamelCase or anything else minor #8091 Update js-datepicker usage for new jQuery UI (AdrianBorodziuk, javiereguiluz) minor #8983 cross-reference console command testing from testing guide (dbu)
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -463,8 +463,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
@@ -1005,6 +1006,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/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -338,7 +338,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,
diff --git a/testing.rst b/testing.rst
@@ -910,6 +910,7 @@ Learn more
 
     testing/*
 
+* :ref:`Testing a console command <console-testing-commands>`
 * :doc:`The chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
 * :doc:`/components/dom_crawler`
 * :doc:`/components/css_selector`
