From 99848d82a72417cc70d3d57cbae0887040ca7fbe Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 11 Apr 2024 16:37:03 +0200
Subject: [PATCH 01/20] Add stub for Compound::getConstraints()

---
 extension.neon                                     |  2 ++
 .../Component/Validator/Constraints/Composite.stub |  9 +++++++++
 .../Component/Validator/Constraints/Compound.stub  | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 stubs/Symfony/Component/Validator/Constraints/Composite.stub
 create mode 100644 stubs/Symfony/Component/Validator/Constraints/Compound.stub

diff --git a/extension.neon b/extension.neon
index 09837d28..1eb888ab 100644
--- a/extension.neon
+++ b/extension.neon
@@ -96,6 +96,8 @@ parameters:
 		- stubs/Symfony/Component/Serializer/Normalizer/NormalizableInterface.stub
 		- stubs/Symfony/Component/Serializer/Normalizer/NormalizerInterface.stub
 		- stubs/Symfony/Component/Validator/Constraint.stub
+		- stubs/Symfony/Component/Validator/Constraints/Composite.stub
+		- stubs/Symfony/Component/Validator/Constraints/Compound.stub
 		- stubs/Symfony/Component/Validator/ConstraintViolationInterface.stub
 		- stubs/Symfony/Component/Validator/ConstraintViolationListInterface.stub
 		- stubs/Symfony/Contracts/Cache/CacheInterface.stub
diff --git a/stubs/Symfony/Component/Validator/Constraints/Composite.stub b/stubs/Symfony/Component/Validator/Constraints/Composite.stub
new file mode 100644
index 00000000..8344ea94
--- /dev/null
+++ b/stubs/Symfony/Component/Validator/Constraints/Composite.stub
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+abstract class Composite extends Constraint
+{
+}
diff --git a/stubs/Symfony/Component/Validator/Constraints/Compound.stub b/stubs/Symfony/Component/Validator/Constraints/Compound.stub
new file mode 100644
index 00000000..3227009b
--- /dev/null
+++ b/stubs/Symfony/Component/Validator/Constraints/Compound.stub
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+abstract class Compound extends Composite
+{
+    /**
+     * @param array<mixed> $options
+     * @return array<Constraint>
+     */
+    abstract protected function getConstraints(array $options): array;
+}

From 3fbf634b2495adaa1dc4b7300293f8abf74128d8 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 6 Mar 2024 17:17:02 +0100
Subject: [PATCH 02/20] Synchronize stub with symfony

---
 .../Component/Validator/ConstraintViolationInterface.stub     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stubs/Symfony/Component/Validator/ConstraintViolationInterface.stub b/stubs/Symfony/Component/Validator/ConstraintViolationInterface.stub
index e7f2b8a2..fd1c7b9b 100644
--- a/stubs/Symfony/Component/Validator/ConstraintViolationInterface.stub
+++ b/stubs/Symfony/Component/Validator/ConstraintViolationInterface.stub
@@ -3,7 +3,9 @@
 namespace Symfony\Component\Validator;
 
 /**
- * @method string __toString() Converts the violation into a string for debugging purposes. Not implementing it is deprecated since Symfony 6.1.
+ * @method Constraint|null getConstraint() Returns the constraint whose validation caused the violation. Not implementing it is deprecated since Symfony 6.3.
+ * @method mixed           getCause()      Returns the cause of the violation. Not implementing it is deprecated since Symfony 6.2.
+ * @method string          __toString()    Converts the violation into a string for debugging purposes. Not implementing it is deprecated since Symfony 6.1.
  */
 interface ConstraintViolationInterface
 {

From f4b9407fa3203aebafd422ae8f0eb1ef94659a80 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Sat, 13 Apr 2024 10:28:03 +0200
Subject: [PATCH 03/20] Synchronize stub with symfony

---
 stubs/Symfony/Component/Validator/Constraints/Compound.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/Symfony/Component/Validator/Constraints/Compound.stub b/stubs/Symfony/Component/Validator/Constraints/Compound.stub
index 3227009b..6a36c6bf 100644
--- a/stubs/Symfony/Component/Validator/Constraints/Compound.stub
+++ b/stubs/Symfony/Component/Validator/Constraints/Compound.stub
@@ -7,7 +7,7 @@ use Symfony\Component\Validator\Constraint;
 abstract class Compound extends Composite
 {
     /**
-     * @param array<mixed> $options
+     * @param array<string, mixed> $options
      * @return array<Constraint>
      */
     abstract protected function getConstraints(array $options): array;

From 2c3d666889173e902714359d8216ec5627527d92 Mon Sep 17 00:00:00 2001
From: Benoit Viguier <benoit.viguier@lendable.co.uk>
Date: Wed, 29 May 2024 10:32:08 +0200
Subject: [PATCH 04/20] Support for alias to inlined service

---
 src/Symfony/XmlServiceMapFactory.php    |  9 +++++++--
 tests/Symfony/DefaultServiceMapTest.php | 11 +++++++++++
 tests/Symfony/container.xml             |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/XmlServiceMapFactory.php b/src/Symfony/XmlServiceMapFactory.php
index ad52c373..1cae5d97 100644
--- a/src/Symfony/XmlServiceMapFactory.php
+++ b/src/Symfony/XmlServiceMapFactory.php
@@ -48,11 +48,11 @@ public function create(): ServiceMap
 			}
 
 			$service = new Service(
-				strpos((string) $attrs->id, '.') === 0 ? substr((string) $attrs->id, 1) : (string) $attrs->id,
+				$this->cleanServiceId((string) $attrs->id),
 				isset($attrs->class) ? (string) $attrs->class : null,
 				isset($attrs->public) && (string) $attrs->public === 'true',
 				isset($attrs->synthetic) && (string) $attrs->synthetic === 'true',
-				isset($attrs->alias) ? (string) $attrs->alias : null
+				isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null
 			);
 
 			if ($service->getAlias() !== null) {
@@ -79,4 +79,9 @@ public function create(): ServiceMap
 		return new DefaultServiceMap($services);
 	}
 
+	private function cleanServiceId(string $id): string
+	{
+		return strpos($id, '.') === 0 ? substr($id, 1) : $id;
+	}
+
 }
diff --git a/tests/Symfony/DefaultServiceMapTest.php b/tests/Symfony/DefaultServiceMapTest.php
index dc8487e5..a0a27d98 100644
--- a/tests/Symfony/DefaultServiceMapTest.php
+++ b/tests/Symfony/DefaultServiceMapTest.php
@@ -113,6 +113,17 @@ static function (?Service $service): void {
 				self::assertSame('withClass', $service->getAlias());
 			},
 		];
+		yield [
+			'aliasForInlined',
+			static function (?Service $service): void {
+				self::assertNotNull($service);
+				self::assertSame('aliasForInlined', $service->getId());
+				self::assertNull($service->getClass());
+				self::assertFalse($service->isPublic());
+				self::assertFalse($service->isSynthetic());
+				self::assertSame('inlined', $service->getAlias());
+			},
+		];
 	}
 
 }
diff --git a/tests/Symfony/container.xml b/tests/Symfony/container.xml
index 4be3bd98..f456ab51 100644
--- a/tests/Symfony/container.xml
+++ b/tests/Symfony/container.xml
@@ -41,5 +41,7 @@
     <service id="public" class="Foo" public="true"></service>
     <service id="synthetic" class="Foo" synthetic="true"></service>
     <service id="alias" class="Bar" alias="withClass"></service>
+    <service id=".inlined"></service>
+    <service id="aliasForInlined" alias=".inlined"></service>
   </services>
 </container>

From af6ae0f4b91bc080265e80776af26da3e5befb28 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Thu, 30 May 2024 17:01:27 +0200
Subject: [PATCH 05/20] Update getArgument return type in interact method

---
 ...InterfaceGetArgumentDynamicReturnTypeExtension.php | 11 +++++++++++
 tests/Type/Symfony/data/ExampleBaseCommand.php        | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
index 0af7c88d..a8d3eb37 100644
--- a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
+++ b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
@@ -10,11 +10,13 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\NullType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
 use function count;
+use function in_array;
 
 final class InputInterfaceGetArgumentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -76,6 +78,15 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
+		$method = $scope->getFunction();
+		if (
+			$method instanceof MethodReflection
+			&& $method->getName() === 'interact'
+			&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
+		) {
+			$argTypes[] = new NullType();
+		}
+
 		return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : null;
 	}
 
diff --git a/tests/Type/Symfony/data/ExampleBaseCommand.php b/tests/Type/Symfony/data/ExampleBaseCommand.php
index 0ab3a322..6c1f9422 100644
--- a/tests/Type/Symfony/data/ExampleBaseCommand.php
+++ b/tests/Type/Symfony/data/ExampleBaseCommand.php
@@ -17,6 +17,17 @@ protected function configure(): void
 		$this->addArgument('base');
 	}
 
+	protected function interact(InputInterface $input, OutputInterface $output): int
+	{
+		assertType('string|null', $input->getArgument('base'));
+		assertType('string|null', $input->getArgument('aaa'));
+		assertType('string|null', $input->getArgument('bbb'));
+		assertType('array<int, string>|string|null', $input->getArgument('diff'));
+		assertType('array<int, string>|null', $input->getArgument('arr'));
+		assertType('string|null', $input->getArgument('both'));
+		assertType('Symfony\Component\Console\Helper\QuestionHelper', $this->getHelper('question'));
+	}
+
 	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		assertType('string|null', $input->getArgument('base'));

