Skip to content

[EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector#1984

Merged
TomasVotruba merged 1 commit intomainfrom
fix-used-along-change-or-fi
Apr 1, 2022
Merged

[EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector#1984
TomasVotruba merged 1 commit intomainfrom
fix-used-along-change-or-fi

Conversation

@samsonasik
Copy link
Copy Markdown
Member

@samsonasik samsonasik commented Apr 1, 2022

Previously, when Php8ResourceReturnToObjectRector and ChangeOrIfReturnToEarlyReturnRector, it requires tweak:

rector-src/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php

Lines 121 to 140 in 0f22f0c

private function isMaybeUsedAlongWithResourceToObjectRector(BooleanOr $booleanOr): bool
{
if ($booleanOr->left instanceof FuncCall) {
if (! $this->nodeNameResolver->isName($booleanOr->left, 'is_resource')) {
return false;
}
return $booleanOr->right instanceof Instanceof_;
}
if ($booleanOr->right instanceof FuncCall) {
if (! $this->nodeNameResolver->isName($booleanOr->right, 'is_resource')) {
return false;
}
return $booleanOr->left instanceof Instanceof_;
}
return false;
}

and

rector-src/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php

Lines 97 to 99 in 0f22f0c

if ($this->isMaybeUsedAlongWithResourceToObjectRector($node->cond)) {
return null;
}

This PR remove it, by check BooleanOr left or right is an Instanceof_ object.

By this PR, I think Refresh PHPStan tweak issue mostly fixed in rector-src code base.

Fixes rectorphp/rector#6723
Closes #1297

@samsonasik
[Core]EarlyReturn][Php80] Fix used along tweak between Php8ResourceRe…
e9743ce 
…turnToObjectRector+ChangeOrIfReturnToEarlyReturnRector
@samsonasik
Copy link
Copy Markdown
Member Author

samsonasik commented Apr 1, 2022

All checks have passed 🎉 @TomasVotruba it is ready for review.

@samsonasik samsonasik changed the title [Core]EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector Apr 1, 2022
@samsonasik samsonasik changed the title EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector [EarlyReturn][Php80] Fix used along tweak between Php8ResourceReturnToObjectRector+ChangeOrIfReturnToEarlyReturnRector Apr 1, 2022
@TomasVotruba
Copy link
Copy Markdown
Member

TomasVotruba commented Apr 1, 2022

Thanks 👍

@TomasVotruba TomasVotruba merged commit 3596755 into main Apr 1, 2022
@TomasVotruba TomasVotruba deleted the fix-used-along-change-or-fi branch April 1, 2022 05:31
@samsonasik samsonasik mentioned this pull request Apr 1, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Refresh PHPStan types on each applied rules

2 participants

@samsonasik @TomasVotruba