Method Scope::getAnonymousFunctionReflection() always returns ClosureType

Author: ondrejmirtes

src/Analyser/DirectInternalScopeFactory.php

@@ -10,10 +10,10 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\AttributeReflectionFactory;
 use PHPStan\Reflection\InitializerExprTypeResolver;
-use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
+use PHPStan\Type\ClosureType;
 
 final class DirectInternalScopeFactory implements InternalScopeFactory
 {
@@ -51,7 +51,7 @@ public function create(
 		array $nativeExpressionTypes = [],
 		array $conditionalExpressions = [],
 		array $inClosureBindScopeClasses = [],
-		?ParametersAcceptor $anonymousFunctionReflection = null,
+		?ClosureType $anonymousFunctionReflection = null,
 		bool $inFirstLevelStatement = true,
 		array $currentlyAssignedExpressions = [],
 		array $currentlyAllowedUndefinedExpressions = [],

src/Analyser/InternalScopeFactory.php

@@ -5,8 +5,8 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParameterReflection;
-use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
+use PHPStan\Type\ClosureType;
 
 interface InternalScopeFactory
 {
@@ -29,7 +29,7 @@ public function create(
 		array $nativeExpressionTypes = [],
 		array $conditionalExpressions = [],
 		array $inClosureBindScopeClasses = [],
-		?ParametersAcceptor $anonymousFunctionReflection = null,
+		?ClosureType $anonymousFunctionReflection = null,
 		bool $inFirstLevelStatement = true,
 		array $currentlyAssignedExpressions = [],
 		array $currentlyAllowedUndefinedExpressions = [],

src/Analyser/LazyInternalScopeFactory.php

@@ -11,10 +11,10 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\AttributeReflectionFactory;
 use PHPStan\Reflection\InitializerExprTypeResolver;
-use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
+use PHPStan\Type\ClosureType;
 
 #[GenerateFactory(interface: InternalScopeFactoryFactory::class, resultType: LazyInternalScopeFactory::class)]
 final class LazyInternalScopeFactory implements InternalScopeFactory
@@ -43,7 +43,7 @@ public function create(
 		array $nativeExpressionTypes = [],
 		array $conditionalExpressions = [],
 		array $inClosureBindScopeClasses = [],
-		?ParametersAcceptor $anonymousFunctionReflection = null,
+		?ClosureType $anonymousFunctionReflection = null,
 		bool $inFirstLevelStatement = true,
 		array $currentlyAssignedExpressions = [],
 		array $currentlyAllowedUndefinedExpressions = [],

src/Analyser/MutatingScope.php

@@ -84,7 +84,6 @@
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Reflection\TrivialParametersAcceptor;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
@@ -237,7 +236,7 @@ public function __construct(
 		private array $nativeExpressionTypes = [],
 		private array $conditionalExpressions = [],
 		private array $inClosureBindScopeClasses = [],
-		private ?ParametersAcceptor $anonymousFunctionReflection = null,
+		private ?ClosureType $anonymousFunctionReflection = null,
 		private bool $inFirstLevelStatement = true,
 		private array $currentlyAssignedExpressions = [],
 		private array $currentlyAllowedUndefinedExpressions = [],
@@ -754,7 +753,7 @@ public function isInAnonymousFunction(): bool
 	}
 
 	/** @api */
-	public function getAnonymousFunctionReflection(): ?ParametersAcceptor
+	public function getAnonymousFunctionReflection(): ?ClosureType
 	{
 		return $this->anonymousFunctionReflection;
 	}
@@ -3900,7 +3899,7 @@ private function enterAnonymousFunctionWithoutReflection(
 			array_merge($this->getNativeConstantTypes(), $nativeTypes),
 			[],
 			$this->inClosureBindScopeClasses,
-			new TrivialParametersAcceptor(),
+			new ClosureType(),
 			true,
 			[],
 			[],
@@ -4027,7 +4026,7 @@ private function enterArrowFunctionWithoutReflection(Expr\ArrowFunction $arrowFu
 			$arrowFunctionScope->nativeExpressionTypes,
 			$arrowFunctionScope->conditionalExpressions,
 			$arrowFunctionScope->inClosureBindScopeClasses,
-			new TrivialParametersAcceptor(),
+			new ClosureType(),
 			true,
 			[],
 			[],

src/Analyser/NodeScopeResolver.php

@@ -4931,7 +4931,7 @@ private function processArrowFunctionNode(
 			$passedToType,
 		));
 		$arrowFunctionType = $arrowFunctionScope->getAnonymousFunctionReflection();
-		if (!$arrowFunctionType instanceof ClosureType) {
+		if ($arrowFunctionType === null) {
 			throw new ShouldNotHappenException();
 		}
 		$nodeCallback(new InArrowFunctionNode($arrowFunctionType, $expr), $arrowFunctionScope);

src/Analyser/Scope.php

@@ -16,9 +16,9 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ParameterReflection;
-use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\ClosureType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
 
@@ -98,7 +98,7 @@ public function getIterableValueType(Type $iteratee): Type;
 	 */
 	public function isInAnonymousFunction(): bool;
 
-	public function getAnonymousFunctionReflection(): ?ParametersAcceptor;
+	public function getAnonymousFunctionReflection(): ?ClosureType;
 
 	public function getAnonymousFunctionReturnType(): ?Type;