Forward compatibility fix for extensions of generic methods

Author: ondrejmirtes

src/Type/Symfony/InputBagTypeSpecifyingExtension.php

@@ -9,10 +9,8 @@
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
-use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\NullType;
 use Symfony\Component\HttpFoundation\InputBag;
 
 final class InputBagTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
@@ -22,17 +20,9 @@ final class InputBagTypeSpecifyingExtension implements MethodTypeSpecifyingExten
 	private const HAS_METHOD_NAME = 'has';
 	private const GET_METHOD_NAME = 'get';
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
-
 	/** @var TypeSpecifier */
 	private $typeSpecifier;
 
-	public function __construct(ReflectionProvider $reflectionProvider)
-	{
-		$this->reflectionProvider = $reflectionProvider;
-	}
-
 	public function getClass(): string
 	{
 		return self::INPUT_BAG_CLASS;
@@ -45,18 +35,10 @@ public function isMethodSupported(MethodReflection $methodReflection, MethodCall
 
 	public function specifyTypes(MethodReflection $methodReflection, MethodCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
 	{
-		$classReflection = $this->reflectionProvider->getClass(self::INPUT_BAG_CLASS);
-		$methodVariants = $classReflection->getNativeMethod(self::GET_METHOD_NAME)->getVariants();
-		$returnType = ParametersAcceptorSelector::selectSingle($methodVariants)->getReturnType();
-
-		if (!TypeCombinator::containsNull($returnType)) {
-			return new SpecifiedTypes();
-		}
-
 		return $this->typeSpecifier->create(
 			new MethodCall($node->var, self::GET_METHOD_NAME, $node->getArgs()),
-			TypeCombinator::removeNull($returnType),
-			$context
+			new NullType(),
+			$context->negate()
 		);
 	}
 

src/Type/Symfony/RequestTypeSpecifyingExtension.php

@@ -8,7 +8,6 @@
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
-use PHPStan\Broker\Broker;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
@@ -21,17 +20,9 @@ final class RequestTypeSpecifyingExtension implements MethodTypeSpecifyingExtens
 	private const HAS_METHOD_NAME = 'hasSession';
 	private const GET_METHOD_NAME = 'getSession';
 
-	/** @var Broker */
-	private $broker;
-
 	/** @var TypeSpecifier */
 	private $typeSpecifier;
 
-	public function __construct(Broker $broker)
-	{
-		$this->broker = $broker;
-	}
-
 	public function getClass(): string
 	{
 		return self::REQUEST_CLASS;
@@ -44,9 +35,8 @@ public function isMethodSupported(MethodReflection $methodReflection, MethodCall
 
 	public function specifyTypes(MethodReflection $methodReflection, MethodCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
 	{
-		$classReflection = $this->broker->getClass(self::REQUEST_CLASS);
-		$methodVariants = $classReflection->getNativeMethod(self::GET_METHOD_NAME)->getVariants();
-		$returnType = ParametersAcceptorSelector::selectSingle($methodVariants)->getReturnType();
+		$methodVariants = $methodReflection->getDeclaringClass()->getNativeMethod(self::GET_METHOD_NAME)->getVariants();
+		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $node->getArgs(), $methodVariants)->getReturnType();
 
 		if (!TypeCombinator::containsNull($returnType)) {
 			return new SpecifiedTypes();

tests/Type/Symfony/data/input_bag.php

@@ -9,6 +9,9 @@
 if ($bag->has('foo')) {
 	assertType('bool|float|int|string', $bag->get('foo'));
 	assertType('bool|float|int|string|null', $bag->get('bar'));
+} else {
+	assertType('null', $bag->get('foo'));
+	assertType('bool|float|int|string|null', $bag->get('bar'));
 }
 
 assertType('bool|float|int|string|null', $bag->get('foo', null));