Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

Makefile

@@ -133,6 +133,7 @@ lint:
 		--exclude tests/PHPStan/Rules/Operators/data/bug-3585.php \
 		--exclude tests/PHPStan/Rules/EnumCases/data/bug-14252.php \
 		--exclude tests/PHPStan/Rules/Functions/data/bug-14241.php \
+		--exclude tests/PHPStan/Rules/Variables/data/bug-14349.php \
 		src tests
 
 install-paratest:

src/Rules/Operators/InvalidAssignVarRule.php

@@ -72,7 +72,7 @@ public function processNode(Node $node, Scope $scope): array
 	private function containsNonAssignableExpression(Expr $expr): bool
 	{
 		if ($expr instanceof Expr\Variable) {
-			return $expr->name === 'this';
+			return false;
 		}
 
 		if ($expr instanceof Expr\PropertyFetch) {

src/Rules/Variables/InvalidVariableAssignRule.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Variables;
+
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\RegisteredRule;
+use PHPStan\Node\VariableAssignNode;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use function is_string;
+
+/**
+ * @implements Rule<VariableAssignNode>
+ */
+#[RegisteredRule(level: 0)]
+final class InvalidVariableAssignRule implements Rule
+{
+
+	public function getNodeType(): string
+	{
+		return VariableAssignNode::class;
+	}
+
+	public function processNode(Node $node, Scope $scope): array
+	{
+		$variable = $node->getVariable();
+		if (!is_string($variable->name)) {
+			return [];
+		}
+
+		if ($variable->name === 'this') {
+			return [
+				RuleErrorBuilder::message('Cannot re-assign $this.')
+					->identifier('assign.this')
+					->nonIgnorable()
+					->build(),
+			];
+		}
+
+		return [];
+	}
+
+}

tests/PHPStan/Rules/Operators/InvalidAssignVarRuleTest.php

@@ -61,32 +61,7 @@ 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,
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/bug-3585.php'], []);
 	}
 
 }

tests/PHPStan/Rules/Variables/InvalidVariableAssignRuleTest.php

@@ -0,0 +1,91 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Variables;
+
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<InvalidVariableAssignRule>
+ */
+class InvalidVariableAssignRuleTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new InvalidVariableAssignRule();
+	}
+
+	public function testBug3585(): void
+	{
+		$this->analyse([__DIR__ . '/../Operators/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 testBug14349(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14349.php'], [
+			[
+				'Cannot re-assign $this.',
+				11,
+			],
+			[
+				'Cannot re-assign $this.',
+				15,
+			],
+			[
+				'Cannot re-assign $this.',
+				19,
+			],
+			[
+				'Cannot re-assign $this.',
+				27,
+			],
+			[
+				'Cannot re-assign $this.',
+				28,
+			],
+			[
+				'Cannot re-assign $this.',
+				29,
+			],
+			[
+				'Cannot re-assign $this.',
+				30,
+			],
+			[
+				'Cannot re-assign $this.',
+				35,
+			],
+			[
+				'Cannot re-assign $this.',
+				42,
+			],
+		]);
+	}
+
+}

tests/PHPStan/Rules/Variables/data/bug-14349.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14349;
+
+class Foo
+{
+
+	/** @param array<int> $a */
+	public function doFoo(array $a): void
+	{
+		foreach ($a as $this) {
+			var_dump($this);
+		}
+
+		foreach ($a as &$this) {
+			var_dump($this);
+		}
+
+		foreach ($a as $this => $v) {
+			var_dump($this);
+		}
+
+		foreach ($a as $ok) {
+			var_dump($ok);
+		}
+
+		$this = 1;
+		$this = new self();
+		$this .= 'foo';
+		[$this] = [1];
+	}
+
+	public static function doBar(): void
+	{
+		$this = 1;
+	}
+
+}
+
+function baz(): void
+{
+	$this = 1;
+}