Add phpdoc for ClassMetadataInfo::discriminatorColumn property #9983
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
VincentLanglet
commented
Aug 8, 2022
| @@ -574,7 +574,7 @@ class ClassMetadataInfo implements ClassMetadata | |||
| * READ-ONLY: The definition of the discriminator column used in JOINED and SINGLE_TABLE | |||
| * inheritance mappings. | |||
| * | |||
| * @psalm-var array<string, mixed>|null | |||
| * @psalm-var array{name: string, fieldName: string, type: string, length?: int, columnDefinition?: string|null}|null | |||
There was a problem hiding this comment.
I looked at the setDiscriminatorColumn and all the usage of this property in the orm code to find the possible values.
| 'type' => $discrColumnAttribute->type ?: 'string', | ||
| 'length' => $discrColumnAttribute->length ?: 255, | ||
| 'columnDefinition' => $discrColumnAttribute->columnDefinition, | ||
| 'name' => isset($discrColumnAttribute->name) ? (string) $discrColumnAttribute->name : null, |
There was a problem hiding this comment.
I have to cast this in order to avoid an ArgumentTypeCoercion error from psalm.
| @@ -199,7 +199,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad | |||
| [ | |||
| 'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null, | |||
| 'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string', | |||
| 'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255, | |||
| 'length' => isset($discrColumn['length']) ? (int) $discrColumn['length'] : 255, | |||
There was a problem hiding this comment.
The cast was wrong
| . '", type="' . $discrColumn['type'] | ||
| . '", length=' . $discrColumn['length']; | ||
| $columnDefinition = sprintf('name="%s", type="%s"', $discrColumn['name'], $discrColumn['type']); | ||
| if (isset($discrColumn['length'])) { |
There was a problem hiding this comment.
length might not be defined.
I assume this was always used with string so no error was reporter.
|
If you have time to take a look @greg0ire :) |
|
Maybe do you have time to review this @derrabus ? |
greg0ire
approved these changes
Sep 20, 2022
|
Not right now, no. |
SenseException
approved these changes
Sep 21, 2022
|
Thanks @VincentLanglet ! |
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.
No description provided.