Feb 25, 2022 · Feb 9, 2022 · Feb 10, 2022 · Feb 10, 2022 · Feb 11, 2022 · Feb 14, 2022
diff --git a/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php b/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php
diff --git a/tests/Type/Symfony/container.xml b/tests/Type/Symfony/container.xml
diff --git a/tests/Type/Symfony/data/ExampleAbstractController.php b/tests/Type/Symfony/data/ExampleAbstractController.php
diff --git a/tests/Type/Symfony/data/ExampleController.php b/tests/Type/Symfony/data/ExampleController.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,12 +8,17 @@
		use PHPStan\Reflection\ParametersAcceptorSelector;
		use PHPStan\ShouldNotHappenException;
		use PHPStan\Symfony\Configuration;
	use PHPStan\Symfony\ParameterMap;
	use PHPStan\Symfony\ServiceDefinition;
		use PHPStan\Symfony\ServiceMap;
		use PHPStan\Type\Constant\ConstantBooleanType;
		use PHPStan\Type\DynamicMethodReturnTypeExtension;
		use PHPStan\Type\ObjectType;
		use PHPStan\Type\Type;
		use function in_array;
	use function is_scalar;
	use function strpos;
	use function trim;

		final class ServiceDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
		{
Expand All		@@ -27,11 +32,20 @@ final class ServiceDynamicReturnTypeExtension implements DynamicMethodReturnType
		/** @var ServiceMap */
		private $serviceMap;

	public function __construct(string $className, Configuration $configuration, ServiceMap $symfonyServiceMap)
	/** @var ParameterMap */
	private $parameterMap;

	public function __construct(
	string $className,
	Configuration $configuration,
	ServiceMap $symfonyServiceMap,
	ParameterMap $symfonyParameterMap
	)
		{
		$this->className = $className;
		$this->constantHassers = $configuration->hasConstantHassers();
		$this->serviceMap = $symfonyServiceMap;
	$this->parameterMap = $symfonyParameterMap;
		}

		public function getClass(): string
Expand Down Expand Up		@@ -70,7 +84,7 @@ private function getGetTypeFromMethodCall(
		if ($serviceId !== null) {
		$service = $this->serviceMap->getService($serviceId);
		if ($service !== null && (!$service->isSynthetic() \|\| $service->getClass() !== null)) {
	return new ObjectType($service->getClass() ?? $serviceId);
	return new ObjectType($this->determineServiceClass($service) ?? $serviceId);
		}
		}

Expand All		@@ -97,4 +111,19 @@ private function getHasTypeFromMethodCall(
		return $returnType;
		}

	private function determineServiceClass(ServiceDefinition $service): ?string
	{
	$class = $service->getClass();

	if ($class !== null && strpos($class, '%') === 0) {
	$param = $this->parameterMap->getParameter(trim($class, '%'));

	if ($param !== null && is_scalar($param->getValue())) {
	return (string) $param->getValue();
	}
	}

	return $class;
	}

		}
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,7 @@
		<?xml version="1.0" encoding="utf-8"?>
		<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
		<parameters>
	<parameter key="app.class">Foo</parameter>
		<parameter key="app.string">abcdef</parameter>
		<parameter key="app.int">123</parameter>
		<parameter key="app.int_as_string" type="string">123</parameter>
Expand Down Expand Up		@@ -51,6 +52,7 @@

		<services>
		<service id="foo" class="Foo" public="true"></service>
	<service id="parameterised_foo" class="%app.class%"></service>
		<service id="synthetic" class="Synthetic" public="true" synthetic="true" />
		</services>
		</container>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@ final class ExampleAbstractController extends AbstractController
		public function services(): void
		{
		assertType('Foo', $this->get('foo'));
	assertType('Foo', $this->get('parameterised_foo'));
		assertType('Synthetic', $this->get('synthetic'));
		assertType('object', $this->get('bar'));
		assertType('object', $this->get(doFoo()));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@ final class ExampleController extends Controller
		public function services(): void
		{
		assertType('Foo', $this->get('foo'));
	assertType('Foo', $this->get('parameterised_foo'));
		assertType('Synthetic', $this->get('synthetic'));
		assertType('object', $this->get('bar'));
		assertType('object', $this->get(doFoo()));
Expand Down