From bca27f1701fc1a297749e6c2a1e3da4462c1a6af Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Thu, 6 Jun 2024 15:55:20 +0200
Subject: [PATCH 06/20] Fix interact method inference

---
 ...nterfaceGetArgumentDynamicReturnTypeExtension.php | 12 ++++++++++--
 tests/Type/Symfony/data/ExampleBaseCommand.php       | 12 ++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
index a8d3eb37..860317f6 100644
--- a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
+++ b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
@@ -57,6 +57,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		$argName = $argStrings[0]->getValue();
 
 		$argTypes = [];
+		$canBeNullInInteract = false;
 		foreach ($this->consoleApplicationResolver->findCommands($classReflection) as $command) {
 			try {
 				$command->mergeApplicationDefinition();
@@ -70,6 +71,8 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 					$argType = new StringType();
 					if (!$argument->isRequired()) {
 						$argType = TypeCombinator::union($argType, $scope->getTypeFromValue($argument->getDefault()));
+					} else {
+						$canBeNullInInteract = true;
 					}
 				}
 				$argTypes[] = $argType;
@@ -78,16 +81,21 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
+		if (count($argTypes) === 0) {
+			return null;
+		}
+
 		$method = $scope->getFunction();
 		if (
-			$method instanceof MethodReflection
+			$canBeNullInInteract
+			&& $method instanceof MethodReflection
 			&& $method->getName() === 'interact'
 			&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
 		) {
 			$argTypes[] = new NullType();
 		}
 
-		return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : null;
+		return TypeCombinator::union(...$argTypes);
 	}
 
 }
diff --git a/tests/Type/Symfony/data/ExampleBaseCommand.php b/tests/Type/Symfony/data/ExampleBaseCommand.php
index 6c1f9422..d2357089 100644
--- a/tests/Type/Symfony/data/ExampleBaseCommand.php
+++ b/tests/Type/Symfony/data/ExampleBaseCommand.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Symfony;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use function PHPStan\Testing\assertType;
@@ -14,16 +15,18 @@ protected function configure(): void
 	{
 		parent::configure();
 
+		$this->addArgument('required', InputArgument::REQUIRED);
 		$this->addArgument('base');
 	}
 
 	protected function interact(InputInterface $input, OutputInterface $output): int
 	{
 		assertType('string|null', $input->getArgument('base'));
-		assertType('string|null', $input->getArgument('aaa'));
-		assertType('string|null', $input->getArgument('bbb'));
-		assertType('array<int, string>|string|null', $input->getArgument('diff'));
-		assertType('array<int, string>|null', $input->getArgument('arr'));
+		assertType('string', $input->getArgument('aaa'));
+		assertType('string', $input->getArgument('bbb'));
+		assertType('string|null', $input->getArgument('required'));
+		assertType('array<int, string>|string', $input->getArgument('diff'));
+		assertType('array<int, string>', $input->getArgument('arr'));
 		assertType('string|null', $input->getArgument('both'));
 		assertType('Symfony\Component\Console\Helper\QuestionHelper', $this->getHelper('question'));
 	}
@@ -33,6 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		assertType('string|null', $input->getArgument('base'));
 		assertType('string', $input->getArgument('aaa'));
 		assertType('string', $input->getArgument('bbb'));
+		assertType('string', $input->getArgument('required'));
 		assertType('array<int, string>|string', $input->getArgument('diff'));
 		assertType('array<int, string>', $input->getArgument('arr'));
 		assertType('string|null', $input->getArgument('both'));

From 1bd7c339f622dfb5a1a97dcaf1a862734eabfa1d Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 19 Jun 2024 21:29:16 +0200
Subject: [PATCH 07/20] Also support command argument and initialize method

---
 ...eGetArgumentDynamicReturnTypeExtension.php |  2 +-
 ...eHasArgumentDynamicReturnTypeExtension.php | 12 ++++++++++
 .../Type/Symfony/data/ExampleBaseCommand.php  | 23 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
index 860317f6..5eb4cfe9 100644
--- a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
+++ b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
@@ -89,7 +89,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		if (
 			$canBeNullInInteract
 			&& $method instanceof MethodReflection
-			&& $method->getName() === 'interact'
+			&& ($method->getName() === 'interact' || $method->getName() === 'initialize')
 			&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
 		) {
 			$argTypes[] = new NullType();
diff --git a/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php
index 4ce49c4a..2ca6b4a1 100644
--- a/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php
+++ b/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php
@@ -13,6 +13,7 @@
 use PHPStan\Type\TypeUtils;
 use function array_unique;
 use function count;
+use function in_array;
 
 final class InputInterfaceHasArgumentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -52,6 +53,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		}
 		$argName = $argStrings[0]->getValue();
 
