Commitce6d9f3

committed

Merge branch '5.2' into 5.x

* 5.2: Calling enableAnnotationMapping without argument is deprecated

2 parentse4c5aef +017ecd7 commitce6d9f3Copy full SHA for ce6d9f3

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -106,14 +106,15 @@ prefixed classes included in doc block comments (``/** ... */``). For example::
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`To enable the annotation loader, call the`
`109`		-:method:`Symfony\\Component\\Validator\\ValidatorBuilder::enableAnnotationMapping`
`110`		`-method. It takes an optional annotation reader instance, which defaults to`
`111`		-``Doctrine\Common\Annotations\AnnotationReader``::
	`109`	+:method:`Symfony\\Component\\Validator\\ValidatorBuilder::enableAnnotationMapping` method
	`110`	+and then call ``addDefaultDoctrineAnnotationReader()`` to use Doctrine's
	`111`	`+annotation reader::`
`112`	`112`
`113`	`113`	`use Symfony\Component\Validator\Validation;`
`114`	`114`
`115`	`115`	`$validator = Validation::createValidatorBuilder()`
`116`		`- ->enableAnnotationMapping()`
	`116`	`+ ->enableAnnotationMapping(true)`
	`117`	`+ ->addDefaultDoctrineAnnotationReader()`
`117`	`118`	`->getValidator();`
`118`	`119`
`119`	`120`	`To disable the annotation loader after it was enabled, call`
`@@ -134,7 +135,8 @@ multiple mappings::`
`134`	`135`	`use Symfony\Component\Validator\Validation;`
`135`	`136`
`136`	`137`	`$validator = Validation::createValidatorBuilder()`
`137`		`- ->enableAnnotationMapping()`
	`138`	`+ ->enableAnnotationMapping(true)`
	`139`	`+ ->addDefaultDoctrineAnnotationReader()`
`138`	`140`	`->addMethodMapping('loadValidatorMetadata')`
`139`	`141`	`->addXmlMapping('validator/validation.xml')`
`140`	`142`	`->getValidator();`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,8 @@ allows you to return a list of extensions to register::`
`219`	`219`
`220`	`220`	`// or if you also need to read constraints from annotations`
`221`	`221`	`$validator = Validation::createValidatorBuilder()`
`222`		`- ->enableAnnotationMapping()`
	`222`	`+ ->enableAnnotationMapping(true)`
	`223`	`+ ->addDefaultDoctrineAnnotationReader()`
`223`	`224`	`->getValidator();`
`224`	`225`
`225`	`226`	`return [`

Comments

(0)