Merge branch '4.1' into 4.2

* 4.1:
  Add missing imports in Data Mappers article
  fix code style
  Complete code example for \"Adding validation\" part

Author: javiereguiluz

form/data_mappers.rst

@@ -149,7 +149,10 @@ method to configure the data mapper::
     namespace App\Form\Type;
 
     use App\Form\DataMapper\ColorMapper;
+    use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+    use Symfony\Component\Form\FormBuilderInterface;
+    use Symfony\Component\OptionsResolver\OptionsResolver;
 
     final class ColorType extends AbstractType
     {

form/without_class.rst

@@ -82,18 +82,22 @@ but here's a short example::
     use Symfony\Component\Validator\Constraints\Length;
     use Symfony\Component\Validator\Constraints\NotBlank;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
+    use Symfony\Component\Form\FormBuilderInterface;
 
-    $builder
-       ->add('firstName', TextType::class, array(
-           'constraints' => new Length(array('min' => 3)),
-       ))
-       ->add('lastName', TextType::class, array(
-           'constraints' => array(
-               new NotBlank(),
-               new Length(array('min' => 3)),
-           ),
-       ))
-    ;
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+           ->add('firstName', TextType::class, array(
+               'constraints' => new Length(array('min' => 3)),
+           ))
+           ->add('lastName', TextType::class, array(
+               'constraints' => array(
+                   new NotBlank(),
+                   new Length(array('min' => 3)),
+               ),
+           ))
+        ;
+    }
 
 .. tip::
 

validation/custom_constraint.rst

@@ -66,7 +66,7 @@ The validator class is also simple, and only has one required method ``validate(
         public function validate($value, Constraint $constraint)
         {
             if (!$constraint instanceof ContainsAlphanumeric) {
-               throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
+                throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
             }
             
             // custom constraints should ignore null and empty values to allow