Merge 3c5571f into b1eb4d9

prooph · May 2, 2018 · 5e4b335 · 5e4b335
2 parents b1eb4d9 + 3c5571f
commit 5e4b335
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 1 deletion.
diff --git a/src/DependencyInjection/Compiler/RoutePass.php b/src/DependencyInjection/Compiler/RoutePass.php
@@ -18,6 +18,9 @@ class RoutePass implements CompilerPassInterface
 {
     private static function detectMessageName(ReflectionClass $messageReflection): ?string
     {
+        if (! $messageReflection->implementsInterface(HasMessageName::class)) {
+            return $messageReflection->getName();
+        }
         $instance = $messageReflection->newInstanceWithoutConstructor(); /* @var $instance HasMessageName */
         if ($messageReflection->hasMethod('init')) {
             $init = $messageReflection->getMethod('init');
@@ -111,7 +114,8 @@ private function recognizeMessageNames(
             function (ReflectionMethod $method) {
                 return ($method->getNumberOfRequiredParameters() === 1 || $method->getNumberOfRequiredParameters() === 2)
                     && $method->getParameters()[0]->getClass()
-                    && $method->getParameters()[0]->getClass()->implementsInterface(HasMessageName::class)
+                    && ($method->getParameters()[0]->getClass()->implementsInterface(HasMessageName::class)
+                        || $method->getName() === '__invoke')
                     && ! ($method->getParameters()[0]->getClass()->isInterface()
                         || $method->getParameters()[0]->getClass()->isAbstract()
                         || $method->getParameters()[0]->getClass()->isTrait());

diff --git a/test/DependencyInjection/AbstractServiceBusExtensionTestCase.php b/test/DependencyInjection/AbstractServiceBusExtensionTestCase.php
@@ -31,8 +31,10 @@
 use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\AcmeRegisterUserCommand;
 use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\AcmeRegisterUserHandler;
 use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\AcmeUserWasRegisteredEvent;
+use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandHandlerForPopoCommand;
 use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandWithPrivateConstructor;
 use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\MockPlugin;
+use ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\PopoCommand;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
@@ -357,6 +359,25 @@ public function it_adds_command_bus_routes_based_on_tags_with_automatic_message_
         $commandBus->dispatch(CommandWithPrivateConstructor::create());
     }
 
+    /**
+     * @test
+     */
+    public function it_supports_automatic_message_detection_with_popo_messages_and_invokable_handlers()
+    {
+        $container = $this->loadContainer('command_bus_with_tags', new PluginsPass(), new RoutePass());
+
+        /* @var $commandBus CommandBus */
+        $commandBus = $container->get('prooph_service_bus.main_command_bus');
+
+        /** @var CommandHandlerForPopoCommand $mockHandler */
+        $mockHandler = $container->get(CommandHandlerForPopoCommand::class);
+        $command = new PopoCommand();
+
+        $commandBus->dispatch($command);
+
+        self::assertSame($command, $mockHandler->lastCommand);
+    }
+
     /**
      * @test
      */

diff --git a/test/DependencyInjection/Fixture/Model/CommandHandlerForPopoCommand.php b/test/DependencyInjection/Fixture/Model/CommandHandlerForPopoCommand.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model;
+
+final class CommandHandlerForPopoCommand
+{
+    /** @var PopoCommand|null */
+    public $lastCommand;
+
+    public function __invoke(PopoCommand $command)
+    {
+        $this->lastCommand = $command;
+    }
+}
diff --git a/test/DependencyInjection/Fixture/Model/PopoCommand.php b/test/DependencyInjection/Fixture/Model/PopoCommand.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model;
+
+final class PopoCommand
+{
+}
diff --git a/test/DependencyInjection/Fixture/config/xml/command_bus_with_tags.xml b/test/DependencyInjection/Fixture/config/xml/command_bus_with_tags.xml
@@ -22,5 +22,8 @@
         <srv:service id="ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandHandlerForCommandWithPrivateConstructor">
             <srv:tag name="prooph_service_bus.main_command_bus.route_target" message_detection="true" />
         </srv:service>
+        <srv:service id="ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandHandlerForPopoCommand" public="true">
+            <srv:tag name="prooph_service_bus.main_command_bus.route_target" message_detection="true" />
+        </srv:service>
     </srv:services>
 </srv:container>
diff --git a/test/DependencyInjection/Fixture/config/yml/command_bus_with_tags.yml b/test/DependencyInjection/Fixture/config/yml/command_bus_with_tags.yml
@@ -19,3 +19,8 @@ services:
   ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandHandlerForCommandWithPrivateConstructor:
     tags:
       - { name: 'prooph_service_bus.main_command_bus.route_target', message_detection: true }
+
+  ProophTest\Bundle\ServiceBus\DependencyInjection\Fixture\Model\CommandHandlerForPopoCommand:
+    public: true
+    tags:
+      - { name: 'prooph_service_bus.main_command_bus.route_target', message_detection: true }