Test Symfony 7.3

composer.json

@@ -27,15 +27,15 @@
     "phpstan/phpstan-strict-rules": "^1.5.1",
     "phpunit/phpunit": "^8.5.29 || ^9.5",
     "psr/container": "1.0 || 1.1.1",
-    "symfony/config": "^5.4 || ^6.1",
-    "symfony/console": "^5.4 || ^6.1",
-    "symfony/dependency-injection": "^5.4 || ^6.1",
-    "symfony/form": "^5.4 || ^6.1",
-    "symfony/framework-bundle": "^5.4 || ^6.1",
-    "symfony/http-foundation": "^5.4 || ^6.1",
-    "symfony/messenger": "^5.4",
+    "symfony/config": "^5.4 || ^6.1 || ^7.3",
+    "symfony/console": "^5.4 || ^6.1 || ^7.3",
+    "symfony/dependency-injection": "^5.4 || ^6.1 || ^7.3",
+    "symfony/form": "^5.4 || ^6.1 || ^7.3",
+    "symfony/framework-bundle": "^5.4 || ^6.1 || ^7.3",
+    "symfony/http-foundation": "^5.4 || ^6.1 || ^7.3",
+    "symfony/messenger": "^5.4 || ^6.4 || ^7.3",
     "symfony/polyfill-php80": "^1.24",
-    "symfony/serializer": "^5.4",
+    "symfony/serializer": "^5.4 || ^6.4 || ^7.3",
     "symfony/service-contracts": "^2.2.0"
   },
   "config": {

src/Symfony/MessageMapFactory.php

@@ -4,7 +4,6 @@
 
 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;
@@ -91,7 +90,7 @@ public function create(): MessageMap
 	/** @return iterable<string, array<string, string>> */
 	private function guessHandledMessages(ClassReflection $reflectionClass): iterable
 	{
-		if ($reflectionClass->implementsInterface(MessageSubscriberInterface::class)) {
+		if ($reflectionClass->implementsInterface('Symfony\\Component\\Messenger\\Handler\\MessageSubscriberInterface')) {
 			$className = $reflectionClass->getName();
 
 			foreach ($className::getHandledMessages() as $index => $value) {

tests/Type/Symfony/ExtensionTest.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Symfony;
 
 use PHPStan\Testing\TypeInferenceTestCase;
+use ReflectionClass;
 use ReflectionMethod;
 use Symfony\Component\HttpFoundation\Request;
 use function class_exists;
@@ -46,6 +47,11 @@ public function dataFileAsserts(): iterable
 
 		if (class_exists('Symfony\Bundle\FrameworkBundle\Controller\AbstractController')) {
 			yield from $this->gatherAssertTypes(__DIR__ . '/data/ExampleAbstractController.php');
+
+			$ref = new ReflectionClass('Symfony\Bundle\FrameworkBundle\Controller\AbstractController');
+			if ($ref->hasMethod('get')) {
+				yield from $this->gatherAssertTypes(__DIR__ . '/data/ExampleAbstractControllerServices.php');
+			}
 		}
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/serializer.php');

tests/Type/Symfony/data/ExampleAbstractController.php

@@ -10,23 +10,6 @@
 final class ExampleAbstractController extends AbstractController
 {
 
-	public function services(): void
-	{
-		assertType('Foo', $this->get('foo'));
-		assertType('Foo', $this->get('parameterised_foo'));
-		assertType('Foo\Bar', $this->get('parameterised_bar'));
-		assertType('Synthetic', $this->get('synthetic'));
-		assertType('object', $this->get('bar'));
-		assertType('object', $this->get(doFoo()));
-		assertType('object', $this->get());
-
-		assertType('true', $this->has('foo'));
-		assertType('true', $this->has('synthetic'));
-		assertType('false', $this->has('bar'));
-		assertType('bool', $this->has(doFoo()));
-		assertType('bool', $this->has());
-	}
-
 	public function parameters(ContainerInterface $container, ParameterBagInterface $parameterBag): void
 	{
 		assertType('array|bool|float|int|string|null', $container->getParameter('unknown'));

tests/Type/Symfony/data/ExampleAbstractControllerServices.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use function PHPStan\Testing\assertType;
+
+final class ExampleAbstractControllerServices extends AbstractController
+{
+
+	public function services(): void
+	{
+		assertType('Foo', $this->get('foo'));
+		assertType('Foo', $this->get('parameterised_foo'));
+		assertType('Foo\Bar', $this->get('parameterised_bar'));
+		assertType('Synthetic', $this->get('synthetic'));
+		assertType('object', $this->get('bar'));
+		assertType('object', $this->get(doFoo()));
+		assertType('object', $this->get());
+
+		assertType('true', $this->has('foo'));
+		assertType('true', $this->has('synthetic'));
+		assertType('false', $this->has('bar'));
+		assertType('bool', $this->has(doFoo()));
+		assertType('bool', $this->has());
+	}
+
+}