+		if ($argName === 'command') {
+			$method = $scope->getFunction();
+			if (
+				$method instanceof MethodReflection
+				&& ($method->getName() === 'interact' || $method->getName() === 'initialize')
+				&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
+			) {
+				return null;
+			}
+		}
+
 		$returnTypes = [];
 		foreach ($this->consoleApplicationResolver->findCommands($classReflection) as $command) {
 			try {
diff --git a/tests/Type/Symfony/data/ExampleBaseCommand.php b/tests/Type/Symfony/data/ExampleBaseCommand.php
index d2357089..0376429f 100644
--- a/tests/Type/Symfony/data/ExampleBaseCommand.php
+++ b/tests/Type/Symfony/data/ExampleBaseCommand.php
@@ -19,8 +19,26 @@ protected function configure(): void
 		$this->addArgument('base');
 	}
 
-	protected function interact(InputInterface $input, OutputInterface $output): int
+	protected function initialize(InputInterface $input, OutputInterface $output): void
 	{
+		assertType('bool', $input->hasArgument('command'));
+		assertType('string|null', $input->getArgument('command'));
+
+		assertType('string|null', $input->getArgument('base'));
+		assertType('string', $input->getArgument('aaa'));
+		assertType('string', $input->getArgument('bbb'));
+		assertType('string|null', $input->getArgument('required'));
+		assertType('array<int, string>|string', $input->getArgument('diff'));
+		assertType('array<int, string>', $input->getArgument('arr'));
+		assertType('string|null', $input->getArgument('both'));
+		assertType('Symfony\Component\Console\Helper\QuestionHelper', $this->getHelper('question'));
+	}
+
+	protected function interact(InputInterface $input, OutputInterface $output): void
+	{
+		assertType('bool', $input->hasArgument('command'));
+		assertType('string|null', $input->getArgument('command'));
+
 		assertType('string|null', $input->getArgument('base'));
 		assertType('string', $input->getArgument('aaa'));
 		assertType('string', $input->getArgument('bbb'));
@@ -33,6 +51,9 @@ protected function interact(InputInterface $input, OutputInterface $output): int
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
+		assertType('true', $input->hasArgument('command'));
+		assertType('string', $input->getArgument('command'));
+
 		assertType('string|null', $input->getArgument('base'));
 		assertType('string', $input->getArgument('aaa'));
 		assertType('string', $input->getArgument('bbb'));

From e909a075d69e0d4db262ac3407350ae2c6b6ab5f Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Tue, 16 Jul 2024 13:33:56 +0200
Subject: [PATCH 08/20] DiagnoseExtension

---
 composer.json                              |  2 +-
 extension.neon                             |  4 +++
 src/Symfony/ConsoleApplicationResolver.php |  5 ++++
 src/Symfony/SymfonyDiagnoseExtension.php   | 29 ++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/SymfonyDiagnoseExtension.php

diff --git a/composer.json b/composer.json
index 2269d9a4..f132544d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-simplexml": "*",
-    "phpstan/phpstan": "^1.11"
+    "phpstan/phpstan": "^1.11.7"
   },
   "conflict": {
     "symfony/framework-bundle": "<3.0"
diff --git a/extension.neon b/extension.neon
index 1eb888ab..e58d668f 100644
--- a/extension.neon
+++ b/extension.neon
@@ -322,6 +322,10 @@ services:
 		class: PHPStan\Symfony\PasswordAuthenticatedUserStubFilesExtension
 		tags:
 			- phpstan.stubFilesExtension
+	-
+		class: PHPStan\Symfony\SymfonyDiagnoseExtension
+		tags:
+			- phpstan.diagnoseExtension
 
 	# FormInterface::getErrors() return type
 	-
diff --git a/src/Symfony/ConsoleApplicationResolver.php b/src/Symfony/ConsoleApplicationResolver.php
index 51bd7960..52f5f4f0 100644
--- a/src/Symfony/ConsoleApplicationResolver.php
+++ b/src/Symfony/ConsoleApplicationResolver.php
@@ -27,6 +27,11 @@ public function __construct(Configuration $configuration)
 		$this->consoleApplicationLoader = $configuration->getConsoleApplicationLoader();
 	}
 
+	public function hasConsoleApplicationLoader(): bool
+	{
+		return $this->consoleApplicationLoader !== null;
+	}
+
 	private function getConsoleApplication(): ?Application
 	{
 		if ($this->consoleApplicationLoader === null) {
diff --git a/src/Symfony/SymfonyDiagnoseExtension.php b/src/Symfony/SymfonyDiagnoseExtension.php
new file mode 100644
index 00000000..afd566dc
--- /dev/null
+++ b/src/Symfony/SymfonyDiagnoseExtension.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Symfony;
+
+use PHPStan\Command\Output;
+use PHPStan\Diagnose\DiagnoseExtension;
+use function sprintf;
+
+class SymfonyDiagnoseExtension implements DiagnoseExtension
+{
+
+	/** @var ConsoleApplicationResolver */
+	private $consoleApplicationResolver;
+
+	public function __construct(ConsoleApplicationResolver $consoleApplicationResolver)
+	{
+		$this->consoleApplicationResolver = $consoleApplicationResolver;
+	}
+
+	public function print(Output $output): void
+	{
+		$output->writeLineFormatted(sprintf(
+			'<info>Symfony\'s consoleApplicationLoader:</info> %s',
+			$this->consoleApplicationResolver->hasConsoleApplicationLoader() ? 'In use' : 'No'
+		));
+		$output->writeLineFormatted('');
+	}
+
+}

From ee88a01bc48f608143d3376802ec952270737cb8 Mon Sep 17 00:00:00 2001
From: Jan Nedbal <janedbal@gmail.com>
Date: Thu, 18 Jul 2024 12:19:10 +0200
Subject: [PATCH 09/20] Fix internal error when DIC param map has > 256 items

---
 .../ParameterDynamicReturnTypeExtension.php   |   5 +-
 tests/Type/Symfony/container.xml              | 259 ++++++++++++++++++
 .../data/ExampleAbstractController.php        |   1 +
 3 files changed, 264 insertions(+), 1 deletion(-)

diff --git a/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php b/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
index 82d3599e..82535133 100644
--- a/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
+++ b/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
@@ -13,6 +13,7 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantArrayType;
+use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
@@ -168,7 +169,9 @@ private function generalizeTypeFromValue(Scope $scope, $value): Type
 					$valueTypes[] = $this->generalizeTypeFromValue($scope, $element);
 				}
 
-				return new ConstantArrayType($keyTypes, $valueTypes);
+				return ConstantArrayTypeBuilder::createFromConstantArray(
+					new ConstantArrayType($keyTypes, $valueTypes)
+				)->getArray();
 			}
 
 			return new ArrayType(
diff --git a/tests/Type/Symfony/container.xml b/tests/Type/Symfony/container.xml
index e1ef6d89..224c72db 100644
--- a/tests/Type/Symfony/container.xml
+++ b/tests/Type/Symfony/container.xml
@@ -82,6 +82,265 @@
             <parameter key="b">value of b</parameter>
             <parameter key="c">value of c</parameter>
         </parameter>
+        <parameter key="app.hugemap" type="collection">
+            <parameter key="k1">v1</parameter>
+            <parameter key="k2">v2</parameter>
+            <parameter key="k3">v3</parameter>
+            <parameter key="k4">v4</parameter>
+            <parameter key="k5">v5</parameter>
+            <parameter key="k6">v6</parameter>
+            <parameter key="k7">v7</parameter>
+            <parameter key="k8">v8</parameter>
+            <parameter key="k9">v9</parameter>
+            <parameter key="k10">v10</parameter>
+            <parameter key="k11">v11</parameter>
+            <parameter key="k12">v12</parameter>
+            <parameter key="k13">v13</parameter>
+            <parameter key="k14">v14</parameter>
+            <parameter key="k15">v15</parameter>
+            <parameter key="k16">v16</parameter>
+            <parameter key="k17">v17</parameter>
+            <parameter key="k18">v18</parameter>
+            <parameter key="k19">v19</parameter>
+            <parameter key="k20">v20</parameter>
+            <parameter key="k21">v21</parameter>
+            <parameter key="k22">v22</parameter>
+            <parameter key="k23">v23</parameter>
+            <parameter key="k24">v24</parameter>
+            <parameter key="k25">v25</parameter>
+            <parameter key="k26">v26</parameter>
+            <parameter key="k27">v27</parameter>
+            <parameter key="k28">v28</parameter>
+            <parameter key="k29">v29</parameter>
+            <parameter key="k30">v30</parameter>
+            <parameter key="k31">v31</parameter>
+            <parameter key="k32">v32</parameter>
+            <parameter key="k33">v33</parameter>
+            <parameter key="k34">v34</parameter>
+            <parameter key="k35">v35</parameter>
+            <parameter key="k36">v36</parameter>
+            <parameter key="k37">v37</parameter>
+            <parameter key="k38">v38</parameter>
+            <parameter key="k39">v39</parameter>
+            <parameter key="k40">v40</parameter>
+            <parameter key="k41">v41</parameter>
+            <parameter key="k42">v42</parameter>
+            <parameter key="k43">v43</parameter>
+            <parameter key="k44">v44</parameter>
+            <parameter key="k45">v45</parameter>
+            <parameter key="k46">v46</parameter>
+            <parameter key="k47">v47</parameter>
+            <parameter key="k48">v48</parameter>
+            <parameter key="k49">v49</parameter>
+            <parameter key="k50">v50</parameter>
+            <parameter key="k51">v51</parameter>
+            <parameter key="k52">v52</parameter>
+            <parameter key="k53">v53</parameter>
+            <parameter key="k54">v54</parameter>
+            <parameter key="k55">v55</parameter>
+            <parameter key="k56">v56</parameter>
+            <parameter key="k57">v57</parameter>
+            <parameter key="k58">v58</parameter>
+            <parameter key="k59">v59</parameter>
+            <parameter key="k60">v60</parameter>
+            <parameter key="k61">v61</parameter>
+            <parameter key="k62">v62</parameter>
+            <parameter key="k63">v63</parameter>
+            <parameter key="k64">v64</parameter>
+            <parameter key="k65">v65</parameter>
+            <parameter key="k66">v66</parameter>
+            <parameter key="k67">v67</parameter>
+            <parameter key="k68">v68</parameter>
+            <parameter key="k69">v69</parameter>
+            <parameter key="k70">v70</parameter>
+            <parameter key="k71">v71</parameter>
+            <parameter key="k72">v72</parameter>
+            <parameter key="k73">v73</parameter>
+            <parameter key="k74">v74</parameter>
+            <parameter key="k75">v75</parameter>
+            <parameter key="k76">v76</parameter>
+            <parameter key="k77">v77</parameter>
+            <parameter key="k78">v78</parameter>
+            <parameter key="k79">v79</parameter>
+            <parameter key="k80">v80</parameter>
+            <parameter key="k81">v81</parameter>
+            <parameter key="k82">v82</parameter>
+            <parameter key="k83">v83</parameter>
+            <parameter key="k84">v84</parameter>
+            <parameter key="k85">v85</parameter>
+            <parameter key="k86">v86</parameter>
+            <parameter key="k87">v87</parameter>
+            <parameter key="k88">v88</parameter>
+            <parameter key="k89">v89</parameter>
+            <parameter key="k90">v90</parameter>
+            <parameter key="k91">v91</parameter>
+            <parameter key="k92">v92</parameter>
+            <parameter key="k93">v93</parameter>
+            <parameter key="k94">v94</parameter>
+            <parameter key="k95">v95</parameter>
+            <parameter key="k96">v96</parameter>
+            <parameter key="k97">v97</parameter>
+            <parameter key="k98">v98</parameter>
+            <parameter key="k99">v99</parameter>
+            <parameter key="k100">v100</parameter>
+            <parameter key="k101">v101</parameter>
+            <parameter key="k102">v102</parameter>
+            <parameter key="k103">v103</parameter>
+            <parameter key="k104">v104</parameter>
+            <parameter key="k105">v105</parameter>
+            <parameter key="k106">v106</parameter>
+            <parameter key="k107">v107</parameter>
+            <parameter key="k108">v108</parameter>
+            <parameter key="k109">v109</parameter>
+            <parameter key="k110">v110</parameter>
+            <parameter key="k111">v111</parameter>
+            <parameter key="k112">v112</parameter>
+            <parameter key="k113">v113</parameter>
+            <parameter key="k114">v114</parameter>
+            <parameter key="k115">v115</parameter>
+            <parameter key="k116">v116</parameter>
+            <parameter key="k117">v117</parameter>
+            <parameter key="k118">v118</parameter>
+            <parameter key="k119">v119</parameter>
+            <parameter key="k120">v120</parameter>
+            <parameter key="k121">v121</parameter>
+            <parameter key="k122">v122</parameter>
+            <parameter key="k123">v123</parameter>
+            <parameter key="k124">v124</parameter>
+            <parameter key="k125">v125</parameter>
+            <parameter key="k126">v126</parameter>
+            <parameter key="k127">v127</parameter>
+            <parameter key="k128">v128</parameter>
+            <parameter key="k129">v129</parameter>
+            <parameter key="k130">v130</parameter>
+            <parameter key="k131">v131</parameter>
+            <parameter key="k132">v132</parameter>
+            <parameter key="k133">v133</parameter>
+            <parameter key="k134">v134</parameter>
+            <parameter key="k135">v135</parameter>
+            <parameter key="k136">v136</parameter>
+            <parameter key="k137">v137</parameter>
+            <parameter key="k138">v138</parameter>
+            <parameter key="k139">v139</parameter>
+            <parameter key="k140">v140</parameter>
+            <parameter key="k141">v141</parameter>
+            <parameter key="k142">v142</parameter>
+            <parameter key="k143">v143</parameter>
+            <parameter key="k144">v144</parameter>
+            <parameter key="k145">v145</parameter>
+            <parameter key="k146">v146</parameter>
+            <parameter key="k147">v147</parameter>
+            <parameter key="k148">v148</parameter>
+            <parameter key="k149">v149</parameter>
+            <parameter key="k150">v150</parameter>
+            <parameter key="k151">v151</parameter>
+            <parameter key="k152">v152</parameter>
+            <parameter key="k153">v153</parameter>
+            <parameter key="k154">v154</parameter>
+            <parameter key="k155">v155</parameter>
+            <parameter key="k156">v156</parameter>
+            <parameter key="k157">v157</parameter>
+            <parameter key="k158">v158</parameter>
+            <parameter key="k159">v159</parameter>
+            <parameter key="k160">v160</parameter>
+            <parameter key="k161">v161</parameter>
+            <parameter key="k162">v162</parameter>
+            <parameter key="k163">v163</parameter>
+            <parameter key="k164">v164</parameter>
+            <parameter key="k165">v165</parameter>
+            <parameter key="k166">v166</parameter>
+            <parameter key="k167">v167</parameter>
+            <parameter key="k168">v168</parameter>
+            <parameter key="k169">v169</parameter>
+            <parameter key="k170">v170</parameter>
+            <parameter key="k171">v171</parameter>
+            <parameter key="k172">v172</parameter>
+            <parameter key="k173">v173</parameter>
+            <parameter key="k174">v174</parameter>
+            <parameter key="k175">v175</parameter>
+            <parameter key="k176">v176</parameter>
+            <parameter key="k177">v177</parameter>
+            <parameter key="k178">v178</parameter>
+            <parameter key="k179">v179</parameter>
+            <parameter key="k180">v180</parameter>
+            <parameter key="k181">v181</parameter>
+            <parameter key="k182">v182</parameter>
+            <parameter key="k183">v183</parameter>
+            <parameter key="k184">v184</parameter>
+            <parameter key="k185">v185</parameter>
+            <parameter key="k186">v186</parameter>
+            <parameter key="k187">v187</parameter>
+            <parameter key="k188">v188</parameter>
+            <parameter key="k189">v189</parameter>
+            <parameter key="k190">v190</parameter>
+            <parameter key="k191">v191</parameter>
+            <parameter key="k192">v192</parameter>
+            <parameter key="k193">v193</parameter>
+            <parameter key="k194">v194</parameter>
+            <parameter key="k195">v195</parameter>
+            <parameter key="k196">v196</parameter>
+            <parameter key="k197">v197</parameter>
+            <parameter key="k198">v198</parameter>
+            <parameter key="k199">v199</parameter>
+            <parameter key="k200">v200</parameter>
+            <parameter key="k201">v201</parameter>
+            <parameter key="k202">v202</parameter>
+            <parameter key="k203">v203</parameter>
+            <parameter key="k204">v204</parameter>
+            <parameter key="k205">v205</parameter>
+            <parameter key="k206">v206</parameter>
+            <parameter key="k207">v207</parameter>
+            <parameter key="k208">v208</parameter>
+            <parameter key="k209">v209</parameter>
+            <parameter key="k210">v210</parameter>
+            <parameter key="k211">v211</parameter>
+            <parameter key="k212">v212</parameter>
+            <parameter key="k213">v213</parameter>
+            <parameter key="k214">v214</parameter>
+            <parameter key="k215">v215</parameter>
+            <parameter key="k216">v216</parameter>
+            <parameter key="k217">v217</parameter>
+            <parameter key="k218">v218</parameter>
+            <parameter key="k219">v219</parameter>
+            <parameter key="k220">v220</parameter>
+            <parameter key="k221">v221</parameter>
+            <parameter key="k222">v222</parameter>
+            <parameter key="k223">v223</parameter>
+            <parameter key="k224">v224</parameter>
+            <parameter key="k225">v225</parameter>
+            <parameter key="k226">v226</parameter>
+            <parameter key="k227">v227</parameter>
+            <parameter key="k228">v228</parameter>
+            <parameter key="k229">v229</parameter>
+            <parameter key="k230">v230</parameter>
+            <parameter key="k231">v231</parameter>
+            <parameter key="k232">v232</parameter>
+            <parameter key="k233">v233</parameter>
+            <parameter key="k234">v234</parameter>
+            <parameter key="k235">v235</parameter>
+            <parameter key="k236">v236</parameter>
+            <parameter key="k237">v237</parameter>
+            <parameter key="k238">v238</parameter>
+            <parameter key="k239">v239</parameter>
+            <parameter key="k240">v240</parameter>
+            <parameter key="k241">v241</parameter>
+            <parameter key="k242">v242</parameter>
+            <parameter key="k243">v243</parameter>
+            <parameter key="k244">v244</parameter>
+            <parameter key="k245">v245</parameter>
+            <parameter key="k246">v246</parameter>
+            <parameter key="k247">v247</parameter>
+            <parameter key="k248">v248</parameter>
+            <parameter key="k249">v249</parameter>
+            <parameter key="k250">v250</parameter>
+            <parameter key="k251">v251</parameter>
+            <parameter key="k252">v252</parameter>
+            <parameter key="k253">v253</parameter>
+            <parameter key="k254">v254</parameter>
+            <parameter key="k255">v255</parameter>
+            <parameter key="k256">v256</parameter>
+            <parameter key="k257">v257</parameter>
+        </parameter>
         <parameter key="app.binary" type="binary">VGhpcyBpcyBhIEJlbGwgY2hhciAH</parameter>
         <parameter key="app.constant">Y-m-d\TH:i:sP</parameter>
 		<parameter key="test_collection" type="collection"/>
diff --git a/tests/Type/Symfony/data/ExampleAbstractController.php b/tests/Type/Symfony/data/ExampleAbstractController.php
index d9857a53..53b38066 100644
--- a/tests/Type/Symfony/data/ExampleAbstractController.php
+++ b/tests/Type/Symfony/data/ExampleAbstractController.php
@@ -80,6 +80,7 @@ public function parameters(ContainerInterface $container, ParameterBagInterface
 		assertType("array{a: string, b: string, c: string}", $container->getParameter('app.map'));
 		assertType("array{a: string, b: string, c: string}", $parameterBag->get('app.map'));
 		assertType("array{a: string, b: string, c: string}", $this->getParameter('app.map'));
+		assertType("non-falsy-string", implode(',', $this->getParameter('app.hugemap')));
 		assertType("string", $container->getParameter('app.binary'));
 		assertType("string", $parameterBag->get('app.binary'));
 		assertType("string", $this->getParameter('app.binary'));

From 14eec8c011b856eee4d744a2a3f709db1e1858bd Mon Sep 17 00:00:00 2001
From: Zachary Lund <git@lundscape.com>
Date: Mon, 12 Aug 2024 11:03:46 -0500
Subject: [PATCH 10/20] Add stub for AbstractController::createForm()

---
 extension.neon                                |  2 ++
 .../Controller/AbstractController.stub        | 24 +++++++++++++++++++
 .../Service/ServiceSubscriberInterface.stub   |  7 ++++++
 tests/Type/Symfony/data/form_data_type.php    | 18 ++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 100644 stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
 create mode 100644 stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub

diff --git a/extension.neon b/extension.neon
index e58d668f..512f9908 100644
--- a/extension.neon
+++ b/extension.neon
@@ -27,6 +27,7 @@ parameters:
 		- stubs/Psr/Cache/CacheException.stub
 		- stubs/Psr/Cache/CacheItemInterface.stub
 		- stubs/Psr/Cache/InvalidArgumentException.stub
+		- stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/KernelBrowser.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/Test/TestContainer.stub
@@ -103,6 +104,7 @@ parameters:
 		- stubs/Symfony/Contracts/Cache/CacheInterface.stub
 		- stubs/Symfony/Contracts/Cache/CallbackInterface.stub
 		- stubs/Symfony/Contracts/Cache/ItemInterface.stub
+		- stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub
 		- stubs/Twig/Node/Node.stub
 
 parametersSchema:
diff --git a/stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub b/stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
new file mode 100644
index 00000000..075dce6d
--- /dev/null
+++ b/stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Controller;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormTypeInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+abstract class AbstractController implements ServiceSubscriberInterface
+{
+	/**
+	 * @template TFormType of FormTypeInterface<TData>
+	 * @template TData
+	 *
+	 * @param class-string<TFormType> $type
+	 * @param TData                   $data
+	 * @param array<string, mixed>    $options
+	 *
+	 * @phpstan-return ($data is null ? FormInterface<null|TData> : FormInterface<TData>)
+	 */
+	protected function createForm(string $type, $data = null, array $options = []): FormInterface
+	{
+	}
+}
diff --git a/stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub b/stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub
new file mode 100644
index 00000000..8860e239
--- /dev/null
+++ b/stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Contracts\Service;
+
+interface ServiceSubscriberInterface
+{
+}
diff --git a/tests/Type/Symfony/data/form_data_type.php b/tests/Type/Symfony/data/form_data_type.php
index e0cefb88..34a673a4 100644
--- a/tests/Type/Symfony/data/form_data_type.php
+++ b/tests/Type/Symfony/data/form_data_type.php
@@ -2,6 +2,7 @@
 
 namespace GenericFormDataType;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -73,3 +74,20 @@ public function doSomethingNullable(): void
 	}
 
 }
+
+class FormController extends AbstractController
+{
+
+	public function doSomething(): void
+	{
+		$form = $this->createForm(DataClassType::class, new DataClass());
+		assertType('GenericFormDataType\DataClass', $form->getData());
+	}
+
+	public function doSomethingNullable(): void
+	{
+		$form = $this->createForm(DataClassType::class);
+		assertType('GenericFormDataType\DataClass|null', $form->getData());
+	}
+
+}

From 3cf113fa3e190ab9ab47b0aed46f32a36dfc2c7a Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Thu, 5 Sep 2024 13:39:28 +0200
Subject: [PATCH 11/20] Fix stubs

---
 .../Component/EventDispatcher/EventDispatcherInterface.stub   | 2 +-
 stubs/Symfony/Component/HttpFoundation/Cookie.stub            | 4 ++--
 .../Serializer/Exception/ExtraAttributesException.stub        | 2 +-
 stubs/Symfony/Contracts/Cache/CacheInterface.stub             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stubs/Symfony/Component/EventDispatcher/EventDispatcherInterface.stub b/stubs/Symfony/Component/EventDispatcher/EventDispatcherInterface.stub
index e4ad8fc4..a58e43ca 100644
--- a/stubs/Symfony/Component/EventDispatcher/EventDispatcherInterface.stub
+++ b/stubs/Symfony/Component/EventDispatcher/EventDispatcherInterface.stub
@@ -10,5 +10,5 @@ interface EventDispatcherInterface
      *
      * @return TEvent
      */
-    public function dispatch(object $event, string $eventName = null): object;
+    public function dispatch(object $event, ?string $eventName = null): object;
 }
