Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -153,6 +153,12 @@ public function testExtendsPdoStatementCrash(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug12803(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-12803.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testArrayDestructuringArrayDimFetch(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/array-destructuring-array-dim-fetch.php');

tests/PHPStan/Analyser/data/bug-12803.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Bug12803;
+
+/** @template T */
+class Generic {}
+
+class A
+{
+	/** @param array{foo: int, bar: string} $foo */
+	public function b(array $foo): void
+	{
+		/** @var Generic<object{foo: 2, bar: 1}> $a */
+		$a = $this->c(fn() => (object) ['bar' => 1, 'foo' => 2]);
+		$b = $this->c(fn() => (object) ['bar' => 1, 'foo' => 2]);
+	}
+
+	/**
+	 * @template T
+	 * @param callable(): T  $callback
+	 * @return Generic<T>
+	 */
+	public function c(callable $callback): Generic
+	{
+		return new Generic();
+	}
+}