diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php index daf5bb9eb3..213ed039a1 100644 --- a/src/Analyser/MutatingScope.php +++ b/src/Analyser/MutatingScope.php @@ -3749,11 +3749,16 @@ private function createConditionalExpressions( foreach ($variableTypeGuards as $guardExprString => $guardHolder) { if ( - array_key_exists($exprString, $theirExpressionTypes) - && $theirExpressionTypes[$exprString]->getCertainty()->yes() - && array_key_exists($guardExprString, $theirExpressionTypes) + array_key_exists($guardExprString, $theirExpressionTypes) && $theirExpressionTypes[$guardExprString]->getCertainty()->yes() - && !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no() + && ( + ( + array_key_exists($exprString, $theirExpressionTypes) + && $theirExpressionTypes[$exprString]->getCertainty()->yes() + && !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no() + ) + || $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes() + ) ) { continue; } diff --git a/tests/PHPStan/Analyser/nsrt/bug-14595.php b/tests/PHPStan/Analyser/nsrt/bug-14595.php new file mode 100644 index 0000000000..cee7eee39f --- /dev/null +++ b/tests/PHPStan/Analyser/nsrt/bug-14595.php @@ -0,0 +1,45 @@ +