Merge branch '3.4' into 4.2

* 3.4:
  Consistency in form widget names
  Update Length constraint description (mb_strlen)

Author: javiereguiluz

form/create_custom_field_type.rst

@@ -278,7 +278,7 @@ one of your forms::
     {
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
-            $builder->add('shipping_code', ShippingType::class, [
+            $builder->add('shippingCode', ShippingType::class, [
                 'placeholder' => 'Choose a delivery option',
             ]);
         }

form/events.rst

@@ -271,7 +271,7 @@ method of the ``FormFactory``::
 
     $form = $formFactory->createBuilder()
         ->add('username', TextType::class)
-        ->add('show_email', CheckboxType::class)
+        ->add('showEmail', CheckboxType::class)
         ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $user = $event->getData();
             $form = $event->getForm();
@@ -283,7 +283,7 @@ method of the ``FormFactory``::
             // checks whether the user has chosen to display their email or not.
             // If the data was submitted previously, the additional value that is
             // included in the request variables needs to be removed.
-            if (true === $user['show_email']) {
+            if (true === $user['showEmail']) {
                 $form->add('email', EmailType::class);
             } else {
                 unset($user['email']);
@@ -312,7 +312,7 @@ callback for better readability::
         {
             $builder
                 ->add('username', TextType::class)
-                ->add('show_email', CheckboxType::class)
+                ->add('showEmail', CheckboxType::class)
                 ->addEventListener(
                     FormEvents::PRE_SET_DATA,
                     [$this, 'onPreSetData']
@@ -379,7 +379,7 @@ Consider the following example of a form event subscriber::
             // checks whether the user has chosen to display their email or not.
             // If the data was submitted previously, the additional value that
             // is included in the request variables needs to be removed.
-            if (true === $user['show_email']) {
+            if (true === $user['showEmail']) {
                 $form->add('email', EmailType::class);
             } else {
                 unset($user['email']);
@@ -398,7 +398,7 @@ To register the event subscriber, use the ``addEventSubscriber()`` method::
 
     $form = $formFactory->createBuilder()
         ->add('username', TextType::class)
-        ->add('show_email', CheckboxType::class)
+        ->add('showEmail', CheckboxType::class)
         ->addEventSubscriber(new AddEmailFieldListener())
         ->getForm();
 

reference/constraints/Length.rst

@@ -119,10 +119,9 @@ charset
 
 **type**: ``string``  **default**: ``UTF-8``
 
-The charset to be used when computing value's length. The
-:phpfunction:`grapheme_strlen` PHP function is used if available. If not,
-the :phpfunction:`mb_strlen` PHP function is used if available. If neither
-are available, the :phpfunction:`strlen` PHP function is used.
+The charset to be used when computing value's length with the
+:phpfunction:`mb_check_encoding` and :phpfunction:`mb_strlen`
+PHP functions.
 
 charsetMessage
 ~~~~~~~~~~~~~~

reference/forms/types/collection.rst

@@ -308,7 +308,7 @@ type::
     use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
     // ...
 
-    $builder->add('favorite_cities', CollectionType::class, [
+    $builder->add('favoriteCities', CollectionType::class, [
         'entry_type'   => ChoiceType::class,
         'entry_options'  => [
             'choices'  => [

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

@@ -16,7 +16,7 @@ For more information on valid formats, see `Date/Time Format Syntax`_::
     use Symfony\Component\Form\Extension\Core\Type\DateType;
     // ...
 
-    $builder->add('date_created', DateType::class, [
+    $builder->add('dateCreated', DateType::class, [
         'widget' => 'single_text',
         // this is actually the default format for single_text
         'format' => 'yyyy-MM-dd',

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

@@ -7,7 +7,7 @@ When setting the ``invalid_message`` option, you may need to
 include some variables in the string. This can be done by adding placeholders
 to that option and including the variables in this option::
 
-    $builder->add('some_field', SomeFormType::class, [
+    $builder->add('someField', SomeFormType::class, [
         // ...
         'invalid_message' => 'You entered an invalid value, it should include %num% letters',
         'invalid_message_parameters' => ['%num%' => 6],