[DoctrineBridge] Don't rely on ClassMetadataInfo->hasField in DoctrineOrmTypeGuesser anymore #26567
Conversation
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
…eOrmTypeGuesser anymore
fancyweb
commented
Mar 16, 2018
| @@ -95,7 +95,7 @@ public function guessRequired($class, $property) | |||
| $classMetadata = $classMetadatas[0]; | |||
|
|
|||
| // Check whether the field exists and is nullable or not | |||
| if ($classMetadata->hasField($property)) { | |||
| if (isset($classMetadata->fieldMappings[$property])) { | |||
| if (!$classMetadata->isNullable($property) && Type::BOOLEAN !== $classMetadata->getTypeOfField($property)) { | |||
There was a problem hiding this comment.
isNullable calls getFieldMapping internally
fancyweb
commented
Mar 16, 2018
| @@ -143,7 +143,7 @@ public function guessMaxLength($class, $property) | |||
| public function guessPattern($class, $property) | |||
| { | |||
| $ret = $this->getMetadata($class); | |||
| if ($ret && $ret[0]->hasField($property) && !$ret[0]->hasAssociation($property)) { | |||
| if ($ret && isset($ret[0]->fieldMappings[$property]) && !$ret[0]->hasAssociation($property)) { | |||
There was a problem hiding this comment.
This one is not needed but I did it for consistency.
|
If checking the public property is not clean enough, there are other ways of doing it. |
20uf
approved these changes
Mar 17, 2018
fabpot
approved these changes
Mar 18, 2018
|
Thank you @fancyweb. |
fabpot
added a commit
that referenced
this pull request
Mar 18, 2018
… in DoctrineOrmTypeGuesser anymore (fancyweb) This PR was merged into the 2.7 branch. Discussion ---------- [DoctrineBridge] Don't rely on ClassMetadataInfo->hasField in DoctrineOrmTypeGuesser anymore | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #26543 | License | MIT | Doc PR | - Discussion and explanations in the linked issue #26543 Commits ------- f656dc2 [DoctrineBridge] Don't rely on ClassMetadataInfo->hasField in DoctrineOrmTypeGuesser anymore
|
@fancyweb nice and quick work ! thanks ! |
This was referenced Apr 2, 2018
Merged
Merged
Merged
Merged
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.
Discussion and explanations in the linked issue #26543