diff --git a/stubs/Symfony/Component/HttpFoundation/Cookie.stub b/stubs/Symfony/Component/HttpFoundation/Cookie.stub
index 40ee45ab..cfb45fa3 100644
--- a/stubs/Symfony/Component/HttpFoundation/Cookie.stub
+++ b/stubs/Symfony/Component/HttpFoundation/Cookie.stub
@@ -21,7 +21,7 @@ class Cookie
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $name, string $value = null, $expire = 0, ?string $path = '/', string $domain = null, ?bool $secure = false, bool $httpOnly = true, bool $raw = false, string $sameSite = null);
+    public function __construct(string $name, ?string $value = null, $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = false, bool $httpOnly = true, bool $raw = false, ?string $sameSite = null);
 
     /**
      * @param string                        $name     The name of the cookie
@@ -36,7 +36,7 @@ class Cookie
      *
      * @throws \InvalidArgumentException
      */
-    public function create(string $name, string $value = null, $expire = 0, ?string $path = '/', string $domain = null, ?bool $secure = false, bool $httpOnly = true, bool $raw = false, string $sameSite = null): self;
+    public function create(string $name, ?string $value = null, $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = false, bool $httpOnly = true, bool $raw = false, ?string $sameSite = null): self;
 
     /**
      * @return self::SAMESITE_*|null
diff --git a/stubs/Symfony/Component/Serializer/Exception/ExtraAttributesException.stub b/stubs/Symfony/Component/Serializer/Exception/ExtraAttributesException.stub
index 18621931..b23f0d19 100644
--- a/stubs/Symfony/Component/Serializer/Exception/ExtraAttributesException.stub
+++ b/stubs/Symfony/Component/Serializer/Exception/ExtraAttributesException.stub
@@ -7,7 +7,7 @@ class ExtraAttributesException extends RuntimeException
     /**
      * @param string[] $extraAttributes
      */
