Nuke OriginalPropertyTypeExpr

Author: herndlm

src/Analyser/MutatingScope.php

@@ -34,7 +34,6 @@
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
 use PHPStan\Node\Expr\GetIterableValueTypeExpr;
 use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
-use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
 use PHPStan\Node\Expr\ParameterVariableOriginalValueExpr;
 use PHPStan\Node\Expr\PropertyInitializationExpr;
 use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
@@ -689,15 +688,6 @@ public function getType(Expr $node): Type
 			return $node->getExprType();
 		}
 
-		if ($node instanceof OriginalPropertyTypeExpr) {
-			$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($node->getPropertyFetch(), $this);
-			if ($propertyReflection === null) {
-				return new ErrorType();
-			}
-
-			return $propertyReflection->getReadableType();
-		}
-
 		$key = $this->getNodeKey($node);
 
 		if (!array_key_exists($key, $this->resolvedTypes)) {

src/Analyser/NodeScopeResolver.php

@@ -84,7 +84,6 @@
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
 use PHPStan\Node\Expr\GetIterableValueTypeExpr;
 use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
-use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
 use PHPStan\Node\Expr\PropertyInitializationExpr;
 use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
 use PHPStan\Node\Expr\SetOffsetValueTypeExpr;
@@ -5022,12 +5021,8 @@ 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);
-				}
 				$assignedPropertyExpr = new SetOffsetValueTypeExpr(
-					$varForSetOffsetValue,
+					$var->var,
 					$var->dim,
 					$assignedPropertyExpr,
 				);
@@ -5342,12 +5337,8 @@ static function (): void {
 			$dimFetchStack = [];
 			$assignedPropertyExpr = $assignedExpr;
 			while ($var instanceof ExistingArrayDimFetch) {
-				$varForSetOffsetValue = $var->getVar();
-				if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
-					$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
-				}
 				$assignedPropertyExpr = new SetExistingOffsetValueTypeExpr(
-					$varForSetOffsetValue,
+					$var->getVar(),
 					$var->getDim(),
 					$assignedPropertyExpr,
 				);

src/Node/Expr/OriginalPropertyTypeExpr.php

@@ -8,7 +8,6 @@
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
 use PHPStan\Node\Expr\GetIterableValueTypeExpr;
 use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
-use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
 use PHPStan\Node\Expr\ParameterVariableOriginalValueExpr;
 use PHPStan\Node\Expr\PropertyInitializationExpr;
 use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
@@ -57,11 +56,6 @@ protected function pPHPStan_Node_ExistingArrayDimFetch(ExistingArrayDimFetch $ex
 		return sprintf('__phpstanExistingArrayDimFetch(%s, %s)', $this->p($expr->getVar()), $this->p($expr->getDim()));
 	}
 
-	protected function pPHPStan_Node_OriginalPropertyTypeExpr(OriginalPropertyTypeExpr $expr): string // phpcs:ignore
-	{
-		return sprintf('__phpstanOriginalPropertyType(%s)', $this->p($expr->getPropertyFetch()));
-	}
-
 	protected function pPHPStan_Node_SetOffsetValueTypeExpr(SetOffsetValueTypeExpr $expr): string // phpcs:ignore
 	{
 		return sprintf('__phpstanSetOffsetValueType(%s, %s, %s)', $this->p($expr->getVar()), $expr->getDim() !== null ? $this->p($expr->getDim()) : 'null', $this->p($expr->getValue()));

src/Node/Printer/Printer.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Expr\SetOffsetValueTypeExpr;
 use PHPStan\Node\PropertyAssignNode;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Rules\IdentifierRuleError;
@@ -61,7 +62,16 @@ private function processSingleProperty(
 
 		$propertyType = $propertyReflection->getWritableType();
 		$scope = $propertyReflection->getScope();
-		$assignedValueType = $scope->getType($assignedExpr);
+
+		if ($assignedExpr instanceof SetOffsetValueTypeExpr) {
+			// TODO: Document why we need this only for setting offset values, do we actually need this?! xD
+			$assignedValueType = $propertyType->setOffsetValueType(
+				$assignedExpr->getDim() !== null ? $scope->getType($assignedExpr->getDim()) : null,
+				$scope->getType($assignedExpr->getValue()),
+			);
+		} else {
+			$assignedValueType = $scope->getType($assignedExpr);
+		}
 
 		$accepts = $this->ruleLevelHelper->acceptsWithReason($propertyType, $assignedValueType, $scope->isDeclareStrictTypes());
 		if (!$accepts->result) {