Commitd33f73b

committed

Merge branch '3.4' into 4.1

* 3.4: Update data_transformers.rst Fixed the \"learn more\" section of Testing article Change gender to eye-color

2 parentsbdaba7a +2cecb41 commitd33f73bCopy full SHA for d33f73b

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ First, create the custom field type class::`
`344`	`344`	`use App\Form\DataTransformer\IssueToNumberTransformer;`
`345`	`345`	`use Doctrine\Common\Persistence\ObjectManager;`
`346`	`346`	`use Symfony\Component\Form\AbstractType;`
	`347`	`+ use Symfony\Component\Form\Extension\Core\Type\TextType;`
`347`	`348`	`use Symfony\Component\Form\FormBuilderInterface;`
`348`	`349`	`use Symfony\Component\OptionsResolver\OptionsResolver;`
`349`	`350`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1049,11 +1049,9 @@ Learn more`
`1049`	`1049`	`:glob:`
`1050`	`1050`
`1051`	`1051`	`testing/*`
`1052`		`-`
`1053`		-*:ref:`Testing a console command<console-testing-commands>`
`1054`		-*:doc:`The chapter about tests in the Symfony Framework Best Practices</best_practices/tests>`
`1055`		-*:doc:`/components/dom_crawler`
`1056`		-*:doc:`/components/css_selector`
	`1052`	`+/best_practices/tests`
	`1053`	`+/components/dom_crawler`
	`1054`	`+/components/css_selector`
`1057`	`1055`
`1058`	`1056`	.. _`PHPUnit`:https://phpunit.de/
`1059`	`1057`	.. _`documentation`:https://phpunit.readthedocs.io/

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -58,7 +58,7 @@ Validation of arrays is possible using the ``Collection`` constraint::
`58`	`58`	`],`
`59`	`59`	`'email' => 'test@email.tld',`
`60`	`60`	`'simple' => 'hello',`
`61`		`- 'gender' => 3,`
	`61`	`+ 'eye_color' => 3,`
`62`	`62`	`'file' => null,`
`63`	`63`	`'password' => 'test',`
`64`	`64`	`'tags' => [`
@@ -79,7 +79,7 @@ Validation of arrays is possible using the ``Collection`` constraint::
`79`	`79`	`]),`
`80`	`80`	`'email' => new Assert\Email(),`
`81`	`81`	`'simple' => new Assert\Length(['min' => 102]),`
`82`		`- 'gender' => new Assert\Choice([3, 4]),`
	`82`	`+ 'eye_color' => new Assert\Choice([3, 4]),`
`83`	`83`	`'file' => new Assert\File(),`
`84`	`84`	`'password' => new Assert\Length(['min' => 60]),`
`85`	`85`	`'tags' => new Assert\Optional([`

Comments

(0)