Fix WrapReturnRector #6798
Merged
Fix WrapReturnRector #6798
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
carlos-granados
commented
Mar 20, 2025
| @@ -86,8 +86,9 @@ public function refactor(Node $node): ?Node | |||
| continue; | |||
| } | |||
|
|
|||
| $this->wrap($classMethod, $typeMethodWrap->isArrayWrap()); | |||
| $hasChanged = true; | |||
| if ($typeMethodWrap->isArrayWrap() && $this->wrap($classMethod)) { | |||
There was a problem hiding this comment.
Instead of passing the isArrayWrap() value to the function, if it is not true we just don't call the function
carlos-granados
commented
Mar 20, 2025
| @@ -107,22 +108,21 @@ public function configure(array $configuration): void | |||
| $this->typeMethodWraps = $configuration; | |||
| } | |||
|
|
|||
| private function wrap(ClassMethod $classMethod, bool $isArrayWrap): ?ClassMethod | |||
| private function wrap(ClassMethod $classMethod): bool | |||
There was a problem hiding this comment.
Instead of returning the ClassMethod (which was not used), we return a boolean indicating if the value has changed
carlos-granados
commented
Mar 20, 2025
| $classMethod->stmts[$key] = $stmt; | ||
| $hasChanged = false; | ||
| foreach ($classMethod->stmts as $stmt) { | ||
| if ($stmt instanceof Return_ && $stmt->expr instanceof Expr |
There was a problem hiding this comment.
Simplify the if statement into a single statement
carlos-granados
commented
Mar 20, 2025
| if ($stmt instanceof Return_ && $stmt->expr instanceof Expr | ||
| && ! $stmt->expr instanceof Array_) { | ||
| $stmt->expr = new Array_([new ArrayItem($stmt->expr)]); | ||
| $hasChanged = true; |
There was a problem hiding this comment.
Only when we actually change the return expression we mark the node as changed
carlos-granados
commented
Mar 20, 2025
| $stmt->expr = new Array_([new ArrayItem($stmt->expr)]); | ||
| } | ||
|
|
||
| $classMethod->stmts[$key] = $stmt; |
There was a problem hiding this comment.
This is not needed, this code just replaces a statement with itself
|
Thank you @carlos-granados |
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.
Derived from #6794