-    public function __construct(array $extraAttributes, \Throwable $previous = null)
+    public function __construct(array $extraAttributes, ?\Throwable $previous = null)
     {
     }
 
diff --git a/stubs/Symfony/Contracts/Cache/CacheInterface.stub b/stubs/Symfony/Contracts/Cache/CacheInterface.stub
index ff3027b1..a361ead4 100644
--- a/stubs/Symfony/Contracts/Cache/CacheInterface.stub
+++ b/stubs/Symfony/Contracts/Cache/CacheInterface.stub
@@ -15,5 +15,5 @@ interface CacheInterface
      *
      * @throws InvalidArgumentException
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null);
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null);
 }

From 42797536c3de1531769a725bfbb404f220ae0516 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Thu, 5 Sep 2024 18:13:37 +0200
Subject: [PATCH 12/20] Test newer PHP versions

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4453157..c4f7c922 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"
@@ -93,6 +95,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"
@@ -132,6 +136,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"

From 30d088616836b108fbfc634211c2feae130ae42e Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Thu, 5 Sep 2024 18:13:54 +0200
Subject: [PATCH 13/20] Pin build-cs

---
 .github/workflows/build.yml | 1 +
 Makefile                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4f7c922..ad0554fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,7 @@ jobs:
         with:
           repository: "phpstan/build-cs"
           path: "build-cs"
+          ref: "1.x"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
diff --git a/Makefile b/Makefile
index ecd8cfb2..b01b1537 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ lint:
 .PHONY: cs-install
 cs-install:
 	git clone https://github.com/phpstan/build-cs.git || true
-	git -C build-cs fetch origin && git -C build-cs reset --hard origin/main
+	git -C build-cs fetch origin && git -C build-cs reset --hard origin/1.x
 	composer install --working-dir build-cs
 
 .PHONY: cs

