Check also AssignRef in all assignment rules

phpstan · Nov 13, 2020 · 1639213 · 1639213
1 parent 9afec60
commit 1639213
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 7 deletions.
diff --git a/src/Rules/Arrays/AppendedArrayItemTypeRule.php b/src/Rules/Arrays/AppendedArrayItemTypeRule.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\AssignRef;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -41,6 +42,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 		if (
 			!$node instanceof Assign
 			&& !$node instanceof AssignOp
+			&& !$node instanceof AssignRef
 		) {
 			return [];
 		}
@@ -66,7 +68,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($node instanceof Assign) {
+		if ($node instanceof Assign || $node instanceof AssignRef) {
 			$assignedValueType = $scope->getType($node->expr);
 		} else {
 			$assignedValueType = $scope->getType($node);

diff --git a/src/Rules/Arrays/OffsetAccessValueAssignmentRule.php b/src/Rules/Arrays/OffsetAccessValueAssignmentRule.php
@@ -36,6 +36,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 		if (
 			!$node instanceof Assign
 			&& !$node instanceof AssignOp
+			&& !$node instanceof Expr\AssignRef
 		) {
 			return [];
 		}
@@ -46,7 +47,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 
 		$arrayDimFetch = $node->var;
 
-		if ($node instanceof Assign) {
+		if ($node instanceof Assign || $node instanceof Expr\AssignRef) {
 			$assignedValueType = $scope->getType($node->expr);
 		} else {
 			$assignedValueType = $scope->getType($node);

diff --git a/src/Rules/Properties/TypesAssignedToPropertiesRule.php b/src/Rules/Properties/TypesAssignedToPropertiesRule.php
@@ -41,6 +41,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (
 			!$node instanceof Node\Expr\Assign
 			&& !$node instanceof Node\Expr\AssignOp
+			&& !$node instanceof Node\Expr\AssignRef
 		) {
 			return [];
 		}
@@ -61,7 +62,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$propertyType = $propertyReflection->getWritableType();
 
-		if ($node instanceof Node\Expr\Assign) {
+		if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignRef) {
 			$assignedValueType = $scope->getType($node->expr);
 		} else {
 			$assignedValueType = $scope->getType($node);

diff --git a/src/Rules/Properties/WritingToReadOnlyPropertiesRule.php b/src/Rules/Properties/WritingToReadOnlyPropertiesRule.php
@@ -44,6 +44,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (
 			!$node instanceof Node\Expr\Assign
 			&& !$node instanceof Node\Expr\AssignOp
+			&& !$node instanceof Node\Expr\AssignRef
 		) {
 			return [];
 		}

diff --git a/tests/PHPStan/Rules/Arrays/AppendedArrayItemTypeRuleTest.php b/tests/PHPStan/Rules/Arrays/AppendedArrayItemTypeRuleTest.php
@@ -42,15 +42,19 @@ public function testAppendedArrayItemType(): void
 				],
 				[
 					'Array (array<int>) does not accept string.',
-					30,
+					27,
+				],
+				[
+					'Array (array<int>) does not accept string.',
+					32,
 				],
 				[
 					'Array (array<callable(): string>) does not accept Closure(): int.',
-					43,
+					45,
 				],
 				[
 					'Array (array<AppendedArrayItem\Lorem>) does not accept AppendedArrayItem\Baz.',
-					77,
+					79,
 				],
 			]
 		);

diff --git a/tests/PHPStan/Rules/Arrays/OffsetAccessValueAssignmentRuleTest.php b/tests/PHPStan/Rules/Arrays/OffsetAccessValueAssignmentRuleTest.php
@@ -36,9 +36,13 @@ public function testRule(): void
 				'ArrayAccess<int, int> does not accept array<int, string>.',
 				21,
 			],
+			[
+				'ArrayAccess<int, int> does not accept string.',
+				24,
+			],
 			[
 				'ArrayAccess<int, int> does not accept float.',
-				35,
+				38,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Arrays/data/appended-array-item.php b/tests/PHPStan/Rules/Arrays/data/appended-array-item.php
@@ -23,6 +23,8 @@ public function doFoo()
 		$this->callables[] = [__CLASS__, 'classMethod'];
 		$world = 'world';
 		$this->callables[] = ['Foo', "Hello $world"];
+
+		$this->integers[] = &$world;
 	}
 
 	public function assignOp()

diff --git a/tests/PHPStan/Rules/Arrays/data/offset-access-value-assignment.php b/tests/PHPStan/Rules/Arrays/data/offset-access-value-assignment.php
@@ -19,6 +19,9 @@ public function doFoo(\ArrayAccess $arrayAccess): void
 
 		$arrayAccess[] = 'baz';
 		$arrayAccess[] = ['foo'];
+
+		$s = 'foo';
+		$arrayAccess[] = &$s;
 	}
 
 	public function doBar(int $test): void

diff --git a/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php
@@ -74,6 +74,10 @@ public function testTypesAssignedToProperties(): void
 				'Static property PropertiesAssignedTypes\Ipsum::$fooStatic (PropertiesAssignedTypes\Ipsum) does not accept PropertiesAssignedTypes\Bar.',
 				144,
 			],
+			[
+				'Property PropertiesAssignedTypes\AssignRefFoo::$stringProperty (string) does not accept int.',
+				312,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Properties/WritingToReadOnlyPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/WritingToReadOnlyPropertiesRuleTest.php
@@ -53,6 +53,10 @@ public function testCheckAllProperties(): void
 				'Property WritingToReadOnlyProperties\Foo::$readOnlyProperty is not writable.',
 				26,
 			],
+			[
+				'Property WritingToReadOnlyProperties\Foo::$readOnlyProperty is not writable.',
+				35,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Properties/data/properties-assigned-types.php b/tests/PHPStan/Rules/Properties/data/properties-assigned-types.php
@@ -299,3 +299,17 @@ function test(): void
 		$this->var = [[]];
 	}
 }
+
+class AssignRefFoo
+{
+
+	/** @var string */
+	private $stringProperty;
+
+	public function doFoo()
+	{
+		$i = 1;
+		$this->stringProperty = &$i;
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Properties/data/writing-to-read-only-properties.php b/tests/PHPStan/Rules/Properties/data/writing-to-read-only-properties.php
@@ -30,6 +30,9 @@ public function doFoo()
 
 		$self->writeOnlyProperty = 1;
 		$self->writeOnlyProperty .= 1;
+
+		$s = 'foo';
+		$self->readOnlyProperty = &$s;
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,9 +36,13 @@ public function testRule(): void @@
     				'ArrayAccess<int, int> does not accept array<int, string>.',
 ,
     			],
+    			[
+    				'ArrayAccess<int, int> does not accept string.',
+,
+    			],
     			[
     				'ArrayAccess<int, int> does not accept float.',
-,
+,
     			],
     		]);
     	}
@@ Expand Down @@