danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Prevent duplicate switch return types

Browse Source
This commit is contained in:
Brown 2020-09-25 09:45:20 -04:00
parent ea08e0c613
commit c17bacd682
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
View File

@ -268,7 +268,7 @@ class ScopeAnalyzer
}
if ($has_default_terminator || isset($stmt->allMatched)) {
return array_merge($control_actions, [self::ACTION_END]);
return \array_values(array_unique(array_merge($control_actions, [self::ACTION_END])));
}
}

15
tests/SwitchTypeTest.php
View File

@ -984,6 +984,21 @@ class SwitchTypeTest extends TestCase
return true;
}'
],
'alwaysReturnsWithConditionalReturnFirst' => [
'<?php
function getRows(string $s) : int {
if (rand(0, 1)) {
return 1;
}
switch ($s) {
case "a":
return 2;
default:
return 1;
}
}'
],
];
}