[Validator] Deprecate ValidatorBuilder::enableAnnotationMapping() and ValidatorBuilder::disableAnnotationMapping()
#51426
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nd `ValidatorBuilder::disableAnnotationMapping()`
alexandre-daubois
force-pushed
the
validator-annotation-deprecations
branch
from
dee9977
to
9fa9c32
Compare
stof
requested changes
Aug 18, 2023
UPGRADE-6.4.md
Outdated
| @@ -156,4 +156,6 @@ Validator | |||
| * Deprecate Doctrine annotations support in favor of native attributes | |||
| * Deprecate passing an annotation reader to the constructor signature of `AnnotationLoader` | |||
| * Deprecate `ValidatorBuilder::setDoctrineAnnotationReader()` | |||
| * Deprecate `ValidatorBuilder::addDefaultDoctrineAnnotationReader()` | |||
| * Deprecate `ValidatorBuilder::addDefaultDoctrineAnnotationReader() | |||
| public function testExpectDeprecationWhenDisablingAnnotationMapping() | ||
| { | ||
| $this->expectDeprecation('Since symfony/validator 6.4: Method "Symfony\Component\Validator\ValidatorBuilder::disableAnnotationMapping()" is deprecated, use "disableAttributeMapping()" instead.'); | ||
| $this->builder->disableAnnotationMapping(); |
There was a problem hiding this comment.
we should not loose the assertion about the fluent API that we had before
| @@ -81,7 +81,7 @@ public function testAddMethodMappings() | |||
| */ | |||
| public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader() | |||
| { | |||
| $this->assertSame($this->builder, $this->builder->enableAnnotationMapping()); | |||
| $this->assertSame($this->builder, $this->builder->enableAttributeMapping()); | |||
There was a problem hiding this comment.
this test is really about annotation mapping. So I would rather expect both deprecations in it than changing method
| @@ -102,7 +102,7 @@ public function testEnableAnnotationMappingWithCustomDoctrineAnnotationReader() | |||
| { | |||
| $reader = $this->createMock(Reader::class); | |||
|
|
|||
| $this->assertSame($this->builder, $this->builder->enableAnnotationMapping()); | |||
| $this->assertSame($this->builder, $this->builder->enableAttributeMapping()); | |||
| * | ||
| * @return $this | ||
| */ | ||
| public function enableAttributeMapping(): static | ||
| { | ||
| if (null !== $this->metadataFactory) { | ||
| throw new ValidatorException('You cannot enable annotation mapping after setting a custom metadata factory. Configure your metadata factory instead.'); |
There was a problem hiding this comment.
this exception message should be updated
| @@ -344,7 +369,7 @@ public function getLoaders(): array | |||
| $loaders[] = new StaticMethodLoader($methodName); | |||
| } | |||
|
|
|||
| if ($this->enableAnnotationMapping) { | |||
| if ($this->enableAttributeMapping) { | |||
| $loaders[] = new AnnotationLoader($this->annotationReader); | |||
There was a problem hiding this comment.
if you don't rename the loader class as well, this work is incomplete
xabbuh
requested changes
Aug 18, 2023
|
Alright, I thought it was the way to deal with the CI that misses some not-yet-merged methods. Closing in favor of #51425, I addressed your comments there 🙂 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Required by #51425