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

Fix unset on nested array #1987

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Fix unset on nested array #1987

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3370,17 +3370,8 @@ public function unsetExpression(Expr $expr): self
$exprVarNativeType = $this->getType($expr->var);
$dimNativeType = $this->getType($expr->dim);
$unsetNativeType = $exprVarNativeType->unsetOffset($dimNativeType);
$scope = $this->specifyExpressionType($expr->var, $unsetType, $unsetNativeType)->invalidateExpression(
new FuncCall(new FullyQualified('count'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new FullyQualified('sizeof'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new Name('count'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new Name('sizeof'), [new Arg($expr->var)]),
);

if ($expr->var instanceof Expr\ArrayDimFetch && $expr->var->dim !== null) {
$scope = $this->addMoreSpecificType($expr->var, $unsetType, $unsetNativeType);
$scope = $scope->specifyExpressionType(
$expr->var->var,
$scope->getType($expr->var->var)->setOffsetValueType(
Expand All @@ -3392,9 +3383,18 @@ public function unsetExpression(Expr $expr): self
$scope->getNativeType($expr->var),
),
);
} else {
$scope = $this->specifyExpressionType($expr->var, $unsetType, $unsetNativeType);
}

return $scope;
return $scope->invalidateExpression(
new FuncCall(new FullyQualified('count'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new FullyQualified('sizeof'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new Name('count'), [new Arg($expr->var)]),
)->invalidateExpression(
new FuncCall(new Name('sizeof'), [new Arg($expr->var)]),
);
}

return $this;
Expand Down
1 change: 1 addition & 0 deletions tests/PHPStan/Analyser/NodeScopeResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,7 @@ public function dataFileAsserts(): iterable
yield from $this->gatherAssertTypes(__DIR__ . '/data/strtr.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/static-has-method.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/mixed-to-number.php');
yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Variables/data/bug-8113.php');
rvanvelzen marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
5 changes: 5 additions & 0 deletions tests/PHPStan/Rules/Variables/UnsetRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,9 @@ public function testBug7417(): void
$this->analyse([__DIR__ . '/data/bug-7417.php'], []);
}

public function testBug8113(): void
{
$this->analyse([__DIR__ . '/data/bug-8113.php'], []);
}

}
48 changes: 48 additions & 0 deletions tests/PHPStan/Rules/Variables/data/bug-8113.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php declare(strict_types=1);

namespace Bug8113;

use function PHPStan\Testing\assertType;

function () {
/** @var mixed[][] $review */
$review = array(
'Review' => array('id' => 23,
'User' => array(
'first_name' => 'x',
),
),
'SurveyInvitation' => array(
'is_too_old_to_follow' => 'yes',
),
'User' => array(
'first_name' => 'x',
),
);

assertType('array<array>', $review);

if (
array_key_exists('review', $review['SurveyInvitation']) &&
$review['SurveyInvitation']['review'] === null
) {
assertType("array<array>&hasOffsetValue('SurveyInvitation', array&hasOffsetValue('review', null))", $review);
$review['Review'] = [
'id' => null,
'text' => null,
'answer' => null,
];
assertType("non-empty-array<array>&hasOffsetValue('Review', array{id: null, text: null, answer: null})&hasOffsetValue('SurveyInvitation', array&hasOffsetValue('review', null))", $review);
unset($review['SurveyInvitation']['review']);
assertType("non-empty-array<array>&hasOffsetValue('Review', array{id: null, text: null, answer: null})&hasOffsetValue('SurveyInvitation', array<mixed~'review', mixed>)", $review);
}
assertType('array<array>', $review);
if (array_key_exists('User', $review['Review'])) {
assertType("array<array>&hasOffsetValue('Review', array&hasOffset('User'))", $review);
$review['User'] = $review['Review']['User'];
assertType("hasOffsetValue('Review', array&hasOffset('User'))&hasOffsetValue('User', mixed)&non-empty-array", $review);
unset($review['Review']['User']);
assertType("hasOffsetValue('Review', array<mixed~'User', mixed>)&hasOffsetValue('User', mixed)&non-empty-array", $review);
}
assertType("array&hasOffsetValue('Review', array)", $review);
};