UninitializedPropertyRule - do not report implicit array creation as …

…premature access
phpstan · Jan 8, 2022 · e9ae0f8 · e9ae0f8
1 parent f2b59e3
commit e9ae0f8
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 25 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -3115,14 +3115,14 @@ private function processAssignVar(
 			}
 
 			// 1. eval root expr
-			if ($enterExpressionAssign && $var instanceof Variable) {
+			if ($enterExpressionAssign) {
 				$scope = $scope->enterExpressionAssign($var);
 			}
 			$result = $this->processExprNode($var, $scope, $nodeCallback, $context->enterDeep());
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$scope = $result->getScope();
-			if ($enterExpressionAssign && $var instanceof Variable) {
+			if ($enterExpressionAssign) {
 				$scope = $scope->exitExpressionAssign($var);
 			}
 

diff --git a/src/Rules/Properties/AccessPropertiesInAssignRule.php b/src/Rules/Properties/AccessPropertiesInAssignRule.php
@@ -4,10 +4,11 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\PropertyAssignNode;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Expr\Assign>
+ * @implements Rule<PropertyAssignNode>
  */
 class AccessPropertiesInAssignRule implements Rule
 {
@@ -18,16 +19,16 @@ public function __construct(private AccessPropertiesRule $accessPropertiesRule)
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\Assign::class;
+		return PropertyAssignNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->var instanceof Node\Expr\PropertyFetch) {
+		if (!$node->getPropertyFetch() instanceof Node\Expr\PropertyFetch) {
 			return [];
 		}
 
-		return $this->accessPropertiesRule->processNode($node->var, $scope);
+		return $this->accessPropertiesRule->processNode($node->getPropertyFetch(), $scope);
 	}
 
 }
diff --git a/src/Rules/Properties/AccessStaticPropertiesInAssignRule.php b/src/Rules/Properties/AccessStaticPropertiesInAssignRule.php
@@ -4,10 +4,11 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\PropertyAssignNode;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Expr\Assign>
+ * @implements Rule<PropertyAssignNode>
  */
 class AccessStaticPropertiesInAssignRule implements Rule
 {
@@ -18,16 +19,16 @@ public function __construct(private AccessStaticPropertiesRule $accessStaticProp
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\Assign::class;
+		return PropertyAssignNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->var instanceof Node\Expr\StaticPropertyFetch) {
+		if (!$node->getPropertyFetch() instanceof Node\Expr\StaticPropertyFetch) {
 			return [];
 		}
 
-		return $this->accessStaticPropertiesRule->processNode($node->var, $scope);
+		return $this->accessStaticPropertiesRule->processNode($node->getPropertyFetch(), $scope);
 	}
 
 }
diff --git a/src/Rules/RuleErrorBuilder.php b/src/Rules/RuleErrorBuilder.php
@@ -21,7 +21,7 @@ class RuleErrorBuilder
 	private int $type;
 
 	/** @var mixed[] */
-	private array $properties = [];
+	private array $properties;
 
 	private function __construct(string $message)
 	{

diff --git a/tests/PHPStan/Rules/DeadCode/UnusedPrivatePropertyRuleTest.php b/tests/PHPStan/Rules/DeadCode/UnusedPrivatePropertyRuleTest.php
@@ -131,6 +131,16 @@ public function testRule(): void
 				191,
 				$tip,
 			],
+			[
+				'Property UnusedPrivateProperty\WriteToCollection::$collection1 is never read, only written.',
+				221,
+				$tip,
+			],
+			[
+				'Property UnusedPrivateProperty\WriteToCollection::$collection2 is never read, only written.',
+				224,
+				$tip,
+			],
 		]);
 		$this->analyse([__DIR__ . '/data/TestExtension.php'], [
 			[

diff --git a/tests/PHPStan/Rules/Properties/AccessPropertiesInAssignRuleTest.php b/tests/PHPStan/Rules/Properties/AccessPropertiesInAssignRuleTest.php
@@ -23,6 +23,10 @@ protected function getRule(): Rule
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/access-properties-assign.php'], [
+			[
+				'Access to an undefined property TestAccessPropertiesAssign\AccessPropertyWithDimFetch::$foo.',
+				10,
+			],
 			[
 				'Access to an undefined property TestAccessPropertiesAssign\AccessPropertyWithDimFetch::$foo.',
 				15,

diff --git a/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php
@@ -157,10 +157,6 @@ public function testAccessProperties(): void
 					'Access to an undefined property class@anonymous/tests/PHPStan/Rules/Properties/data/access-properties.php:294::$barProperty.',
 					299,
 				],
-				[
-					'Access to an undefined property TestAccessProperties\AccessPropertyWithDimFetch::$foo.',
-					364,
-				],
 				[
 					'Access to an undefined property TestAccessProperties\AccessInIsset::$foo.',
 					386,
@@ -295,10 +291,6 @@ public function testAccessPropertiesWithoutUnionTypes(): void
 					'Access to an undefined property class@anonymous/tests/PHPStan/Rules/Properties/data/access-properties.php:294::$barProperty.',
 					299,
 				],
-				[
-					'Access to an undefined property TestAccessProperties\AccessPropertyWithDimFetch::$foo.',
-					364,
-				],
 				[
 					'Access to an undefined property TestAccessProperties\AccessInIsset::$foo.',
 					386,
@@ -322,10 +314,6 @@ public function testAccessPropertiesOnThisOnly(): void
 					'Access to private property $foo of parent class TestAccessProperties\FooAccessProperties.',
 					24,
 				],
-				[
-					'Access to an undefined property TestAccessProperties\AccessPropertyWithDimFetch::$foo.',
-					364,
-				],
 				[
 					'Access to an undefined property TestAccessProperties\AccessInIsset::$foo.',
 					386,

diff --git a/tests/PHPStan/Rules/Properties/AccessStaticPropertiesInAssignRuleTest.php b/tests/PHPStan/Rules/Properties/AccessStaticPropertiesInAssignRuleTest.php
@@ -24,6 +24,10 @@ protected function getRule(): Rule
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/access-static-properties-assign.php'], [
+			[
+				'Access to an undefined static property TestAccessStaticPropertiesAssign\AccessStaticPropertyWithDimFetch::$foo.',
+				10,
+			],
 			[
 				'Access to an undefined static property TestAccessStaticPropertiesAssign\AccessStaticPropertyWithDimFetch::$foo.',
 				15,

diff --git a/tests/PHPStan/Rules/Properties/data/access-properties-assign.php b/tests/PHPStan/Rules/Properties/data/access-properties-assign.php
@@ -7,7 +7,7 @@ class AccessPropertyWithDimFetch
 
 	public function doFoo()
 	{
-		$this->foo['foo'] = 'test'; // already reported by a separate rule
+		$this->foo['foo'] = 'test';
 	}
 
 	public function doBar()

diff --git a/tests/PHPStan/Rules/Properties/data/access-static-properties-assign.php b/tests/PHPStan/Rules/Properties/data/access-static-properties-assign.php
@@ -7,7 +7,7 @@ class AccessStaticPropertyWithDimFetch
 
 	public function doFoo()
 	{
-		self::$foo['foo'] = 'test'; // already reported by a separate rule
+		self::$foo['foo'] = 'test';
 	}
 
 	public function doBar()

diff --git a/tests/PHPStan/Rules/Properties/data/uninitialized-property.php b/tests/PHPStan/Rules/Properties/data/uninitialized-property.php
@@ -122,3 +122,29 @@ class TestExtension
 	private int $uninited;
 
 }
+
+class ImplicitArrayCreation
+{
+
+	/** @var mixed[] */
+	private array $properties;
+
+	private function __construct(string $message)
+	{
+		$this->properties['message'] = $message;
+	}
+
+}
+
+class ImplicitArrayCreation2
+{
+
+	/** @var mixed[] */
+	private array $properties;
+
+	private function __construct(string $message)
+	{
+		$this->properties['foo']['message'] = $message;
+	}
+
+}