Narrow type on setting offsets of properties

Author: herndlm

src/Analyser/MutatingScope.php

@@ -37,7 +37,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;
@@ -693,15 +692,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

@@ -85,7 +85,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;
@@ -5344,12 +5343,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,
 				);
@@ -5682,12 +5677,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;
@@ -55,11 +54,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

@@ -689,6 +689,24 @@ public function testBug12131(): void
 		]);
 	}
 
+	public function testBug6398(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-6398.php'], []);
+	}
+
+	public function testBug6571(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-6571.php'], []);
+	}
+
+	public function testBug7880(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-7880.php'], []);
+	}
+
 	public function testShortBodySetHook(): void
 	{
 		if (PHP_VERSION_ID < 80400) {

tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Bug6398;
+
+class AsyncTask{
+	/**
+	 * @phpstan-var \ArrayObject<int, array<string, mixed>>|null
+	 */
+	private static $threadLocalStorage = null;
+
+	/**
+	 * @param mixed  $complexData the data to store
+	 */
+	protected function storeLocal(string $key, $complexData) : void{
+		if(self::$threadLocalStorage === null){
+			self::$threadLocalStorage = new \ArrayObject();
+		}
+		self::$threadLocalStorage[spl_object_id($this)][$key] = $complexData;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	protected function fetchLocal(string $key){
+		$id = spl_object_id($this);
+		if(self::$threadLocalStorage === null or !isset(self::$threadLocalStorage[$id][$key])){
+			throw new \InvalidArgumentException("No matching thread-local data found on this thread");
+		}
+
+		return self::$threadLocalStorage[$id][$key];
+	}
+}

tests/PHPStan/Rules/Properties/data/bug-6398.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1); // lint >= 7.4
+
+namespace Bug6571;
+
+interface ClassLoader{}
+
+class HelloWorld
+{
+	/** @var \Threaded|\ClassLoader[]|null  */
+	private ?\Threaded $classLoaders = null;
+
+	/**
+	 * @param \ClassLoader[] $autoloaders
+	 */
+	public function setClassLoaders(?array $autoloaders = null) : void{
+		if($autoloaders === null){
+			$autoloaders = [];
+		}
+
+		if($this->classLoaders === null){
+			$this->classLoaders = new \Threaded();
+		}else{
+			foreach($this->classLoaders as $k => $autoloader){
+				unset($this->classLoaders[$k]);
+			}
+		}
+		foreach($autoloaders as $autoloader){
+			$this->classLoaders[] = $autoloader;
+		}
+	}
+}

tests/PHPStan/Rules/Properties/data/bug-6571.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace Bug7880;
+
+class C {
+	/** @var array{a: string, b: string}|null */
+	private $a = null;
+
+	public function foo(): void {
+		if ($this->a !== null) {
+			$this->a['b'] = "baz";
+		}
+	}
+}