Skip to content

Eliminate the OriginalPropertyTypeExpr, GetOffsetValueTypeExpr and GetIterableKey/ValueTypeExpr virtual nodes #6129

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
ondrejmirtes merged 4 commits into from
Jul 28, 2026
Merged

Eliminate the OriginalPropertyTypeExpr, GetOffsetValueTypeExpr and GetIterableKey/ValueTypeExpr virtual nodes #6129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19b98b3
Eliminate the OriginalPropertyTypeExpr virtual node
ondrejmirtes Jun 18, 2026
02b9227
Eliminate the GetOffsetValueTypeExpr virtual node
ondrejmirtes Jun 18, 2026
1767d11
Eliminate the GetIterableKeyTypeExpr virtual node
ondrejmirtes Jun 18, 2026
f14a010
Eliminate the GetIterableValueTypeExpr virtual node
ondrejmirtes Jun 18, 2026
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
27 changes: 22 additions & 5 deletions src/Analyser/ExprHandler/AssignHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
use PHPStan\Analyser\TypeSpecifierContext;
use PHPStan\DependencyInjection\AutowiredService;
use PHPStan\Node\Expr\ExistingArrayDimFetch;
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
use PHPStan\Node\Expr\IntertwinedVariableByReferenceWithExpr;
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
use PHPStan\Node\Expr\SetOffsetValueTypeExpr;
use PHPStan\Node\Expr\TypeExpr;
Expand All @@ -52,6 +50,7 @@
use PHPStan\Node\VariableAssignNode;
use PHPStan\Node\VirtualNode;
use PHPStan\Php\PhpVersion;
use PHPStan\Rules\Properties\PropertyReflectionFinder;
use PHPStan\ShouldNotHappenException;
use PHPStan\TrinaryLogic;
use PHPStan\Type\Accessory\AccessoryArrayListType;
Expand All @@ -73,6 +72,7 @@
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\TypeUtils;
use PHPStan\Type\UnionType;
use TypeError;
use function array_key_last;
use function array_merge;
Expand All @@ -97,6 +97,7 @@
private ExprPrinter $exprPrinter,
private MatchHandler $matchHandler,
private ExpressionResultFactory $expressionResultFactory,
private PropertyReflectionFinder $propertyReflectionFinder,
)
{
}
Expand Down Expand Up @@ -550,7 +551,7 @@
while ($var instanceof ArrayDimFetch) {
$varForSetOffsetValue = $var->var;
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
$varForSetOffsetValue = new TypeExpr($this->getOriginalPropertyType($varForSetOffsetValue, $scope));
}

if (
Expand Down Expand Up @@ -962,7 +963,7 @@
} else {
$dimExpr = $arrayItem->key;
}
$getOffsetValueTypeExpr = new GetOffsetValueTypeExpr($assignedExpr, $dimExpr);
$getOffsetValueTypeExpr = new TypeExpr($scope->getType($assignedExpr)->getOffsetValueType($scope->getType($dimExpr)));
$result = $this->processAssignVar(
$nodeScopeResolver,
$scope,
Expand All @@ -987,7 +988,7 @@
while ($var instanceof ExistingArrayDimFetch) {
$varForSetOffsetValue = $var->getVar();
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
$varForSetOffsetValue = new TypeExpr($this->getOriginalPropertyType($varForSetOffsetValue, $scope));
}
$assignedPropertyExpr = new SetExistingOffsetValueTypeExpr(
$varForSetOffsetValue,
Expand Down Expand Up @@ -1645,4 +1646,20 @@
return false;
}

/**
* Returns the property's readable (declared) type, filtered down to the union
* members that are not disjoint from the currently narrowed property type.
*/
private function getOriginalPropertyType(PropertyFetch|StaticPropertyFetch $propertyFetch, MutatingScope $scope): Type
{
$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($propertyFetch, $scope);
$originalPropertyType = $propertyReflection !== null ? $propertyReflection->getReadableType() : new ErrorType();
if ($originalPropertyType instanceof UnionType) {
$currentPropertyType = $scope->getType($propertyFetch);
$originalPropertyType = $originalPropertyType->filterTypes(static fn (Type $innerType) => !$innerType->isSuperTypeOf($currentPropertyType)->no());

Check warning on line 1659 in src/Analyser/ExprHandler/AssignHandler.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 		$originalPropertyType = $propertyReflection !== null ? $propertyReflection->getReadableType() : new ErrorType();
 		if ($originalPropertyType instanceof UnionType) {
 			$currentPropertyType = $scope->getType($propertyFetch);
-			$originalPropertyType = $originalPropertyType->filterTypes(static fn (Type $innerType) => !$innerType->isSuperTypeOf($currentPropertyType)->no());
+			$originalPropertyType = $originalPropertyType->filterTypes(static fn (Type $innerType) => !$currentPropertyType->isSuperTypeOf($innerType)->no());
 		}
 
 		return $originalPropertyType;

Check warning on line 1659 in src/Analyser/ExprHandler/AssignHandler.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 		$originalPropertyType = $propertyReflection !== null ? $propertyReflection->getReadableType() : new ErrorType();
 		if ($originalPropertyType instanceof UnionType) {
 			$currentPropertyType = $scope->getType($propertyFetch);
-			$originalPropertyType = $originalPropertyType->filterTypes(static fn (Type $innerType) => !$innerType->isSuperTypeOf($currentPropertyType)->no());
+			$originalPropertyType = $originalPropertyType->filterTypes(static fn (Type $innerType) => !$currentPropertyType->isSuperTypeOf($innerType)->no());
 		}
 
 		return $originalPropertyType;
}

return $originalPropertyType;
}

}
64 changes: 0 additions & 64 deletions src/Analyser/ExprHandler/Virtual/GetIterableKeyTypeExprHandler.php
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions src/Analyser/ExprHandler/Virtual/GetIterableValueTypeExprHandler.php
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions src/Analyser/ExprHandler/Virtual/GetOffsetValueTypeExprHandler.php
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions src/Analyser/ExprHandler/Virtual/OriginalPropertyTypeExprHandler.php
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions src/Analyser/ExprHandler/Virtual/SetExistingOffsetValueTypeExprHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
use PHPStan\Analyser\TypeSpecifier;
use PHPStan\Analyser\TypeSpecifierContext;
use PHPStan\DependencyInjection\AutowiredService;
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;

/**
* @implements ExprHandler<SetExistingOffsetValueTypeExpr>
Expand Down Expand Up @@ -55,14 +53,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex

public function resolveType(MutatingScope $scope, Expr $expr): Type
{
$varNode = $expr->getVar();
$varType = $scope->getType($varNode);
if ($varNode instanceof OriginalPropertyTypeExpr) {
$currentPropertyType = $scope->getType($varNode->getPropertyFetch());
if ($varType instanceof UnionType) {
$varType = $varType->filterTypes(static fn (Type $innerType) => !$innerType->isSuperTypeOf($currentPropertyType)->no());
}
}
$varType = $scope->getType($expr->getVar());
return $varType->setExistingOffsetValueType(
$scope->getType($expr->getDim()),
$scope->getType($expr->getValue()),
Expand Down
Loading
Loading