Fixed wrong closure typehint

phpstan · Nov 18, 2020 · 50aff6d · 50aff6d
1 parent da9f6da
commit 50aff6d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -5,6 +5,7 @@
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\Native\NativeParameterReflection;
+use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\TemplateTypeMap;
@@ -268,7 +269,7 @@ public function traverse(callable $cb): Type
 			return $this;
 		}
 
-		$parameters = array_map(static function (NativeParameterReflection $param) use ($cb): NativeParameterReflection {
+		$parameters = array_map(static function (ParameterReflection $param) use ($cb): NativeParameterReflection {
 			$defaultValue = $param->getDefaultValue();
 			return new NativeParameterReflection(
 				$param->getName(),

diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -344,7 +344,7 @@ private function inferTemplateTypesOnParametersAcceptor(Type $receivedType, Para
 	public function traverse(callable $cb): Type
 	{
 		return new self(
-			array_map(static function (NativeParameterReflection $param) use ($cb): NativeParameterReflection {
+			array_map(static function (ParameterReflection $param) use ($cb): NativeParameterReflection {
 				$defaultValue = $param->getDefaultValue();
 				return new NativeParameterReflection(
 					$param->getName(),

diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -285,6 +285,12 @@ public function testBug3909(): void
 		$this->assertCount(0, $errors);
 	}
 
+	public function testBug4097(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-4097.php');
+		$this->assertCount(0, $errors);
+	}
+
 	/**
 	 * @param string $file
 	 * @return \PHPStan\Analyser\Error[]

diff --git a/tests/PHPStan/Analyser/data/bug-4097.php b/tests/PHPStan/Analyser/data/bug-4097.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug4097;
+
+class Snapshot {}
+class Fu {}
+class Bar {}
+
+/**
+ * @template T
+ */
+class SnapshotRepository
+{
+	/**
+	 * @return \Traversable<Snapshot>
+	 */
+	public function findAllSnapshots(): \Traversable
+	{
+		yield from \array_map(
+			\Closure::fromCallable([$this, 'buildSnapshot']),
+			[]
+		);
+	}
+
+	/**
+	 * @param Fu|Bar $entity
+	 * @phpstan-param T $entity
+	 */
+	public function buildSnapshot($entity): Snapshot
+	{
+		return new Snapshot();
+	}
+}