Simplify

Author: VincentLanglet

src/Rules/Operators/InvalidAssignVarRule.php

@@ -66,42 +66,13 @@ public function processNode(Node $node, Scope $scope): array
 			];
 		}
 
-		if ($this->containsThisVariable($node->var)) {
-			return [
-				RuleErrorBuilder::message('Cannot re-assign $this.')
-					->identifier('assign.this')
-					->nonIgnorable()
-					->build(),
-			];
-		}
-
 		return [];
 	}
 
-	private function containsThisVariable(Expr $expr): bool
-	{
-		if ($expr instanceof Expr\Variable && $expr->name === 'this') {
-			return true;
-		}
-
-		if ($expr instanceof Expr\List_) {
-			foreach ($expr->items as $item) {
-				if ($item === null) {
-					continue;
-				}
-				if ($this->containsThisVariable($item->value)) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
 	private function containsNonAssignableExpression(Expr $expr): bool
 	{
 		if ($expr instanceof Expr\Variable) {
-			return false;
+			return $expr->name !== 'this';
 		}
 
 		if ($expr instanceof Expr\PropertyFetch) {

tests/PHPStan/Rules/Operators/InvalidAssignVarRuleTest.php

@@ -17,36 +17,6 @@ protected function getRule(): Rule
 		return new InvalidAssignVarRule(new NullsafeCheck());
 	}
 
-	public function testBug3585(): void
-	{
-		$this->analyse([__DIR__ . '/data/bug-3585.php'], [
-			[
-				'Cannot re-assign $this.',
-				9,
-			],
-			[
-				'Cannot re-assign $this.',
-				10,
-			],
-			[
-				'Cannot re-assign $this.',
-				11,
-			],
-			[
-				'Cannot re-assign $this.',
-				12,
-			],
-			[
-				'Cannot re-assign $this.',
-				17,
-			],
-			[
-				'Cannot re-assign $this.',
-				23,
-			],
-		]);
-	}
-
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/invalid-assign-var.php'], [
@@ -89,4 +59,34 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug3585(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3585.php'], [
+			[
+				'Expression on left side of assignment is not assignable.',
+				9,
+			],
+			[
+				'Expression on left side of assignment is not assignable.',
+				10,
+			],
+			[
+				'Expression on left side of assignment is not assignable.',
+				11,
+			],
+			[
+				'Expression on left side of assignment is not assignable.',
+				12,
+			],
+			[
+				'Expression on left side of assignment is not assignable.',
+				17,
+			],
+			[
+				'Expression on left side of assignment is not assignable.',
+				23,
+			],
+		]);
+	}
+
 }