Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 2c77039f1fcb · 2022-03-02T14:18:22.000+01:00
* 5.4:
  -
  -
  Fix merge
diff --git a/Tests/Validator/DoctrineLoaderTest.php b/Tests/Validator/DoctrineLoaderTest.php
@@ -162,7 +162,8 @@ public function testExtractEnum()
 
         $validator = Validation::createValidatorBuilder()
             ->addMethodMapping('loadValidatorMetadata')
-            ->enableAnnotationMapping()
+            ->enableAnnotationMapping(true)
+            ->addDefaultDoctrineAnnotationReader()
             ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))
             ->getValidator()
         ;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ public function testExtractEnum()`
`162`	`162`
`163`	`163`	`$validator = Validation::createValidatorBuilder()`
`164`	`164`	`->addMethodMapping('loadValidatorMetadata')`
`165`		`- ->enableAnnotationMapping()`
	`165`	`+ ->enableAnnotationMapping(true)`
	`166`	`+ ->addDefaultDoctrineAnnotationReader()`
`166`	`167`	`->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))`
`167`	`168`	`->getValidator()`
`168`	`169`	`;`