Configuration class no longer needed, pass arguments directly to services

ondrejmirtes · ondrejmirtes · commit 7417f3a9f6e3 · 2025-01-21T16:09:09.000+01:00
diff --git a/extension.neon b/extension.neon
@@ -101,24 +101,27 @@ parametersSchema:
 	])
 
 services:
-	-
-		factory: PHPStan\Symfony\Configuration(%symfony%)
-
 	# console resolver
 	-
 		factory: PHPStan\Symfony\ConsoleApplicationResolver
+		arguments:
+			consoleApplicationLoader: %symfony.consoleApplicationLoader%
 
 	# service map
 	symfony.serviceMapFactory:
 		class: PHPStan\Symfony\ServiceMapFactory
 		factory: PHPStan\Symfony\XmlServiceMapFactory
+		arguments:
+			containerXmlPath: %symfony.containerXmlPath%
 	-
 		factory: @symfony.serviceMapFactory::create()
 
 	# parameter map
 	symfony.parameterMapFactory:
 		class: PHPStan\Symfony\ParameterMapFactory
 		factory: PHPStan\Symfony\XmlParameterMapFactory
+		arguments:
+			containerXmlPath: %symfony.containerXmlPath%
 	-
 		factory: @symfony.parameterMapFactory::create()
 
@@ -131,16 +134,16 @@ services:
 
 	# ControllerTrait::get()/has() return type
 	-
-		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface)
+		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
-		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Psr\Container\ContainerInterface)
+		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Psr\Container\ContainerInterface, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
-		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller)
+		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
-		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\AbstractController)
+		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\AbstractController, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
 	# ControllerTrait::has() type specification
@@ -296,20 +299,20 @@ services:
 
 	# ParameterBagInterface::get()/has() return type
 	-
-		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface, 'get', 'has')
+		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface, 'get', 'has', %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
 	# ContainerInterface::getParameter()/hasParameter() return type
 	-
-		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface, 'getParameter', 'hasParameter')
+		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface, 'getParameter', 'hasParameter', %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
 	# (Abstract)Controller::getParameter() return type
 	-
-		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\AbstractController, 'getParameter', null)
+		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\AbstractController, 'getParameter', null, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
-		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller, 'getParameter', null)
+		factory: PHPStan\Type\Symfony\ParameterDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller, 'getParameter', null, %symfony.constantHassers%)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
 		class: PHPStan\Symfony\InputBagStubFilesExtension
diff --git a/src/Symfony/Configuration.php b/src/Symfony/Configuration.php
diff --git a/src/Symfony/ConsoleApplicationResolver.php b/src/Symfony/ConsoleApplicationResolver.php
@@ -20,9 +20,9 @@ final class ConsoleApplicationResolver
 
 	private ?Application $consoleApplication = null;
 
-	public function __construct(Configuration $configuration)
+	public function __construct(?string $consoleApplicationLoader)
 	{
-		$this->consoleApplicationLoader = $configuration->getConsoleApplicationLoader();
+		$this->consoleApplicationLoader = $consoleApplicationLoader;
 	}
 
 	public function hasConsoleApplicationLoader(): bool
diff --git a/src/Symfony/XmlParameterMapFactory.php b/src/Symfony/XmlParameterMapFactory.php
@@ -17,9 +17,9 @@ final class XmlParameterMapFactory implements ParameterMapFactory
 
 	private ?string $containerXml = null;
 
-	public function __construct(Configuration $configuration)
+	public function __construct(?string $containerXmlPath)
 	{
-		$this->containerXml = $configuration->getContainerXmlPath();
+		$this->containerXml = $containerXmlPath;
 	}
 
 	public function create(): ParameterMap
diff --git a/src/Symfony/XmlServiceMapFactory.php b/src/Symfony/XmlServiceMapFactory.php
@@ -14,9 +14,9 @@ final class XmlServiceMapFactory implements ServiceMapFactory
 
 	private ?string $containerXml = null;
 
-	public function __construct(Configuration $configuration)
+	public function __construct(?string $containerXmlPath)
 	{
-		$this->containerXml = $configuration->getContainerXmlPath();
+		$this->containerXml = $containerXmlPath;
 	}
 
 	public function create(): ServiceMap
