Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit d33f73bb9382 · 2019-01-28T17:29:58.000+01:00
* 3.4:
  Update data_transformers.rst
  Fixed the \"learn more\" section of Testing article
  Change gender to eye-color
diff --git a/form/data_transformers.rst b/form/data_transformers.rst
@@ -344,6 +344,7 @@ First, create the custom field type class::
     use App\Form\DataTransformer\IssueToNumberTransformer;
     use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\AbstractType;
+    use Symfony\Component\Form\Extension\Core\Type\TextType;
     use Symfony\Component\Form\FormBuilderInterface;
     use Symfony\Component\OptionsResolver\OptionsResolver;
 
diff --git a/testing.rst b/testing.rst
@@ -1049,11 +1049,9 @@ Learn more
     :glob:
 
     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`
+    /best_practices/tests
+    /components/dom_crawler
+    /components/css_selector
 
 .. _`PHPUnit`: https://phpunit.de/
 .. _`documentation`: https://phpunit.readthedocs.io/
diff --git a/validation/raw_values.rst b/validation/raw_values.rst
@@ -58,7 +58,7 @@ Validation of arrays is possible using the ``Collection`` constraint::
         ],
         'email' => 'test@email.tld',
         'simple' => 'hello',
-        'gender' => 3,
+        'eye_color' => 3,
         'file' => null,
         'password' => 'test',
         'tags' => [
@@ -79,7 +79,7 @@ Validation of arrays is possible using the ``Collection`` constraint::
         ]),
         'email' => new Assert\Email(),
         'simple' => new Assert\Length(['min' => 102]),
-        'gender' => new Assert\Choice([3, 4]),
+        'eye_color' => new Assert\Choice([3, 4]),
         'file' => new Assert\File(),
         'password' => new Assert\Length(['min' => 60]),
         'tags' => new Assert\Optional([
