Skip to content
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

Jump to bottom

Truthy isset($arr[$k]) should narrow $k #3453

Draft
wants to merge 7 commits into
base: 1.12.x
Choose a base branch
from
+248 −0
Draft

Truthy isset($arr[$k]) should narrow $k #3453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcef641
Truthy `isset($arr[$k])` should narrow `$k`
staabm Sep 19, 2024
3d4f530
non benevolent
staabm Sep 19, 2024
eb7134a
fix
staabm Sep 19, 2024
8673779
fix
staabm Sep 20, 2024
f9a3c03
no resource
staabm Sep 20, 2024
612c082
fix empty string
staabm Sep 20, 2024
7cfeacd
fix '0' and '1'
staabm Sep 20, 2024
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
5 changes: 5 additions & 0 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,14 @@ public function specifyTypesInCondition(
$varType = $scope->getType($var->var);
if (!$varType->isIterableAtLeastOnce()->no()) {
$varIterableKeyType = $varType->getIterableKeyType();

if ($varIterableKeyType->isString()->yes()
&& $varIterableKeyType->isNumericString()->no()
) {
if (!$varIterableKeyType->isNonEmptyString()->no()) {
$varIterableKeyType = TypeCombinator::addNull($varIterableKeyType);
}

$types = $types->unionWith(
$this->create(
$var->dim,
Expand Down
13 changes: 13 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-11716.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,16 @@ function emptyArrr($mixed, array $arr)
}
assertType('mixed', $mixed);
}

function emptyString($mixed)
{
// see https://3v4l.org/XHZdr
$arr = ['' => 1, 'a' => 2];

if (isset($arr[$mixed])) {
assertType("''|'a'|null", $mixed);
} else {
assertType('mixed', $mixed);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mixed~(''|'a'|null)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this comment went on the wrong line (or I have puhsed a change at the same time you did the comment) and therefore it does not make sense atm?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see it on correct line, it is for falsy context:

    $arr = [0 => 0, 1 => 1, 2 => 2];
    if (isset($arr[$mixed])) {
    } else {
        // falsy context
    }

if $arr[$k] is set (and not null because of isset), then the consts types in truthy context can be substracted in the falsy context

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is sealed vs unsealed array territory. I would not do this until we have a clear separation of the 2 types

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really? If array specifies some non-optional keys, they must be present (in sealed and unsealed array) and can be substracted in the else branch, can't they?

}
assertType('mixed', $mixed);
}
Loading