Fix redundant type casts #44274
Merged
Fix redundant type casts #44274
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
e390092 to
6158331
Compare
fancyweb
commented
Nov 25, 2021
| @@ -57,7 +57,7 @@ protected function setUp(): void | |||
|
|
|||
| protected function renderForm(FormView $view, array $vars = []) | |||
| { | |||
| return (string) $this->renderer->renderBlock($view, 'form', $vars); | |||
| return $this->renderer->renderBlock($view, 'form', $vars); | |||
There was a problem hiding this comment.
FormRendererInterface::renderBlock() retturns a string
| @@ -66,42 +66,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = []) | |||
| $vars += ['label' => $label]; | |||
| } | |||
|
|
|||
| return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars); | |||
| return $this->renderer->searchAndRenderBlock($view, 'label', $vars); | |||
There was a problem hiding this comment.
FormRendererInterface::searchAndRenderBlock() retturns a string (same for the others)
| @@ -60,17 +60,7 @@ private function getGlobalVariables(): GlobalVariables | |||
| return $this->createMock(GlobalVariables::class); | |||
| } | |||
|
|
|||
| private function getStorage(): StringStorage | |||
| { | |||
| return $this->getMockBuilder(StringStorage::class) | |||
There was a problem hiding this comment.
I replaced the mock with a real instance.
| @@ -730,7 +730,7 @@ private function createExpression(ContainerBuilder $container, string $expressio | |||
| private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference | |||
| { | |||
| if ($methods) { | |||
| $methods = array_map('strtoupper', (array) $methods); | |||
| $methods = array_map('strtoupper', $methods); | |||
There was a problem hiding this comment.
array $methods in the method args
| @@ -796,8 +796,6 @@ private function isInitializedAttribute(string $attr): bool | |||
| */ | |||
| private function convertValueDataType($value, int $type) | |||
| { | |||
| $type = (int) $type; | |||
There was a problem hiding this comment.
int $type in the args
| @@ -674,12 +674,12 @@ public function parseProvider() | |||
| return [ | |||
| ['prefix1', false, '->parse() does not parse a number with a string prefix.', 0], | |||
| ['prefix1', false, '->parse() does not parse a number with a string prefix.', 0, false], | |||
| ['1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3], | |||
| ['1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3, false], | |||
| ['1.4suffix', 1.4, '->parse() parses a number with a string suffix.', 3], | |||
There was a problem hiding this comment.
1.4 is already a float
| @@ -267,7 +267,7 @@ public function add(string $body, array $headers, int $delayInMs = 0): void | |||
| throw new TransportException(json_last_error_msg()); | |||
| } | |||
|
|
|||
| $score = (int) ($this->getCurrentTimeInMilliseconds() + $delayInMs); | |||
| $score = $this->getCurrentTimeInMilliseconds() + $delayInMs; | |||
There was a problem hiding this comment.
getCurrentTimeInMilliseconds() returns an int, int $delayInMs = 0 in the args
| @@ -35,7 +35,7 @@ public function __construct(string $template) | |||
| */ | |||
| public function __toString() | |||
| { | |||
| return (string) $this->template; | |||
| return $this->template; | |||
There was a problem hiding this comment.
The $template property is set by the constructor with the string $template arg.
| @@ -653,7 +653,7 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer | |||
| // no break | |||
| case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || is_numeric($scalar[0]): | |||
| if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) { | |||
| $scalar = str_replace('_', '', (string) $scalar); | |||
| $scalar = str_replace('_', '', $scalar); | |||
There was a problem hiding this comment.
$scalar comes from $scalar = trim($scalar);, trim returns a string.
6158331 to
e724d5a
Compare
nicolas-grekas
approved these changes
Nov 25, 2021
fabpot
requested changes
Nov 25, 2021
| } | ||
|
|
||
| /** | ||
| * @return string | ||
| * @return string|false |
There was a problem hiding this comment.
But, right now, we guarantee a string, so this is a BC break.
|
Thank you @fancyweb. |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 29, 2021
This PR was merged into the 5.3 branch. Discussion ---------- Fix redundant type casts | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Continuation of #44274 on 5.3 Commits ------- 4243335 Fix redundant type casts
symfony-splitter
pushed a commit
to symfony/translation
that referenced
this pull request
Nov 29, 2021
This PR was merged into the 5.3 branch. Discussion ---------- Fix redundant type casts | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Continuation of symfony/symfony#44274 on 5.3 Commits ------- 4243335012 Fix redundant type casts
SerhiyMytrovtsiy
added a commit
to SerhiyMytrovtsiy/translation
that referenced
this pull request
Oct 19, 2022
This PR was merged into the 5.3 branch. Discussion ---------- Fix redundant type casts | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Continuation of symfony/symfony#44274 on 5.3 Commits ------- 4243335012 Fix redundant type casts
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.
Firstly, let's see if the CI is green as I expect it. I'll explain every change with a review comment.