Merge branch '6.1' into 6.2

* 6.1:
  execute tests with the full range of supported Messenger component releases

Author: xabbuh

DependencyInjection/FrameworkExtension.php

@@ -116,6 +116,7 @@
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
+use Symfony\Component\Messenger\Stamp\SerializedMessageStamp;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -664,18 +665,30 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerAttributeForAutoconfiguration(AsController::class, static function (ChildDefinition $definition, AsController $attribute): void {
             $definition->addTag('controller.service_arguments');
         });
-        $container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute, \ReflectionClass|\ReflectionMethod $reflector): void {
-            $tagAttributes = get_object_vars($attribute);
-            $tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
-            unset($tagAttributes['fromTransport']);
-            if ($reflector instanceof \ReflectionMethod) {
-                if (isset($tagAttributes['method'])) {
-                    throw new LogicException(sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+
+        if (class_exists(SerializedMessageStamp::class)) {
+            // symfony/messenger >= 6.1
+            $container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute, \ReflectionClass|\ReflectionMethod $reflector): void {
+                $tagAttributes = get_object_vars($attribute);
+                $tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
+                unset($tagAttributes['fromTransport']);
+                if ($reflector instanceof \ReflectionMethod) {
+                    if (isset($tagAttributes['method'])) {
+                        throw new LogicException(sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+                    }
+                    $tagAttributes['method'] = $reflector->getName();
                 }
-                $tagAttributes['method'] = $reflector->getName();
-            }
-            $definition->addTag('messenger.message_handler', $tagAttributes);
-        });
+                $definition->addTag('messenger.message_handler', $tagAttributes);
+            });
+        } else {
+            // symfony/messenger < 6.1
+            $container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute): void {
+                $tagAttributes = get_object_vars($attribute);
+                $tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
+                unset($tagAttributes['fromTransport']);
+                $definition->addTag('messenger.message_handler', $tagAttributes);
+            });
+        }
 
         if (!$container->getParameter('kernel.debug')) {
             // remove tagged iterator argument for resource checkers

composer.json

@@ -48,7 +48,7 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/lock": "^5.4|^6.0",
         "symfony/mailer": "^5.4|^6.0",
-        "symfony/messenger": "^6.1",
+        "symfony/messenger": "^5.4|^6.0",
         "symfony/mime": "^5.4|^6.0",
         "symfony/notifier": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",