fix: prevent nullable from triggering oneOf wrapping in JMSModelDescriber#2693
Open
lacatoire wants to merge 2 commits intonelmio:5.xfrom
Open
fix: prevent nullable from triggering oneOf wrapping in JMSModelDescriber#2693lacatoire wants to merge 2 commits intonelmio:5.xfrom
lacatoire wants to merge 2 commits intonelmio:5.xfrom
Conversation
…iber When a JMS property has a #[Assert\NotNull] constraint, the SymfonyConstraintAnnotationReader sets nullable=false on the OA property. This caused jsonSerialize() to return a non-empty customFields array, which triggered unnecessary oneOf wrapping instead of a simple $ref. Exclude nullable from the custom fields check, same as property is already excluded. This restores the correct $ref output for JMS properties with NotNull constraints. Fixes nelmio#2565
The notNullFriend property with #[Assert\NotNull] correctly marks the field as required in the generated schema. Update the JSON fixture and test assertion to match.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 5.x #2693 +/- ##
=======================================
Coverage 95.59% 95.59%
=======================================
Files 94 94
Lines 3064 3066 +2
=======================================
+ Hits 2929 2931 +2
Misses 135 135 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
lacatoire
changed the title
lacatoire
force-pushed
the
fix/jms-nullable-custom-fields
branch
from
7adad9e to
56f72a2
Compare
lacatoire
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
#[Assert\NotNull]constraint,SymfonyConstraintAnnotationReadersetsnullable=falseon the OA property. This causedjsonSerialize()to return a non-empty$customFieldsarray, which triggered unnecessaryoneOfwrapping instead of a simple$refnullablefrom the custom fields check (likepropertyis already excluded), restoring the correct$refoutput#[Assert\NotNull]property onJMSUserto prevent regressionFixes #2565