Just use Closure::fromCallable, we don't need the wrapper actually. Nice one.

sroze · sroze · commit f711250fc621 · 2018-05-08T16:25:57.000+01:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -22,7 +22,6 @@
 use Symfony\Component\Messenger\Handler\ChainHandler;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
-use Symfony\Component\Messenger\Handler\MethodOnObjectHandler;
 use Symfony\Component\Messenger\TraceableMessageBus;
 
 /**
@@ -117,9 +116,9 @@ private function registerHandlers(ContainerBuilder $container)
                     }
 
                     if ('__invoke' !== $method) {
-                        $wrapperDefinition = (new Definition(MethodOnObjectHandler::class))->setArguments(array(new Reference($serviceId), $method));
+                        $wrapperDefinition = (new Definition('callable'))->addArgument(array(new Reference($serviceId), $method))->setFactory('Closure::fromCallable');
 
-                        $definitions[$serviceId = '.messenger.method_on_object_handler.'.ContainerBuilder::hash($messageClass.':'.$messagePriority.':'.$serviceId.':'.$method)] = $wrapperDefinition;
+                        $definitions[$serviceId = '.messenger.method_on_object_wrapper.'.ContainerBuilder::hash($messageClass.':'.$messagePriority.':'.$serviceId.':'.$method)] = $wrapperDefinition;
                     }
 
                     $handlersByMessage[$messageClass][$messagePriority][] = new Reference($serviceId);
diff --git a/src/Symfony/Component/Messenger/Handler/MethodOnObjectHandler.php b/src/Symfony/Component/Messenger/Handler/MethodOnObjectHandler.php
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Messenger\DependencyInjection\MessengerPass;
 use Symfony\Component\Messenger\Handler\ChainHandler;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
-use Symfony\Component\Messenger\Handler\MethodOnObjectHandler;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\AllowNoHandlerMiddleware;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
@@ -119,9 +118,9 @@ public function testGetClassesAndMethodsAndPrioritiesFromTheSubscriber()
 
         $dummyHandlerReference = (string) $handlerMapping['handler.'.DummyMessage::class]->getValues()[0];
         $dummyHandlerDefinition = $container->getDefinition($dummyHandlerReference);
-        $this->assertSame(MethodOnObjectHandler::class, $dummyHandlerDefinition->getClass());
-        $this->assertEquals(new Reference(HandlerMappingMethods::class), $dummyHandlerDefinition->getArgument(0));
-        $this->assertSame('dummyMethod', $dummyHandlerDefinition->getArgument(1));
+        $this->assertSame('callable', $dummyHandlerDefinition->getClass());
+        $this->assertEquals(array(new Reference(HandlerMappingMethods::class), 'dummyMethod'), $dummyHandlerDefinition->getArgument(0));
+        $this->assertSame(array('Closure', 'fromCallable'), $dummyHandlerDefinition->getFactory());
 
         $secondHandlerReference = (string) $handlerMapping['handler.'.SecondMessage::class]->getValues()[0];
         $secondHandlerDefinition = $container->getDefinition($secondHandlerReference);
