Skip to content

Narrow type on setting offsets of properties #3699

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

Merged
merged 4 commits into from
Mar 20, 2025
Merged

Narrow type on setting offsets of properties #3699

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9876d88
tests
ondrejmirtes Mar 20, 2025
a4bf7cd
Fix for ArrayAccess
ondrejmirtes Mar 20, 2025
1193ebb
Remove non-working test
ondrejmirtes Mar 20, 2025
280b718
Works only on 8+
ondrejmirtes Mar 20, 2025
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
Prev Previous commit
Next Next commit
Fix for ArrayAccess
  • Loading branch information
@ondrejmirtes
ondrejmirtes committed Mar 20, 2025
commit a4bf7cdc88fd6fc4032f83d5db2bafb4ca8fc735
28 changes: 22 additions & 6 deletions src/Analyser/NodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5344,9 +5344,17 @@ private function processAssignVar(
$originalVar = $var;
$assignedPropertyExpr = $assignedExpr;
while ($var instanceof ArrayDimFetch) {
$varForSetOffsetValue = $var->var;
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
if (
$var->var instanceof PropertyFetch
|| $var->var instanceof StaticPropertyFetch
) {
if (((new ObjectType(ArrayAccess::class))->isSuperTypeOf($scope->getType($var->var))->yes())) {
$varForSetOffsetValue = $var->var;
} else {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($var->var);
}
} else {
$varForSetOffsetValue = $var->var;
}
$assignedPropertyExpr = new SetOffsetValueTypeExpr(
$varForSetOffsetValue,
Expand Down Expand Up @@ -5682,9 +5690,17 @@ static function (): void {
$dimFetchStack = [];
$assignedPropertyExpr = $assignedExpr;
while ($var instanceof ExistingArrayDimFetch) {
$varForSetOffsetValue = $var->getVar();
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
if (
$var->getVar() instanceof PropertyFetch
|| $var->getVar() instanceof StaticPropertyFetch
) {
if (((new ObjectType(ArrayAccess::class))->isSuperTypeOf($scope->getType($var->getVar()))->yes())) {
$varForSetOffsetValue = $var->getVar();
} else {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($var->getVar());
}
} else {
$varForSetOffsetValue = $var->getVar();
}
$assignedPropertyExpr = new SetExistingOffsetValueTypeExpr(
$varForSetOffsetValue,
Expand Down