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

Author: ondrejmirtes

tests/PHPStan/Analyser/nsrt/bug-11861.php

@@ -0,0 +1,59 @@
+<?php // lint >= 8.1
+
+declare(strict_types = 1);
+
+namespace Bug11861;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T
+ * @template K of array-key
+ * @template R
+ *
+ * @param array<K, T> $source
+ * @param callable(T, K): R $mappingFunction
+ * @return array<K, R>
+ */
+function mapArray(array $source, callable $mappingFunction): array
+{
+	$result = [];
+
+	foreach ($source as $key => $value) {
+		$result[$key] = $mappingFunction($value, $key);
+	}
+
+	return $result;
+}
+
+/**
+ * @template K
+ * @template T
+ *
+ * @param array<K, null|T> $source
+ * @return array<K, T>
+ */
+function filterArrayNotNull(array $source): array
+{
+	return array_filter(
+		$source,
+		fn($item) => $item !== null,
+		ARRAY_FILTER_USE_BOTH
+	);
+}
+
+/** @var list<array<string, null|int>> $a */
+$a = [];
+
+$mappedA = mapArray(
+	$a,
+	static fn(array $entry) => filterArrayNotNull($entry)
+);
+
+$mappedAWithFirstClassSyntax = mapArray(
+	$a,
+	filterArrayNotNull(...)
+);
+
+assertType('array<int<0, max>, array<int|string, mixed>>', $mappedA);
+assertType('array<int<0, max>, array<int|string, mixed>>', $mappedAWithFirstClassSyntax);

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1960,21 +1960,31 @@ public function testBug12051(): void
 	}
 
 	public function testBug8046(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8046.php'], []);
+	}
+
+	public function testBug11942(): void
 	{
 		if (PHP_VERSION_ID < 80100) {
 			$this->markTestSkipped('Test requires PHP 8.1.');
 		}
 
-		$this->analyse([__DIR__ . '/data/bug-8046.php'], []);
+		$this->analyse([__DIR__ . '/data/bug-11942.php'], []);
 	}
 
 	public function testBug11418(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11418.php'], []);
+	}
+
+	public function testBug9167(): void
 	{
 		if (PHP_VERSION_ID < 80100) {
 			$this->markTestSkipped('Test requires PHP 8.1.');
 		}
 
-		$this->analyse([__DIR__ . '/data/bug-11418.php'], []);
+		$this->analyse([__DIR__ . '/data/bug-9167.php'], []);
 	}
 
 	public function testBug3107(): void

tests/PHPStan/Rules/Functions/data/bug-11942.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug11942;
+
+/**
+ * @template A
+ * @param A $a
+ * @return A
+ */
+function identity(mixed $a): mixed
+{
+	return $a;
+}
+
+/**
+ * @param callable(int): int $fn
+ */
+function simple(callable $fn): int
+{
+	return $fn(42);
+}
+
+simple(identity(...));

tests/PHPStan/Rules/Functions/data/bug-9167.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Bug9167;
+
+use Closure;
+
+class A {
+	/**
+	 * @template TRet
+	 * @param Closure(int):TRet $next
+	 * @return TRet
+	 */
+	public function __invoke(Closure $next) {
+		return $next(12);
+	}
+}
+
+/**
+ * @template T
+ * @param T $in
+ * @return T
+ */
+function value(mixed $in): mixed {
+	return $in;
+}
+
+function want_int(int $in): void {}
+
+function pass_b(): void {
+	$a = new A();
+	want_int($a(value(...)));
+}

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -3539,8 +3539,17 @@ public function testBug12422(): void
 		$this->checkNullables = true;
 		$this->checkUnionTypes = true;
 		$this->checkExplicitMixed = true;
-
 		$this->analyse([__DIR__ . '/data/bug-12422.php'], []);
 	}
 
+	public function testBug6828(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+
+		$this->analyse([__DIR__ . '/data/bug-6828.php'], []);
+	}
+
 }

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

@@ -0,0 +1,51 @@
+<?php // lint >= 8.1
+
+declare(strict_types=1);
+
+namespace Bug6828;
+
+/** @template T */
+interface Option
+{
+	/**
+	 * @template U
+	 * @param \Closure(T):U $c
+	 * @return Option<U>
+	 */
+	function map(\Closure $c);
+}
+
+/**
+ * @template T
+ * @template E
+ */
+abstract class Result
+{
+	/** @return T */
+	function unwrap()
+	{
+
+	}
+
+	/**
+	 * @template U
+	 * @param U $v
+	 * @return Result<U, mixed>
+	 */
+	static function ok($v)
+	{
+
+	}
+}
+
+/**
+ * @template U
+ * @template F
+ * @param Result<Option<U>, F> $result
+ * @return Option<Result<U, F>>
+ */
+function f(Result $result): Option
+{
+	/** @var Option<Result<U, F>> */
+	return $result->unwrap()->map(Result::ok(...));
+}