Make implicit type casts explicit #8836
Merged
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
greg0ire
force-pushed
the
explicit-type-casts
branch
from
465e19c
to
e88d261
Compare
greg0ire
commented
Jul 10, 2021
| @@ -614,7 +614,7 @@ private function completeIdGeneratorMapping(ClassMetadataInfo $class): void | |||
|
|
|||
| $sequenceGenerator = new SequenceGenerator( | |||
| $this->em->getConfiguration()->getQuoteStrategy()->getSequenceName($definition, $class, $this->getTargetPlatform()), | |||
| $definition['allocationSize'] | |||
| (int) $definition['allocationSize'] | |||
There was a problem hiding this comment.
Since the + operator is used here, this must be fine:
Comment on lines
+3309
to
+3319
| if (! isset($definition['allocationSize']) || trim((string) $definition['allocationSize']) === '') { | ||
| $definition['allocationSize'] = '1'; | ||
| } | ||
|
|
||
| if (! isset($definition['initialValue']) || trim($definition['initialValue']) === '') { | ||
| if (! isset($definition['initialValue']) || trim((string) $definition['initialValue']) === '') { | ||
| $definition['initialValue'] = '1'; | ||
| } | ||
|
|
||
| $definition['allocationSize'] = (string) $definition['allocationSize']; | ||
| $definition['initialValue'] = (string) $definition['initialValue']; | ||
|
|
There was a problem hiding this comment.
It would make sense to use a variable here now so you need to cast only one time. It increases readability after the type casts were introduced or when changes are going to be introduced where the type casts are forgotten.
There was a problem hiding this comment.
Can you please show me how you would do it? It tried, and it's a bit too tricky IMO, since $definition['allocationSize'] might not be defined.
There was a problem hiding this comment.
My bad, I confused keys during my review.
SenseException
approved these changes
Jul 13, 2021
Comment on lines
+3309
to
+3319
| if (! isset($definition['allocationSize']) || trim((string) $definition['allocationSize']) === '') { | ||
| $definition['allocationSize'] = '1'; | ||
| } | ||
|
|
||
| if (! isset($definition['initialValue']) || trim($definition['initialValue']) === '') { | ||
| if (! isset($definition['initialValue']) || trim((string) $definition['initialValue']) === '') { | ||
| $definition['initialValue'] = '1'; | ||
| } | ||
|
|
||
| $definition['allocationSize'] = (string) $definition['allocationSize']; | ||
| $definition['initialValue'] = (string) $definition['initialValue']; | ||
|
|
There was a problem hiding this comment.
My bad, I confused keys during my review.
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.
Before we discuss what target branch the
strict_typesPR should use, here is a PR that makes 2.10.x compatible with strict types.Everything was pretty straightforward except the sequence generator which is full of casts from int to string and vice versa. After reading #6683 , it seems to me that we want to be compatible with sequences greater than PHP_INT_MAX, but I doubt we are in practice.
Note how this reduces the baseline.