Dynamic return type for ContainerInterface|Controller::has()

Author: lookyman

Diff for: src/Type/Symfony/ContainerInterfaceDynamicReturnTypeExtension.php

@@ -27,7 +27,7 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return $methodReflection->getName() === 'get';
+		return in_array($methodReflection->getName(), ['get', 'has'], true);
 	}
 
 	public function getTypeFromMethodCall(
@@ -36,7 +36,13 @@ public function getTypeFromMethodCall(
 		Scope $scope
 	): Type
 	{
-		return Helper::getTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+		switch ($methodReflection->getName()) {
+			case 'get':
+				return Helper::getGetTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+			case 'has':
+				return Helper::getHasTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+		}
+		throw new \PHPStan\ShouldNotHappenException();
 	}
 
 }

Diff for: src/Type/Symfony/ControllerDynamicReturnTypeExtension.php

@@ -27,7 +27,7 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return $methodReflection->getName() === 'get';
+		return in_array($methodReflection->getName(), ['get', 'has'], true);
 	}
 
 	public function getTypeFromMethodCall(
@@ -36,7 +36,13 @@ public function getTypeFromMethodCall(
 		Scope $scope
 	): Type
 	{
-		return Helper::getTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+		switch ($methodReflection->getName()) {
+			case 'get':
+				return Helper::getGetTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+			case 'has':
+				return Helper::getHasTypeFromMethodCall($methodReflection, $methodCall, $scope, $this->serviceMap);
+		}
+		throw new \PHPStan\ShouldNotHappenException();
 	}
 
 }

Diff for: src/Type/Symfony/Helper.php

@@ -12,14 +12,15 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ServiceMap;
+use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\VerbosityLevel;
 
 final class Helper
 {
 
-	public static function getTypeFromMethodCall(
+	public static function getGetTypeFromMethodCall(
 		MethodReflection $methodReflection,
 		MethodCall $methodCall,
 		Scope $scope,
@@ -42,6 +43,27 @@ public static function getTypeFromMethodCall(
 		return $returnType;
 	}
 
+	public static function getHasTypeFromMethodCall(
+		MethodReflection $methodReflection,
+		MethodCall $methodCall,
+		Scope $scope,
+		ServiceMap $serviceMap
+	): Type
+	{
+		$returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+		if (!isset($methodCall->args[0])) {
+			return $returnType;
+		}
+
+		$serviceId = ServiceMap::getServiceIdFromNode($methodCall->args[0]->value, $scope);
+		if ($serviceId !== null) {
+			$service = $serviceMap->getService($serviceId);
+			return new ConstantBooleanType($service !== null && $service->isPublic());
+		}
+
+		return $returnType;
+	}
+
 	public static function specifyTypes(
 		MethodReflection $methodReflection,
 		MethodCall $node,

Diff for: tests/Type/Symfony/ContainerInterfaceDynamicReturnTypeExtensionTest.php

@@ -74,6 +74,7 @@ public function getTypeFromMethodCallProvider(): array
 		$parametersAcceptorFound = $this->createMock(ParametersAcceptor::class);
 		$parametersAcceptorFound->expects(self::once())->method('getReturnType')->willReturn($foundType);
 		$methodReflectionFound = $this->createMock(MethodReflection::class);
+		$methodReflectionFound->expects(self::once())->method('getName')->willReturn('get');
 		$methodReflectionFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorFound]);
 		$scopeFound = $this->createMock(Scope::class);
 		$scopeFound->expects(self::once())->method('getType')->willReturn(new ConstantStringType('withClass'));
@@ -82,6 +83,7 @@ public function getTypeFromMethodCallProvider(): array
 		$parametersAcceptorNotFound = $this->createMock(ParametersAcceptor::class);
 		$parametersAcceptorNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
 		$methodReflectionNotFound = $this->createMock(MethodReflection::class);
+		$methodReflectionNotFound->expects(self::once())->method('getName')->willReturn('get');
 		$methodReflectionNotFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorNotFound]);
 		$scopeNotFound = $this->createMock(Scope::class);
 		$scopeNotFound->expects(self::once())->method('getType')->willReturn(new ErrorType());

Diff for: tests/Type/Symfony/ControllerDynamicReturnTypeExtensionTest.php

@@ -74,6 +74,7 @@ public function getTypeFromMethodCallProvider(): array
 		$parametersAcceptorFound = $this->createMock(ParametersAcceptor::class);
 		$parametersAcceptorFound->expects(self::once())->method('getReturnType')->willReturn($foundType);
 		$methodReflectionFound = $this->createMock(MethodReflection::class);
+		$methodReflectionFound->expects(self::once())->method('getName')->willReturn('get');
 		$methodReflectionFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorFound]);
 		$scopeFound = $this->createMock(Scope::class);
 		$scopeFound->expects(self::once())->method('getType')->willReturn(new ConstantStringType('withClass'));
@@ -82,6 +83,7 @@ public function getTypeFromMethodCallProvider(): array
 		$parametersAcceptorNotFound = $this->createMock(ParametersAcceptor::class);
 		$parametersAcceptorNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
 		$methodReflectionNotFound = $this->createMock(MethodReflection::class);
+		$methodReflectionNotFound->expects(self::once())->method('getName')->willReturn('get');
 		$methodReflectionNotFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorNotFound]);
 		$scopeNotFound = $this->createMock(Scope::class);
 		$scopeNotFound->expects(self::once())->method('getType')->willReturn(new ErrorType());