diff --git a/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php b/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
@@ -7,7 +7,6 @@
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ParameterMap;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
@@ -62,15 +61,15 @@ public function __construct(
 		string $className,
 		?string $methodGet,
 		?string $methodHas,
-		Configuration $configuration,
+		bool $constantHassers,
 		ParameterMap $symfonyParameterMap,
 		TypeStringResolver $typeStringResolver
 	)
 	{
 		$this->className = $className;
 		$this->methodGet = $methodGet;
 		$this->methodHas = $methodHas;
-		$this->constantHassers = $configuration->hasConstantHassers();
+		$this->constantHassers = $constantHassers;
 		$this->parameterMap = $symfonyParameterMap;
 		$this->typeStringResolver = $typeStringResolver;
 	}
diff --git a/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php b/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php
@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ParameterMap;
 use PHPStan\Symfony\ServiceDefinition;
 use PHPStan\Symfony\ServiceMap;
@@ -38,13 +37,13 @@ final class ServiceDynamicReturnTypeExtension implements DynamicMethodReturnType
 	 */
 	public function __construct(
 		string $className,
-		Configuration $configuration,
+		bool $constantHassers,
 		ServiceMap $symfonyServiceMap,
 		ParameterMap $symfonyParameterMap
 	)
 	{
 		$this->className = $className;
-		$this->constantHassers = $configuration->hasConstantHassers();
+		$this->constantHassers = $constantHassers;
 		$this->serviceMap = $symfonyServiceMap;
 		$this->parameterMap = $symfonyParameterMap;
 	}
diff --git a/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleFakeTest.php b/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleFakeTest.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Rules\Symfony;
 
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use function class_exists;
@@ -17,7 +16,7 @@ final class ContainerInterfacePrivateServiceRuleFakeTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(new Configuration([])))->create());
+		return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(null))->create());
 	}
 
 	public function testGetPrivateService(): void
diff --git a/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php b/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Rules\Symfony;
 
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use function class_exists;
@@ -17,7 +16,7 @@ final class ContainerInterfacePrivateServiceRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml'])))->create());
+		return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(__DIR__ . '/container.xml'))->create());
 	}
 
 	public function testGetPrivateService(): void
diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
@@ -20,7 +19,7 @@ final class ContainerInterfaceUnknownServiceRuleFakeTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration([])))->create(), self::getContainer()->getByType(Printer::class));
+		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(null))->create(), self::getContainer()->getByType(Printer::class));
 	}
 
 	/**
diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use function class_exists;
@@ -18,7 +17,7 @@ final class ContainerInterfaceUnknownServiceRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml'])))->create(), self::getContainer()->getByType(Printer::class));
+		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(__DIR__ . '/container.xml'))->create(), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetPrivateService(): void
diff --git a/tests/Rules/Symfony/UndefinedArgumentRuleTest.php b/tests/Rules/Symfony/UndefinedArgumentRuleTest.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Testing\RuleTestCase;
 
@@ -16,7 +15,7 @@ final class UndefinedArgumentRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new UndefinedArgumentRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), self::getContainer()->getByType(Printer::class));
+		return new UndefinedArgumentRule(new ConsoleApplicationResolver(__DIR__ . '/console_application_loader.php'), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetArgument(): void
diff --git a/tests/Rules/Symfony/UndefinedOptionRuleTest.php b/tests/Rules/Symfony/UndefinedOptionRuleTest.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
-use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Testing\RuleTestCase;
 
@@ -16,7 +15,7 @@ final class UndefinedOptionRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new UndefinedOptionRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), self::getContainer()->getByType(Printer::class));
+		return new UndefinedOptionRule(new ConsoleApplicationResolver(__DIR__ . '/console_application_loader.php'), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetArgument(): void
diff --git a/tests/Symfony/DefaultParameterMapTest.php b/tests/Symfony/DefaultParameterMapTest.php
@@ -13,13 +13,13 @@ final class DefaultParameterMapTest extends TestCase
 	 */
 	public function testGetParameter(string $key, callable $validator): void
 	{
-		$factory = new XmlParameterMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml']));
+		$factory = new XmlParameterMapFactory(__DIR__ . '/container.xml');
 		$validator($factory->create()->getParameter($key));
 	}
 
 	public function testGetParameterEscapedPath(): void
 	{
-		$factory = new XmlParameterMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/containers/bugfix%2Fcontainer.xml']));
+		$factory = new XmlParameterMapFactory(__DIR__ . '/containers/bugfix%2Fcontainer.xml');
 		$serviceMap = $factory->create();
 
 		self::assertNotNull($serviceMap->getParameter('app.string'));
diff --git a/tests/Symfony/DefaultServiceMapTest.php b/tests/Symfony/DefaultServiceMapTest.php
@@ -13,13 +13,13 @@ final class DefaultServiceMapTest extends TestCase
 	 */
 	public function testGetService(string $id, callable $validator): void
 	{
-		$factory = new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml']));
+		$factory = new XmlServiceMapFactory(__DIR__ . '/container.xml');
 		$validator($factory->create()->getService($id));
 	}
 
 	public function testGetContainerEscapedPath(): void
 	{
-		$factory = new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/containers/bugfix%2Fcontainer.xml']));
+		$factory = new XmlServiceMapFactory(__DIR__ . '/containers/bugfix%2Fcontainer.xml');
 		$serviceMap = $factory->create();
 
 		self::assertNotNull($serviceMap->getService('withClass'));

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ final class ConsoleApplicationResolver`
`20`	`20`
`21`	`21`	`private ?Application $consoleApplication = null;`
`22`	`22`
`23`		`- public function __construct(Configuration $configuration)`
	`23`	`+ public function __construct(?string $consoleApplicationLoader)`
`24`	`24`	`{`
`25`		`- $this->consoleApplicationLoader = $configuration->getConsoleApplicationLoader();`
	`25`	`+ $this->consoleApplicationLoader = $consoleApplicationLoader;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function hasConsoleApplicationLoader(): bool`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ final class XmlParameterMapFactory implements ParameterMapFactory`
`17`	`17`
`18`	`18`	`private ?string $containerXml = null;`
`19`	`19`
`20`		`- public function __construct(Configuration $configuration)`
	`20`	`+ public function __construct(?string $containerXmlPath)`
`21`	`21`	`{`
`22`		`- $this->containerXml = $configuration->getContainerXmlPath();`
	`22`	`+ $this->containerXml = $containerXmlPath;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function create(): ParameterMap`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ final class XmlServiceMapFactory implements ServiceMapFactory`
`14`	`14`
`15`	`15`	`private ?string $containerXml = null;`
`16`	`16`
`17`		`- public function __construct(Configuration $configuration)`
	`17`	`+ public function __construct(?string $containerXmlPath)`
`18`	`18`	`{`
`19`		`- $this->containerXml = $configuration->getContainerXmlPath();`
	`19`	`+ $this->containerXml = $containerXmlPath;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function create(): ServiceMap`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace PHPStan\Rules\Symfony;`
`4`	`4`
`5`	`5`	`use PHPStan\Rules\Rule;`
`6`		`-use PHPStan\Symfony\Configuration;`
`7`	`6`	`use PHPStan\Symfony\XmlServiceMapFactory;`
`8`	`7`	`use PHPStan\Testing\RuleTestCase;`
`9`	`8`	`use function class_exists;`
`@@ -17,7 +16,7 @@ final class ContainerInterfacePrivateServiceRuleFakeTest extends RuleTestCase`
`17`	`16`
`18`	`17`	`protected function getRule(): Rule`
`19`	`18`	`{`
`20`		`- return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(new Configuration([])))->create());`
	`19`	`+ return new ContainerInterfacePrivateServiceRule((new XmlServiceMapFactory(null))->create());`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`public function testGetPrivateService(): void`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use PHPStan\Node\Printer\Printer;`
`6`	`6`	`use PHPStan\Rules\Rule;`
`7`		`-use PHPStan\Symfony\Configuration;`
`8`	`7`	`use PHPStan\Symfony\XmlServiceMapFactory;`
`9`	`8`	`use PHPStan\Testing\RuleTestCase;`
`10`	`9`	`use PHPStan\Type\MethodTypeSpecifyingExtension;`
`@@ -20,7 +19,7 @@ final class ContainerInterfaceUnknownServiceRuleFakeTest extends RuleTestCase`
`20`	`19`
`21`	`20`	`protected function getRule(): Rule`
`22`	`21`	`{`
`23`		`- return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration([])))->create(), self::getContainer()->getByType(Printer::class));`
	`22`	`+ return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(null))->create(), self::getContainer()->getByType(Printer::class));`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`/**`