[Messenger] fix support for abstract handlers

timiTao · nicolas-grekas · commit 51f0dc66fe28 · 2019-07-30T21:14:22.000+02:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -77,7 +77,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                     throw new RuntimeException(sprintf('Invalid handler service "%s": bus "%s" specified on the tag "%s" does not exist (known ones are: %s).', $serviceId, $tag['bus'], $this->handlerTag, implode(', ', $busIds)));
                 }
 
-                $className = $container->getDefinition($serviceId)->getClass();
+                $className = $this->getServiceClass($container, $serviceId);
                 $r = $container->getReflectionClass($className);
 
                 if (null === $r) {
@@ -227,7 +227,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
         $receiverMapping = [];
 
         foreach ($container->findTaggedServiceIds($this->receiverTag) as $id => $tags) {
-            $receiverClass = $container->findDefinition($id)->getClass();
+            $receiverClass = $this->getServiceClass($container, $id);
             if (!is_subclass_of($receiverClass, ReceiverInterface::class)) {
                 throw new RuntimeException(sprintf('Invalid receiver "%s": class "%s" must implement interface "%s".', $id, $receiverClass, ReceiverInterface::class));
             }
@@ -318,4 +318,19 @@ private function registerBusMiddleware(ContainerBuilder $container, string $busI
 
         $container->getDefinition($busId)->replaceArgument(0, new IteratorArgument($middlewareReferences));
     }
+
+    private function getServiceClass(ContainerBuilder $container, string $serviceId)
+    {
+        while (true) {
+            $definition = $container->findDefinition($serviceId);
+
+            if (!$definition->getClass() && $definition instanceof ChildDefinition) {
+                $serviceId = $definition->getParent();
+
+                continue;
+            }
+
+            return $definition->getClass();
+        }
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Messenger\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -208,6 +209,34 @@ public function testGetClassesAndMethodsAndPrioritiesFromTheSubscriber()
         $this->assertSame(PrioritizedHandler::class, $secondHandlerDefinition->getClass());
     }
 
+    public function testRegisterAbstractHandler()
+    {
+        $container = $this->getContainerBuilder($messageBusId = 'message_bus');
+        $container->register($messageBusId, MessageBusInterface::class)->addTag('messenger.bus')->setArgument(0, []);
+
+        $container
+            ->register(DummyHandler::class, DummyHandler::class)
+            ->setAbstract(true);
+
+        $container
+            ->setDefinition($abstractDirectChildId = 'direct_child', new ChildDefinition(DummyHandler::class))
+            ->setAbstract(true);
+
+        $container
+            ->setDefinition($abstractHandlerId = 'child', new ChildDefinition($abstractDirectChildId))
+            ->addTag('messenger.message_handler');
+
+        (new MessengerPass())->process($container);
+
+        $messageHandlerMapping = $container->getDefinition($messageBusId.'.messenger.handlers_locator')->getArgument(0);
+        $this->assertHandlerDescriptor(
+            $container,
+            $messageHandlerMapping,
+            DummyMessage::class,
+            [$abstractHandlerId]
+        );
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      * @expectedExceptionMessage Invalid service "NonExistentHandlerClass": class "NonExistentHandlerClass" does not exist.
