Merge branch '4.2'

* 4.2:
  Update some articles related to user providers
  Replaces ProtocolClassValidator for the second example
  clarify some DateTimeType widget options
  document deprecation of the scale option

Author: javiereguiluz

_build/redirection_map

@@ -408,3 +408,4 @@
 /profiler/matchers /profiler
 /profiler/profiling_data /profiler
 /profiler/wdt_follow_ajax /profiler
+/security/entity_provider /security/user_provider

reference/configuration/security.rst

@@ -234,29 +234,10 @@ statically using the ``dn_string`` config option.
 User provider
 ~~~~~~~~~~~~~
 
-Users will still be fetched from the configured user provider. If you
-wish to fetch your users from a LDAP server, you will need to use the
-``ldap`` user provider, in addition to one of the three authentication
-providers (``form_login_ldap`` or ``http_basic_ldap`` or ``json-login-ldap``).
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # config/packages/security.yaml
-        security:
-            # ...
-
-            providers:
-                my_ldap_users:
-                    ldap:
-                        service: ldap
-                        base_dn: 'dc=symfony,dc=com'
-                        search_dn: '%ldap.search_dn%'
-                        search_password: '%ldap.search_password%'
-                        default_roles: ''
-                        uid_key: 'uid'
-                        filter: '(&({uid_key}={username})(objectclass=person)(ou=Users))'
+Users will still be fetched from the configured user provider. If you wish to
+fetch your users from a LDAP server, you will need to use the
+:doc:`LDAP User Provider </security/ldap>` and any of these authentication
+providers: ``form_login_ldap`` or ``http_basic_ldap`` or ``json_login_ldap``.
 
 Using the PBKDF2 Encoder: Security and Speed
 --------------------------------------------

reference/forms/types/datetime.rst

@@ -73,6 +73,9 @@ Defines the ``format`` option that will be passed down to the date field.
 See the :ref:`DateType's format option <reference-forms-type-date-format>`
 for more details.
 
+The ``date_format`` option does not have any effect when the form is rendered
+as an HTML5 datetime input.
+
 date_label
 ~~~~~~~~~~
 
@@ -92,6 +95,8 @@ date_widget
 
 .. include:: /reference/forms/types/options/date_widget_description.rst.inc
 
+The ``date_widget`` option is ignored when the ``widget`` option is set to ``single_text``.
+
 .. include:: /reference/forms/types/options/days.rst.inc
 
 placeholder
@@ -185,6 +190,8 @@ time_widget
 
 Defines the ``widget`` option for the :doc:`TimeType </reference/forms/types/time>`.
 
+The ``time_widget`` option is ignored when the ``widget`` option is set to ``single_text``.
+
 .. include:: /reference/forms/types/options/view_timezone.rst.inc
 
 widget

reference/forms/types/integer.rst

@@ -89,6 +89,11 @@ scale
 
 **type**: ``integer`` **default**: ``0``
 
+.. versionadded:: 4.2
+
+    The ``scale`` option is deprecated since Symfony 4.2 and will be removed
+    in 5.0.
+
 This specifies how many decimals will be allowed until the field rounds the
 submitted value (via ``rounding_mode``). This option inherits from
 :doc:`number </reference/forms/types/number>` type and is overriden to ``0`` for