Regression tests

Closes phpstan/phpstan#11126
Closes phpstan/phpstan#11032
Closes phpstan/phpstan#10653

Author: ondrejmirtes

changelog-2.0.md

@@ -131,7 +131,7 @@ Improvements 🔧
 * No implicit wildcard in FileExcluder (https://github.com/phpstan/phpstan-src/commit/e19e6e5f8cfa706cc30e44a17276a6bc269f995c), #10299
 * Report invalid exclude paths in PHP config (https://github.com/phpstan/phpstan-src/commit/9718c14f1ffac81ba3d2bf331b4e8b4041a4d004)
 * Do not generalize template types, except when in `GenericObjectType` ([#2818](https://github.com/phpstan/phpstan-src/pull/2818), [#2821](https://github.com/phpstan/phpstan-src/pull/2821))
-    * This fixes following **17 issues**: #8166, #8127, #7944, #7283, #6653, #6196, #9084, #8683, #8074, #7984, #7301, #7087, #5594, #5592, #9472, #9764, #10092
+    * This fixes following **20 issues**: #8166, #8127, #7944, #7283, #6653, #6196, #9084, #8683, #8074, #7984, #7301, #7087, #5594, #5592, #9472, #9764, #10092, #11126, #11032, #10653
 * Non-static methods cannot be used as static callables in PHP 8+ ([#2420](https://github.com/phpstan/phpstan-src/pull/2420)), thanks @staabm!
 * Analysis with zero files results in non-zero exit code (https://github.com/phpstan/phpstan-src/commit/46ff440648e62617df86aa74ba905ffa99897737), #9410
 * Fail build when project config uses custom extensions outside of analysed paths

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Bug10653;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+function (A $a): void {
+	$value = $a->mayFail();
+	assertType('stdClass|false', $value);
+	$value = $a->throwOnFailure($value);
+	assertType(stdClass::class, $value);
+};

tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php

@@ -301,4 +301,18 @@ public function testBug8881(): void
 		$this->analyse([__DIR__ . '/data/bug-8881.php'], []);
 	}
 
+	public function testBug11126(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->checkNullables = true;
+		$this->analyse([__DIR__ . '/data/bug-11126.php'], []);
+	}
+
+	public function testBug11032(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->checkNullables = true;
+		$this->analyse([__DIR__ . '/data/bug-11032.php'], []);
+	}
+
 }

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

@@ -0,0 +1,42 @@
+<?php
+
+namespace Bug11032;
+
+/**
+ * @template-covariant T
+ */
+interface PromiseInterface
+{
+}
+
+/**
+ * @template T
+ */
+final class Deferred
+{
+	/**
+	 * @var PromiseInterface<T>
+	 */
+	private $promise = null;
+
+	/**
+	 * @return PromiseInterface<T>
+	 */
+	public function promise(): PromiseInterface
+	{
+		return $this->promise;
+	}
+}
+
+/**
+ * @template T
+ * @param iterable<T> $tasks
+ * @return PromiseInterface<array<T>>
+ */
+function parallel(iterable $tasks): PromiseInterface
+{
+	/** @var Deferred<array<T>> $deferred*/
+	$deferred = new Deferred();
+
+	return $deferred->promise();
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Bug11126;
+
+/**
+ * @template T
+ */
+class Collection {
+	/**
+	 * @template TRet
+	 * @param (callable(T): TRet) $callback
+	 * @return static<TRet>
+	 */
+	public function map(callable $callback): Collection {
+		return $this;
+	}
+}
+
+/**
+ * @param Collection<int<0, max>> $in
+ * @return Collection<int<0, max>>
+ */
+function foo(Collection $in): Collection {
+	return $in->map(static fn ($v) => $v);
+}
+
+/**
+ * @param Collection<int<0, max>> $in
+ * @return Collection<int<0, max>>
+ */
+function bar(Collection $in): Collection {
+	return $in->map(value(...));
+}
+
+/**
+ * @param int<0, max> $in
+ * @return int<0, max>
+ */
+function value(int $in): int {
+	return $in;
+}

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1081,4 +1081,9 @@ public function testBug10715(): void
 		$this->analyse([__DIR__ . '/data/bug-10715.php'], []);
 	}
 
+	public function testBug10653(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-10653.php'], []);
+	}
+
 }

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

@@ -0,0 +1,42 @@
+<?php
+
+namespace Bug10653;
+
+use stdClass;
+use Exception;
+
+class A
+{
+	private int $Counter = 0;
+
+	/**
+	 * @return stdClass
+	 */
+	public function getMayFail()
+	{
+		return $this->throwOnFailure($this->mayFail());
+	}
+
+	/**
+	 * @template T
+	 *
+	 * @param T $result
+	 * @return (T is false ? never : T)
+	 */
+	public function throwOnFailure($result)
+	{
+		if ($result === false) {
+			throw new Exception('Operation failed');
+		}
+		return $result;
+	}
+
+	/**
+	 * @return stdClass|false
+	 */
+	public function mayFail()
+	{
+		$this->Counter++;
+		return $this->Counter % 2 ? new stdClass() : false;
+	}
+}