Merge branch refs/heads/1.12.x into 2.0.x

tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php

@@ -844,4 +844,12 @@ public function testClosureBind(): void
 		]);
 	}
 
+	public function testBug10872(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkExplicitMixed = true;
+		$this->checkImplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-10872.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-10872.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Bug10872;
+
+class HelloWorld
+{
+	/**
+	 * @return array<string, string|null>
+	 */
+	public function getRow(): array
+	{
+		return [];
+	}
+
+	/**
+	 * @template ExpectedType of array<mixed>
+	 * @param ExpectedType $expected
+	 * @param array<mixed> $actual
+	 * @psalm-assert =ExpectedType $actual
+	 */
+	public static function assertSame(array $expected, array $actual): void
+	{
+		if ($actual !== $expected) {
+			throw new \Exception();
+		}
+	}
+
+	public function testEscapeIdentifier(): void
+	{
+		$names = [
+			'foo',
+			'2',
+		];
+
+		$expected = array_combine($names, array_fill(0, count($names), 'x'));
+
+		self::assertSame(
+			$expected,
+			$this->getRow()
+		);
+	}
+}