Skip to content

Fix !isset() with ArrayDimFetch #2798

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

Draft
wants to merge 16 commits into
base: 1.10.x
Choose a base branch
from
Draft

Fix !isset() with ArrayDimFetch #2798

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6735af8
Fix !isset() with ArrayDimFetch
staabm Nov 28, 2023
392ff6f
impl
staabm Nov 30, 2023
f0673e8
refine
staabm Nov 30, 2023
d8b781f
more precise results
staabm Nov 30, 2023
3b96435
keep maybe certainty
staabm Nov 30, 2023
b661b68
fix sometime optional
staabm Nov 30, 2023
0a8786e
fix stan warning
staabm Nov 30, 2023
94247c7
fix build
staabm Nov 30, 2023
9ade670
Discard changes to tests/PHPStan/Rules/Arrays/data/bug-8724b.php
clxmstaab Nov 30, 2023
4fdc324
Update NonexistentOffsetInArrayDimFetchRuleTest.php
clxmstaab Nov 30, 2023
2af27cc
more tests
staabm Dec 1, 2023
93555fd
non-optional offset cannot get optional
staabm Dec 2, 2023
2b207f1
adjust expectation per discussion
staabm Dec 10, 2023
105ecda
Add new failling test-case
staabm Dec 10, 2023
59e87d2
added a multi-offset shape test
staabm Dec 10, 2023
43b8649
fix
staabm Dec 10, 2023
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
Prev Previous commit
Next Next commit
fix build
  • Loading branch information
@staabm
staabm committed Dec 9, 2023
commit 94247c71408348abfe3c8c6f0e01df90b7c59bcc
11 changes: 4 additions & 7 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,7 @@ public function specifyTypesInCondition(
$offsetType = $type->getOffsetValueType($dimType);
$isNullable = !$offsetType->isNull()->no();

$setOffset = function (Type $outerType, Type $dimType, bool $optional): Type {
return TypeTraverser::map($outerType, static function (Type $type, callable $traverse) use ($dimType, $optional): Type {
$setOffset = static fn (Type $outerType, Type $dimType, bool $optional): Type => TypeTraverser::map($outerType, static function (Type $type, callable $traverse) use ($dimType, $optional): Type {
if ($type instanceof UnionType || $type instanceof IntersectionType) {
return $traverse($type);
}
Expand All @@ -709,17 +708,15 @@ public function specifyTypesInCondition(
new NullType(),
$optional,
);
$buildType = $builder->getArray();
return $buildType;
return $builder->getArray();
}

return $type;
});
};
});

if ($hasOffset === true) {
if ($isNullable) {
$specifiedType = $this->create(
$specifiedType = $this->create(
$issetExpr->var,
$setOffset($type, $dimType, !$scope->hasExpressionType($issetExpr->var)->yes()),
$context->negate(),
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPStan/Analyser/data/tagged-unions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function doFoo4(array $foo)
if (isset($foo['C'])) {
assertType("array{A: string, C: 1}", $foo);
} else {
assertType("array{A: int, B: 1}", $foo);
assertType("array{A: int, B: 1}|array{A: string, C: 1}", $foo); // could be array{A: int, B: 1}
}

assertType('array{A: int, B: 1}|array{A: string, C: 1}', $foo);
Expand Down
4 changes: 2 additions & 2 deletions tests/PHPStan/Rules/Variables/IssetRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function testRule(): void
67,
],
[
'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
73,
],
[
Expand Down Expand Up @@ -153,7 +153,7 @@ public function testRuleWithoutTreatPhpDocTypesAsCertain(): void
67,
],
[
'Offset \'dim-null-not-set\' on array{dim: 1, dim-null: 1|null, dim-null-offset: array{a: true|null}, dim-empty: array{}} in isset() does not exist.',
'Offset \'dim-null-not-set\' on array{dim: 1, dim-null-offset: array{a: true|null}, dim-empty: array{}, dim-null: 1|null} in isset() does not exist.',
73,
],
[
Expand Down