Skip to content

Skip non-discriminating guards in createConditionalExpressions even when target is not tracked in the other scope #5676

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

Open
phpstan-bot wants to merge 1 commit into
base: 2.1.x
Choose a base branch
from
+54 −4
Open

Skip non-discriminating guards in createConditionalExpressions even when target is not tracked in the other scope #5676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3749,11 +3749,16 @@

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()

Check warning on line 3757 in src/Analyser/MutatingScope.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 					&& (
 						(
 							array_key_exists($exprString, $theirExpressionTypes)
-							&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
+							&& !$theirExpressionTypes[$exprString]->getCertainty()->no()
 							&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
 						)
 						|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()

Check warning on line 3757 in src/Analyser/MutatingScope.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 					&& (
 						(
 							array_key_exists($exprString, $theirExpressionTypes)
-							&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
+							&& !$theirExpressionTypes[$exprString]->getCertainty()->no()
 							&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
 						)
 						|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()
&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()

Check warning on line 3758 in src/Analyser/MutatingScope.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 						(
 							array_key_exists($exprString, $theirExpressionTypes)
 							&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
-							&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
+							&& !$theirExpressionTypes[$guardExprString]->getType()->isSuperTypeOf($guardHolder->getType())->no()
 						)
 						|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()
 					)

Check warning on line 3758 in src/Analyser/MutatingScope.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 						(
 							array_key_exists($exprString, $theirExpressionTypes)
 							&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
-							&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
+							&& !$theirExpressionTypes[$guardExprString]->getType()->isSuperTypeOf($guardHolder->getType())->no()
 						)
 						|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()
 					)
)
|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()
)
) {
continue;
}
Expand Down
45 changes: 45 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-14595.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Bug14595;

use function PHPStan\Testing\assertType;

/**
* @param array{
* multiple: 0|1|2
* , total: bool
* } $options
*/
function arrayAppendGuard(array $options): void {
$instructions = [ ];
$instructions[] = "foo";
if ($options['multiple'] != 1 || $options['total'])
$instructions[] = "bar";
assertType('0|1|2', $options['multiple']);
if (!$options['total'])
$instructions[] = "baz";
assertType('0|1|2', $options['multiple']);
if (!$options['total'])
$instructions[] = "qux";
assertType('0|1|2', $options['multiple']);
}

/**
* @param array{
* multiple: 0|1|2
* , total: bool
* } $options
*/
function strictComparisonGuard(array $options): void {
$instructions = [ ];
$instructions[] = "foo";
if ($options['multiple'] !== 1 || $options['total'])
$instructions[] = "bar";
assertType('0|1|2', $options['multiple']);
if (!$options['total'])
$instructions[] = "baz";
assertType('0|1|2', $options['multiple']);
if (!$options['total'])
$instructions[] = "qux";
assertType('0|1|2', $options['multiple']);
}
Loading