Merge branch '3.4' into 4.2

* 3.4:
  Replaces ProtocolClassValidator for the second example
  clarify some DateTimeType widget options

Author: javiereguiluz

reference/forms/types/datetime.rst

@@ -72,6 +72,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
 ~~~~~~~~~~
 
@@ -91,6 +94,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
@@ -184,6 +189,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

validation/custom_constraint.rst

@@ -219,7 +219,7 @@ not to the property:
     .. code-block:: php-annotations
 
         /**
-         * @AcmeAssert\ContainsAlphanumeric
+         * @AcmeAssert\ProtocolClassValidator
          */
         class AcmeEntity
         {
@@ -231,11 +231,11 @@ not to the property:
         # config/validator/validation.yaml
         App\Entity\AcmeEntity:
             constraints:
-                - App\Validator\Constraints\ContainsAlphanumeric: ~
+                - App\Validator\Constraints\ProtocolClassValidator: ~
 
     .. code-block:: xml
 
         <!-- config/validator/validation.xml -->
         <class name="App\Entity\AcmeEntity">
-            <constraint name="App\Validator\Constraints\ContainsAlphanumeric" />
+            <constraint name="App\Validator\Constraints\ProtocolClassValidator" />
         </class>