From 51ab2438fb2695467cf96b58d2f8f28d4dd1e3e9 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Thu, 5 Sep 2024 18:15:09 +0200
Subject: [PATCH 14/20] Require PHPStan 1.12

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f132544d..0d5cd41c 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-simplexml": "*",
-    "phpstan/phpstan": "^1.11.7"
+    "phpstan/phpstan": "^1.12"
   },
   "conflict": {
     "symfony/framework-bundle": "<3.0"

From f7d5782044bedf93aeb3f38e09c91148ee90e5a1 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Thu, 26 Sep 2024 11:24:58 +0200
Subject: [PATCH 15/20] Fix InputBagTypeSpecifyingExtension

---
 src/Type/Symfony/InputBagTypeSpecifyingExtension.php | 2 +-
 tests/Type/Symfony/data/input_bag.php                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Type/Symfony/InputBagTypeSpecifyingExtension.php b/src/Type/Symfony/InputBagTypeSpecifyingExtension.php
index d3ad578c..3a4e54fc 100644
--- a/src/Type/Symfony/InputBagTypeSpecifyingExtension.php
+++ b/src/Type/Symfony/InputBagTypeSpecifyingExtension.php
@@ -30,7 +30,7 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection, MethodCall $node, TypeSpecifierContext $context): bool
 	{
-		return $methodReflection->getName() === self::HAS_METHOD_NAME && !$context->null();
+		return $methodReflection->getName() === self::HAS_METHOD_NAME && $context->false();
 	}
 
 	public function specifyTypes(MethodReflection $methodReflection, MethodCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
diff --git a/tests/Type/Symfony/data/input_bag.php b/tests/Type/Symfony/data/input_bag.php
index efd08461..744a7765 100644
--- a/tests/Type/Symfony/data/input_bag.php
+++ b/tests/Type/Symfony/data/input_bag.php
@@ -7,7 +7,8 @@
 assertType('bool|float|int|string|null', $bag->get('foo'));
 
 if ($bag->has('foo')) {
-	assertType('bool|float|int|string', $bag->get('foo'));
+	// Because `has` rely on `array_key_exists` we can still have set the NULL value.
+	assertType('bool|float|int|string|null', $bag->get('foo'));
 	assertType('bool|float|int|string|null', $bag->get('bar'));
 } else {
 	assertType('null', $bag->get('foo'));

From 270c2ee1478d1f8dc5121f539e890017bd64b04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= <ondrej@mirtes.cz>
Date: Wed, 30 Oct 2024 13:01:49 +0100
Subject: [PATCH 16/20] Update Process.stub

---
 extension.neon                                    |  1 +
 .../Process/Exception/LogicException.stub         |  8 ++++++++
 stubs/Symfony/Component/Process/Process.stub      | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 stubs/Symfony/Component/Process/Exception/LogicException.stub

diff --git a/extension.neon b/extension.neon
index 512f9908..4868bc2d 100644
--- a/extension.neon
+++ b/extension.neon
@@ -66,6 +66,7 @@ parameters:
 		- stubs/Symfony/Component/Messenger/Envelope.stub
 		- stubs/Symfony/Component/OptionsResolver/Exception/InvalidOptionsException.stub
 		- stubs/Symfony/Component/OptionsResolver/Options.stub
+		- stubs/Symfony/Component/Process/Exception/LogicException.stub
 		- stubs/Symfony/Component/Process/Process.stub
 		- stubs/Symfony/Component/PropertyAccess/Exception/AccessException.stub
 		- stubs/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.stub
diff --git a/stubs/Symfony/Component/Process/Exception/LogicException.stub b/stubs/Symfony/Component/Process/Exception/LogicException.stub
new file mode 100644
index 00000000..cb781d6a
--- /dev/null
+++ b/stubs/Symfony/Component/Process/Exception/LogicException.stub
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\Process\Exception;
+
+class LogicException extends \Exception
+{
+
+}
diff --git a/stubs/Symfony/Component/Process/Process.stub b/stubs/Symfony/Component/Process/Process.stub
index 771dc666..b7bff236 100644
--- a/stubs/Symfony/Component/Process/Process.stub
+++ b/stubs/Symfony/Component/Process/Process.stub
@@ -2,10 +2,25 @@
 
 namespace Symfony\Component\Process;
 
+use Symfony\Component\Process\Exception\LogicException;
+
 /**
  * @implements \IteratorAggregate<string, string>
  */
 class Process implements \IteratorAggregate
 {
 
+    /**
+     * @param int $flags
+     *
+     * @return \Generator<string, string, mixed, mixed>
+     *
+     * @throws LogicException in case the output has been disabled
+     * @throws LogicException In case the process is not started
+     */
+    public function getIterator(int $flags = 0): \Generator
+    {
+
+    }
+
 }

From c7b7e7f520893621558bfbfdb2694d4364565c1d Mon Sep 17 00:00:00 2001
From: Michael Telgmann <m.telgmann@shopware.com>
Date: Wed, 6 Nov 2024 11:08:10 +0100
Subject: [PATCH 17/20] feat: Add @api annotation to interfaces

The following interfaces are now part of the public API and can be safely relied on.

- \PHPStan\Symfony\ParameterDefinition
- \PHPStan\Symfony\ParameterMap
- \PHPStan\Symfony\ServiceDefinition
- \PHPStan\Symfony\ServiceMap
---
 src/Symfony/ParameterDefinition.php | 3 +++
 src/Symfony/ParameterMap.php        | 3 +++
 src/Symfony/ServiceDefinition.php   | 3 +++
 src/Symfony/ServiceMap.php          | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/src/Symfony/ParameterDefinition.php b/src/Symfony/ParameterDefinition.php
index e1aa2eaa..1da7723b 100644
--- a/src/Symfony/ParameterDefinition.php
+++ b/src/Symfony/ParameterDefinition.php
@@ -2,6 +2,9 @@
 
 namespace PHPStan\Symfony;
 
+/**
+ * @api
+ */
 interface ParameterDefinition
 {
 
diff --git a/src/Symfony/ParameterMap.php b/src/Symfony/ParameterMap.php
index ff0f5224..0c551635 100644
--- a/src/Symfony/ParameterMap.php
+++ b/src/Symfony/ParameterMap.php
@@ -5,6 +5,9 @@
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
 
+/**
+ * @api
+ */
 interface ParameterMap
 {
 
diff --git a/src/Symfony/ServiceDefinition.php b/src/Symfony/ServiceDefinition.php
index c7cdcd18..6df34cba 100644
--- a/src/Symfony/ServiceDefinition.php
+++ b/src/Symfony/ServiceDefinition.php
@@ -2,6 +2,9 @@
 
 namespace PHPStan\Symfony;
 
+/**
+ * @api
+ */
 interface ServiceDefinition
 {
 
diff --git a/src/Symfony/ServiceMap.php b/src/Symfony/ServiceMap.php
index 6665ede0..bbd2d8a3 100644
--- a/src/Symfony/ServiceMap.php
+++ b/src/Symfony/ServiceMap.php
@@ -5,6 +5,9 @@
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
 
+/**
+ * @api
+ */
 interface ServiceMap
 {
 

From dd1aaa7f85f9916222a2ce7e4d21072fe03958f4 Mon Sep 17 00:00:00 2001
From: bnowak <barteknowak90@gmail.com>
Date: Sat, 4 Jan 2025 14:55:31 +0100
Subject: [PATCH 18/20] Support for Messenger HandleTrait return types

---
 extension.neon                                |  12 ++
 src/Symfony/MessageMap.php                    |  24 +++
 src/Symfony/MessageMapFactory.php             | 154 ++++++++++++++++++
 src/Symfony/Service.php                       |  13 +-
 src/Symfony/ServiceDefinition.php             |   3 +
 src/Symfony/ServiceTag.php                    |  31 ++++
 src/Symfony/ServiceTagDefinition.php          |  13 ++
 src/Symfony/XmlServiceMapFactory.php          |  12 +-
 ...essengerHandleTraitReturnTypeExtension.php |  91 +++++++++++
 tests/Type/Symfony/ExtensionTest.php          |   1 +
 tests/Type/Symfony/container.xml              |  18 ++
 .../Symfony/data/messenger_handle_trait.php   | 113 +++++++++++++
 12 files changed, 483 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/MessageMap.php
 create mode 100644 src/Symfony/MessageMapFactory.php
 create mode 100644 src/Symfony/ServiceTag.php
 create mode 100644 src/Symfony/ServiceTagDefinition.php
 create mode 100644 src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php
 create mode 100644 tests/Type/Symfony/data/messenger_handle_trait.php

diff --git a/extension.neon b/extension.neon
index 4868bc2d..cbdfd73d 100644
--- a/extension.neon
+++ b/extension.neon
@@ -140,6 +140,13 @@ services:
 	-
 		factory: @symfony.parameterMapFactory::create()
 
+	# message map
+	symfony.messageMapFactory:
+		class: PHPStan\Symfony\MessageMapFactory
+		factory: PHPStan\Symfony\MessageMapFactory
+	-
+		factory: @symfony.messageMapFactory::create()
+
 	# ControllerTrait::get()/has() return type
 	-
 		factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface)
@@ -203,6 +210,11 @@ services:
 		factory: PHPStan\Type\Symfony\EnvelopeReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
+	# Messenger HandleTrait::handle() return type
+	-
+		class: PHPStan\Type\Symfony\MessengerHandleTraitReturnTypeExtension
+		tags: [phpstan.broker.expressionTypeResolverExtension]
+
 	# InputInterface::getArgument() return type
 	-
 		factory: PHPStan\Type\Symfony\InputInterfaceGetArgumentDynamicReturnTypeExtension
diff --git a/src/Symfony/MessageMap.php b/src/Symfony/MessageMap.php
new file mode 100644
index 00000000..7523742c
--- /dev/null
+++ b/src/Symfony/MessageMap.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Symfony;
+
+use PHPStan\Type\Type;
+
+final class MessageMap
+{
+
+	/** @var array<string, Type> */
+	private $messageMap;
+
+	/** @param array<string, Type> $messageMap */
+	public function __construct(array $messageMap)
+	{
+		$this->messageMap = $messageMap;
+	}
+
+	public function getTypeForClass(string $class): ?Type
+	{
+		return $this->messageMap[$class] ?? null;
+	}
+
+}
diff --git a/src/Symfony/MessageMapFactory.php b/src/Symfony/MessageMapFactory.php
new file mode 100644
index 00000000..5c9ef152
--- /dev/null
+++ b/src/Symfony/MessageMapFactory.php
@@ -0,0 +1,154 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Symfony;
+
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\ReflectionProvider;
+use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
+use function class_exists;
+use function count;
+use function is_array;
+use function is_int;
+use function is_string;
+
+final class MessageMapFactory
+{
+
+	private const MESSENGER_HANDLER_TAG = 'messenger.message_handler';
+	private const DEFAULT_HANDLER_METHOD = '__invoke';
+
+	/** @var ReflectionProvider */
+	private $reflectionProvider;
+
+	/** @var ServiceMap */
+	private $serviceMap;
+
+	public function __construct(ServiceMap $symfonyServiceMap, ReflectionProvider $reflectionProvider)
+	{
+		$this->serviceMap = $symfonyServiceMap;
+		$this->reflectionProvider = $reflectionProvider;
+	}
+
+	public function create(): MessageMap
+	{
+		$returnTypesMap = [];
+
+		foreach ($this->serviceMap->getServices() as $service) {
+			$serviceClass = $service->getClass();
+
+			if ($serviceClass === null) {
+				continue;
+			}
+
+			foreach ($service->getTags() as $tag) {
+				if ($tag->getName() !== self::MESSENGER_HANDLER_TAG) {
+					continue;
+				}
+
+				if (!$this->reflectionProvider->hasClass($serviceClass)) {
+					continue;
+				}
+
+				$reflectionClass = $this->reflectionProvider->getClass($serviceClass);
+
+				/** @var array{handles?: class-string, method?: string} $tagAttributes */
+				$tagAttributes = $tag->getAttributes();
+
+				if (isset($tagAttributes['handles'])) {
+					$handles = [$tagAttributes['handles'] => ['method' => $tagAttributes['method'] ?? self::DEFAULT_HANDLER_METHOD]];
+				} else {
+					$handles = $this->guessHandledMessages($reflectionClass);
+				}
+
+				foreach ($handles as $messageClassName => $options) {
+					$methodName = $options['method'] ?? self::DEFAULT_HANDLER_METHOD;
+
+					if (!$reflectionClass->hasNativeMethod($methodName)) {
+						continue;
+					}
+
+					$methodReflection = $reflectionClass->getNativeMethod($methodName);
+
+					foreach ($methodReflection->getVariants() as $variant) {
+						$returnTypesMap[$messageClassName][] = $variant->getReturnType();
+					}
+				}
+			}
+		}
+
+		$messageMap = [];
+		foreach ($returnTypesMap as $messageClassName => $returnTypes) {
+			if (count($returnTypes) !== 1) {
+				continue;
+			}
+
+			$messageMap[$messageClassName] = $returnTypes[0];
+		}
+
+		return new MessageMap($messageMap);
+	}
+
+	/** @return iterable<string, array<string, string>> */
+	private function guessHandledMessages(ClassReflection $reflectionClass): iterable
+	{
+		if ($reflectionClass->implementsInterface(MessageSubscriberInterface::class)) {
+			$className = $reflectionClass->getName();
+
+			foreach ($className::getHandledMessages() as $index => $value) {
+				$containOptions = self::containOptions($index, $value);
+				if ($containOptions === true) {
+					yield $index => $value;
+				} elseif ($containOptions === false) {
+					yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];
+				}
+			}
+
+			return;
+		}
+
+		if (!$reflectionClass->hasNativeMethod(self::DEFAULT_HANDLER_METHOD)) {
+			return;
+		}
+
+		$methodReflection = $reflectionClass->getNativeMethod(self::DEFAULT_HANDLER_METHOD);
+
+		$variants = $methodReflection->getVariants();
+		if (count($variants) !== 1) {
+			return;
+		}
+
+		$parameters = $variants[0]->getParameters();
+
+		if (count($parameters) !== 1) {
+			return;
+		}
+
+		$classNames = $parameters[0]->getType()->getObjectClassNames();
+
+		if (count($classNames) !== 1) {
+			return;
+		}
+
+		yield $classNames[0] => ['method' => self::DEFAULT_HANDLER_METHOD];
+	}
+
+	/**
+	 * @param mixed $index
+	 * @param mixed $value
+	 * @phpstan-assert-if-true =class-string $index
+	 * @phpstan-assert-if-true =array<string, mixed> $value
+	 * @phpstan-assert-if-false =int $index
+	 * @phpstan-assert-if-false =class-string $value
+	 */
+	private static function containOptions($index, $value): ?bool
+	{
+		if (is_string($index) && class_exists($index) && is_array($value)) {
+			return true;
+		} elseif (is_int($index) && is_string($value) && class_exists($value)) {
+			return false;
+		}
+
+		return null;
+	}
+
+}
diff --git a/src/Symfony/Service.php b/src/Symfony/Service.php
index c31324f5..1cc465ac 100644
--- a/src/Symfony/Service.php
+++ b/src/Symfony/Service.php
@@ -20,12 +20,17 @@ final class Service implements ServiceDefinition
 	/** @var string|null */
 	private $alias;
 
+	/** @var ServiceTag[] */
+	private $tags;
+
+	/** @param ServiceTag[] $tags */
 	public function __construct(
 		string $id,
 		?string $class,
 		bool $public,
 		bool $synthetic,
-		?string $alias
+		?string $alias,
+		array $tags = []
 	)
 	{
 		$this->id = $id;
@@ -33,6 +38,7 @@ public function __construct(
 		$this->public = $public;
 		$this->synthetic = $synthetic;
 		$this->alias = $alias;
+		$this->tags = $tags;
 	}
 
 	public function getId(): string
@@ -60,4 +66,9 @@ public function getAlias(): ?string
 		return $this->alias;
 	}
 
+	public function getTags(): array
+	{
+		return $this->tags;
+	}
+
 }
diff --git a/src/Symfony/ServiceDefinition.php b/src/Symfony/ServiceDefinition.php
index 6df34cba..3862fa8d 100644
--- a/src/Symfony/ServiceDefinition.php
+++ b/src/Symfony/ServiceDefinition.php
@@ -18,4 +18,7 @@ public function isSynthetic(): bool;
 
 	public function getAlias(): ?string;
 
+	/** @return ServiceTag[] */
+	public function getTags(): array;
+
 }
diff --git a/src/Symfony/ServiceTag.php b/src/Symfony/ServiceTag.php
new file mode 100644
index 00000000..a8437fd1
--- /dev/null
+++ b/src/Symfony/ServiceTag.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Symfony;
+
+final class ServiceTag implements ServiceTagDefinition
+{
+
+	/** @var string */
+	private $name;
+
+	/** @var array<string, string> */
+	private $attributes;
+
+	/** @param array<string, string> $attributes */
+	public function __construct(string $name, array $attributes = [])
+	{
+		$this->name = $name;
+		$this->attributes = $attributes;
+	}
+
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	public function getAttributes(): array
+	{
+		return $this->attributes;
+	}
+
+}
diff --git a/src/Symfony/ServiceTagDefinition.php b/src/Symfony/ServiceTagDefinition.php
new file mode 100644
index 00000000..b0f66d9c
--- /dev/null
+++ b/src/Symfony/ServiceTagDefinition.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Symfony;
+
+interface ServiceTagDefinition
+{
+
+	public function getName(): string;
+
+	/** @return array<string, string> */
+	public function getAttributes(): array;
+
+}
diff --git a/src/Symfony/XmlServiceMapFactory.php b/src/Symfony/XmlServiceMapFactory.php
index 1cae5d97..0c44207e 100644
--- a/src/Symfony/XmlServiceMapFactory.php
+++ b/src/Symfony/XmlServiceMapFactory.php
@@ -47,12 +47,22 @@ public function create(): ServiceMap
 				continue;
 			}
 
+			$serviceTags = [];
+			foreach ($def->tag as $tag) {
+				$tagAttrs = ((array) $tag->attributes())['@attributes'] ?? [];
+				$tagName = $tagAttrs['name'];
+				unset($tagAttrs['name']);
+
+				$serviceTags[] = new ServiceTag($tagName, $tagAttrs);
+			}
+
 			$service = new Service(
 				$this->cleanServiceId((string) $attrs->id),
 				isset($attrs->class) ? (string) $attrs->class : null,
 				isset($attrs->public) && (string) $attrs->public === 'true',
 				isset($attrs->synthetic) && (string) $attrs->synthetic === 'true',
-				isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null
+				isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null,
+				$serviceTags
 			);
 
 			if ($service->getAlias() !== null) {
diff --git a/src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php b/src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php
new file mode 100644
index 00000000..a5dce362
--- /dev/null
+++ b/src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php
@@ -0,0 +1,91 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Symfony;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Identifier;
+use PHPStan\Analyser\Scope;
+use PHPStan\Symfony\MessageMap;
+use PHPStan\Symfony\MessageMapFactory;
+use PHPStan\Type\ExpressionTypeResolverExtension;
+use PHPStan\Type\Type;
+use function count;
+use function is_null;
+
+final class MessengerHandleTraitReturnTypeExtension implements ExpressionTypeResolverExtension
+{
+
+	private const TRAIT_NAME = 'Symfony\Component\Messenger\HandleTrait';
+	private const TRAIT_METHOD_NAME = 'handle';
+
+	/** @var MessageMapFactory */
+	private $messageMapFactory;
+
+	/** @var MessageMap|null */
+	private $messageMap;
+
+	public function __construct(MessageMapFactory $symfonyMessageMapFactory)
+	{
+		$this->messageMapFactory = $symfonyMessageMapFactory;
+	}
+
+	public function getType(Expr $expr, Scope $scope): ?Type
+	{
+		if ($this->isSupported($expr, $scope)) {
+			$args = $expr->getArgs();
+			if (count($args) !== 1) {
+				return null;
+			}
+
+			$arg = $args[0]->value;
+			$argClassNames = $scope->getType($arg)->getObjectClassNames();
+
+			if (count($argClassNames) === 1) {
+				$messageMap = $this->getMessageMap();
+				$returnType = $messageMap->getTypeForClass($argClassNames[0]);
+
+				if (!is_null($returnType)) {
+					return $returnType;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	private function getMessageMap(): MessageMap
+	{
+		if ($this->messageMap === null) {
+			$this->messageMap = $this->messageMapFactory->create();
+		}
+
+		return $this->messageMap;
+	}
+
+	/**
+	 * @phpstan-assert-if-true =MethodCall $expr
+	 */
+	private function isSupported(Expr $expr, Scope $scope): bool
+	{
+		if (!($expr instanceof MethodCall) || !($expr->name instanceof Identifier) || $expr->name->name !== self::TRAIT_METHOD_NAME) {
+			return false;
+		}
+
+		if (!$scope->isInClass()) {
+			return false;
+		}
+
+		$reflectionClass = $scope->getClassReflection()->getNativeReflection();
+
+		if (!$reflectionClass->hasMethod(self::TRAIT_METHOD_NAME)) {
+			return false;
+		}
+
+		$methodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);
+		$declaringClassReflection = $methodReflection->getBetterReflection()->getDeclaringClass();
+
+		return $declaringClassReflection->getName() === self::TRAIT_NAME;
+	}
+
+}
diff --git a/tests/Type/Symfony/ExtensionTest.php b/tests/Type/Symfony/ExtensionTest.php
index a076caac..40420be0 100644
--- a/tests/Type/Symfony/ExtensionTest.php
+++ b/tests/Type/Symfony/ExtensionTest.php
@@ -14,6 +14,7 @@ class ExtensionTest extends TypeInferenceTestCase
 	/** @return mixed[] */
 	public function dataFileAsserts(): iterable
 	{
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/messenger_handle_trait.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/envelope_all.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/header_bag_get.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/response_header_bag_get_cookies.php');
diff --git a/tests/Type/Symfony/container.xml b/tests/Type/Symfony/container.xml
index 224c72db..16d4b7fe 100644
--- a/tests/Type/Symfony/container.xml
+++ b/tests/Type/Symfony/container.xml
@@ -354,5 +354,23 @@
         <service id="parameterised_foo" class="%app.class%"></service>
         <service id="parameterised_bar" class="%app.class%\Bar"></service>
         <service id="synthetic" class="Synthetic" public="true" synthetic="true" />
+        <service id="regular_query_handler" class="MessengerHandleTrait\RegularQueryHandler">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="multi_query_handler" class="MessengerHandleTrait\MultiQueryHandler">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="tagged_handler" class="MessengerHandleTrait\TaggedHandler">
+            <tag name="messenger.message_handler" handles="MessengerHandleTrait\TaggedQuery" method="handle"/>
+        </service>
+        <service id="multi_handles_for_in_the_same_handler" class="MessengerHandleTrait\MultiHandlesForInTheSameHandler">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="multi_handlers_for_the_same_message_handler_1" class="MessengerHandleTrait\MultiHandlersForTheSameMessageHandler1">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="multi_handlers_for_the_same_message_handler_2" class="MessengerHandleTrait\MultiHandlersForTheSameMessageHandler2">
+            <tag name="messenger.message_handler"/>
+        </service>
     </services>
 </container>
diff --git a/tests/Type/Symfony/data/messenger_handle_trait.php b/tests/Type/Symfony/data/messenger_handle_trait.php
new file mode 100644
index 00000000..7a86d482
--- /dev/null
+++ b/tests/Type/Symfony/data/messenger_handle_trait.php
@@ -0,0 +1,113 @@
+<?php declare(strict_types = 1);
+
+namespace MessengerHandleTrait;
+
+use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
+use Symfony\Component\Messenger\HandleTrait;
+use function PHPStan\Testing\assertType;
+
+class RegularQuery {}
+class RegularQueryResult {}
+class RegularQueryHandler
+{
+    public function __invoke(RegularQuery $query): RegularQueryResult
+    {
+        return new RegularQueryResult();
+    }
+}
+
+class BooleanQuery {}
+class StringQuery {}
+class IntQuery {}
+class FloatQuery {}
+class MultiQueryHandler implements MessageSubscriberInterface
+{
+    public static function getHandledMessages(): iterable
+    {
+        yield BooleanQuery::class;
+        yield IntQuery::class => ['method' => 'handleInt'];
+        yield FloatQuery::class => ['method' => 'handleFloat'];
+        yield StringQuery::class => ['method' => 'handleString'];
+    }
+
+    public function __invoke(BooleanQuery $query): bool
+    {
+        return true;
+    }
+
+    public function handleInt(IntQuery $query): int
+    {
+        return 0;
+    }
+
+    public function handleFloat(FloatQuery $query): float
+    {
+        return 0.0;
+    }
+
+    public function handleString(StringQuery $query): string
+    {
+        return 'string result';
+    }
+}
+
+class TaggedQuery {}
+class TaggedResult {}
+class TaggedHandler
+{
+    public function handle(TaggedQuery $query): TaggedResult
+    {
+        return new TaggedResult();
+    }
+}
+
+class MultiHandlesForInTheSameHandlerQuery {}
+class MultiHandlesForInTheSameHandler implements MessageSubscriberInterface
+{
+    public static function getHandledMessages(): iterable
+    {
+        yield MultiHandlesForInTheSameHandlerQuery::class;
+        yield MultiHandlesForInTheSameHandlerQuery::class => ['priority' => '0'];
+    }
+
+    public function __invoke(MultiHandlesForInTheSameHandlerQuery $query): bool
+    {
+        return true;
+    }
+}
+
+class MultiHandlersForTheSameMessageQuery {}
+class MultiHandlersForTheSameMessageHandler1
+{
+    public function __invoke(MultiHandlersForTheSameMessageQuery $query): bool
+    {
+        return true;
+    }
+}
+class MultiHandlersForTheSameMessageHandler2
+{
+    public function __invoke(MultiHandlersForTheSameMessageQuery $query): bool
+    {
+        return false;
+    }
+}
+
+class HandleTraitClass {
+    use HandleTrait;
+
+    public function __invoke()
+    {
+        assertType(RegularQueryResult::class, $this->handle(new RegularQuery()));
+
+        assertType('bool', $this->handle(new BooleanQuery()));
+        assertType('int', $this->handle(new IntQuery()));
+        assertType('float', $this->handle(new FloatQuery()));
+        assertType('string', $this->handle(new StringQuery()));
+
+        assertType(TaggedResult::class, $this->handle(new TaggedQuery()));
+
+        // HandleTrait will throw exception in fact due to multiple handle methods/handlers per single query
+        assertType('mixed', $this->handle(new MultiHandlesForInTheSameHandlerQuery()));
+        assertType('mixed', $this->handle(new MultiHandlersForTheSameMessageQuery()));
+    }
+}

From 08b97ab6621a57d6bbb8add1a358c5bf25cd98df Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Wed, 19 Mar 2025 12:54:42 +0100
Subject: [PATCH 19/20] Synchronize the EventSubscriberInterface with the
 upstream type

As of Symfony 5.4, Symfony ships a precise type for this interface but the stub overrides it.
---
 .../Component/EventDispatcher/EventSubscriberInterface.stub     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/Symfony/Component/EventDispatcher/EventSubscriberInterface.stub b/stubs/Symfony/Component/EventDispatcher/EventSubscriberInterface.stub
index 35a77c93..62474d10 100644
--- a/stubs/Symfony/Component/EventDispatcher/EventSubscriberInterface.stub
+++ b/stubs/Symfony/Component/EventDispatcher/EventSubscriberInterface.stub
@@ -5,7 +5,7 @@ namespace Symfony\Component\EventDispatcher;
 interface EventSubscriberInterface
 {
     /**
-     * @return array<string, string|array<string, int>|array<int, string|array<string, int>|array<int, string>>>
+     * @return array<string, string|array{0: string, 1: int}|list<array{0: string, 1?: int}>>
      */
     public static function getSubscribedEvents();
 }

From 78b6b5a62f56731d938031c8f59817ed83b2328a Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Wed, 19 Mar 2025 18:31:11 +0100
Subject: [PATCH 20/20] Remove the generic type for PasswordUpgraderInterface

This interface method can be called on a user provider even for user
types not supported by that provider (for instance when using a chain
provider). The implementation is expected to deal with that case
gracefully, which will be enforced by phpstan when the generics are
gone.
---
 extension.neon                                |  5 ---
 ...ordAuthenticatedUserStubFilesExtension.php | 36 -------------------
 .../PasswordAuthenticatedUserInterface.stub   |  7 ----
 .../Core/User/PasswordUpgraderInterface.stub  | 14 --------
 4 files changed, 62 deletions(-)
 delete mode 100644 src/Symfony/PasswordAuthenticatedUserStubFilesExtension.php
 delete mode 100644 stubs/Symfony/Component/Security/Core/User/PasswordAuthenticatedUserInterface.stub
 delete mode 100644 stubs/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.stub

diff --git a/extension.neon b/extension.neon
index cbdfd73d..a38fd4bf 100644
--- a/extension.neon
+++ b/extension.neon
@@ -22,7 +22,6 @@ parameters:
 			- Symfony\Component\Form\FormTypeInterface
 			- Symfony\Component\OptionsResolver\Options
 			- Symfony\Component\Security\Core\Authorization\Voter\Voter
-			- Symfony\Component\Security\Core\User\PasswordUpgraderInterface
 	stubFiles:
 		- stubs/Psr/Cache/CacheException.stub
 		- stubs/Psr/Cache/CacheItemInterface.stub
@@ -333,10 +332,6 @@ services:
 		class: PHPStan\Symfony\InputBagStubFilesExtension
 		tags:
 			- phpstan.stubFilesExtension
-	-
-		class: PHPStan\Symfony\PasswordAuthenticatedUserStubFilesExtension
-		tags:
-			- phpstan.stubFilesExtension
 	-
 		class: PHPStan\Symfony\SymfonyDiagnoseExtension
 		tags:
diff --git a/src/Symfony/PasswordAuthenticatedUserStubFilesExtension.php b/src/Symfony/PasswordAuthenticatedUserStubFilesExtension.php
deleted file mode 100644
index 8f8c4782..00000000
--- a/src/Symfony/PasswordAuthenticatedUserStubFilesExtension.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace PHPStan\Symfony;
-
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
-use PHPStan\BetterReflection\Reflector\Reflector;
-use PHPStan\PhpDoc\StubFilesExtension;
-
-class PasswordAuthenticatedUserStubFilesExtension implements StubFilesExtension
-{
-
-	/** @var Reflector */
-	private $reflector;
-
-	public function __construct(
-		Reflector $reflector
-	)
-	{
-		$this->reflector = $reflector;
-	}
-
-	public function getFiles(): array
-	{
-		try {
-			$this->reflector->reflectClass('Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface');
-		} catch (IdentifierNotFound $e) {
-			return [];
-		}
-
-		return [
-			__DIR__ . '/../../stubs/Symfony/Component/Security/Core/User/PasswordAuthenticatedUserInterface.stub',
-			__DIR__ . '/../../stubs/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.stub',
-		];
-	}
-
-}
diff --git a/stubs/Symfony/Component/Security/Core/User/PasswordAuthenticatedUserInterface.stub b/stubs/Symfony/Component/Security/Core/User/PasswordAuthenticatedUserInterface.stub
deleted file mode 100644
index 19cc6040..00000000
--- a/stubs/Symfony/Component/Security/Core/User/PasswordAuthenticatedUserInterface.stub
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Symfony\Component\Security\Core\User;
-
-interface PasswordAuthenticatedUserInterface
-{
-}
diff --git a/stubs/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.stub b/stubs/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.stub
deleted file mode 100644
index c73afc55..00000000
--- a/stubs/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.stub
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Symfony\Component\Security\Core\User;
-
-/**
- * @template TUser of PasswordAuthenticatedUserInterface
- */
-interface PasswordUpgraderInterface
-{
-	/**
-	 * @param TUser $user
-	 */
-	public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void;
-}