-
Notifications
You must be signed in to change notification settings - Fork 530
TypeSpecifier: Narrow (bool) $expr
like $expr == true
#3380
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.
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
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6427f14
TypeSpecifier: Narrow `(bool) $expr` like `$expr == true`
staabm d6de4dc
added regression test
staabm 2e6e5d4
regression test
staabm 32b251b
regression test
staabm 58edd53
added regression test
staabm 5b1543a
one test per bug
staabm 02c971a
move
staabm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
<?php | ||
|
||
namespace NarrowBoolCast; | ||
|
||
use function PHPStan\Testing\assertType; | ||
|
||
/** @param array<mixed> $arr */ | ||
function doFoo(string $x, array $arr): void { | ||
if ((bool) strlen($x)) { | ||
assertType('string', $x); // could be non-empty-string | ||
} else { | ||
assertType('string', $x); | ||
} | ||
assertType('string', $x); | ||
|
||
if ((bool) array_search($x, $arr, true)) { | ||
assertType('non-empty-array', $arr); | ||
} else { | ||
assertType('array', $arr); | ||
} | ||
assertType('string', $x); | ||
|
||
if ((bool) preg_match('~.*~', $x, $matches)) { | ||
assertType('array{string}', $matches); | ||
} else { | ||
assertType('array{}', $matches); | ||
} | ||
assertType('array{}|array{string}', $matches); | ||
} | ||
|
||
|
||
interface Reader { | ||
public function getFilePath(): string|false; | ||
} | ||
|
||
function bug7685(Reader $reader): void { | ||
$filePath = $reader->getFilePath(); | ||
if (false !== (bool) $filePath) { | ||
assertType('non-falsy-string', $filePath); | ||
} | ||
} | ||
|
||
function bug6006() { | ||
/** @var array<string, null|string> $data */ | ||
$data = [ | ||
'name' => 'John', | ||
'dob' => null, | ||
]; | ||
|
||
$data = array_filter($data, fn(?string $input): bool => (bool)$input); | ||
|
||
assertType('array<string, non-falsy-string>', $data); | ||
} | ||
|
||
function bug10528(string $string): void { | ||
$pos = strpos('*', $string); | ||
assert((bool) $pos); | ||
|
||
assertType('int<1, max>', $pos); | ||
|
||
$sub = substr($string, 0, $pos); | ||
assert($pos !== FALSE); | ||
$sub = substr($string, 0, $pos); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace Bug8881; | ||
|
||
/** | ||
* @param int[] $a | ||
* @return int | ||
*/ | ||
function pop($a) | ||
{ | ||
assert((bool)$a); | ||
return array_pop($a); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extremely cool! But please follow the usual convention for regression tests - one file per issue, with
bug-xxx.php
filename and namespace. I'm used to look for them in this format.