Skip to content

Fix phpstan/phpstan#6670: Return in finally does not always overwrite return in try-catch #5163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejmirtes merged 2 commits into from
Mar 13, 2026
Merged

Fix phpstan/phpstan#6670: Return in finally does not always overwrite return in try-catch #5163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc1fec
Fix false positive for return overwritten by finally when return is i…
ondrejmirtes Mar 9, 2026
225e1cd
Add regression tests for issues also fixed by the finally exit point …
phpstan-bot Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Analyser/NodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,7 @@ public function processStmtNode(
$impurePoints = array_merge($impurePoints, $finallyResult->getImpurePoints());
$finallyScope = $finallyResult->getScope();
$finalScope = $finallyResult->isAlwaysTerminating() ? $finalScope : $finalScope->processFinallyScope($finallyScope, $originalFinallyScope);
if (count($finallyResult->getExitPoints()) > 0) {
if (count($finallyResult->getExitPoints()) > 0 && $finallyResult->isAlwaysTerminating()) {
$this->callNodeCallback($nodeCallback, new FinallyExitPointsNode(
$finallyResult->toPublic()->getExitPoints(),
$finallyExitPoints,
Expand Down
5 changes: 5 additions & 0 deletions tests/PHPStan/Rules/Exceptions/OverwrittenExitPointByFinallyRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ public function testRule(): void
]);
}

public function testBug6670(): void
{
$this->analyse([__DIR__ . '/data/bug-6670.php'], []);
}

public function testBug5627(): void
{
$this->analyse([__DIR__ . '/data/bug-5627.php'], [
Expand Down
24 changes: 24 additions & 0 deletions tests/PHPStan/Rules/Exceptions/data/bug-6670.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php declare(strict_types = 1);

namespace Bug6670;

class HelloWorld
{
public function sayHello(): string
{
try {
return 'string';
} finally {
try {
$this->clearCache();
} catch(\Exception $e) {
return 'same string';
}
}
}

private function clearCache(): void
{
// do...
}
}
Loading