update handle command strategy

src/Plugin/InvokeStrategy/HandleCommandStrategy.php

@@ -11,6 +11,8 @@
 
 namespace Prooph\ServiceBus\Plugin\InvokeStrategy;
 
+use Prooph\Common\Messaging\HasMessageName;
+
 /**
  * Class HandleCommandStrategy
  *
@@ -27,7 +29,9 @@ class HandleCommandStrategy extends AbstractInvokeStrategy
      */
     public function canInvoke($handler, $message)
     {
-        return method_exists($handler, 'handle');
+        $handleMethod = 'handle' . $this->determineCommandName($message);
+
+        return method_exists($handler, $handleMethod) || method_exists($handler, 'handle');
     }
 
     /**
@@ -36,6 +40,22 @@ public function canInvoke($handler, $message)
      */
     public function invoke($handler, $message)
     {
-        $handler->handle($message);
+        $handleMethod = 'handle' . $this->determineCommandName($message);
+
+        if (method_exists($handler, $handleMethod)) {
+            $handler->{$handleMethod}($message);
+        } else {
+            $handler->handle($message);
+        }
+    }
+
+    /**
+     * @param mixed $message
+     * @return string
+     */
+    protected function determineCommandName($message)
+    {
+        $eventName = ($message instanceof HasMessageName)? $message->messageName() : is_object($message)? get_class($message) : gettype($message);
+        return implode('', array_slice(explode('\\', $eventName), -1));
     }
 }

tests/Mock/CustomMessageCommandHandler.php

@@ -0,0 +1,31 @@
+<?php
+/*
+ * This file is part of the prooph/service-bus.
+ * (c) 2014-2015 prooph software GmbH <contact@prooph.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Date: 08/02/15 - 8:38 PM
+ */
+
+namespace Prooph\ServiceBusTest\Mock;
+
+/**
+ * Class CustomMessageCommandHandler
+ * @package Prooph\ServiceBusTest\Mock
+ */
+final class CustomMessageCommandHandler
+{
+    private $lastMessage;
+
+    public function handleCustomMessage($message)
+    {
+        $this->lastMessage = $message;
+    }
+
+    public function getLastMessage()
+    {
+        return $this->lastMessage;
+    }
+}

tests/Plugin/InvokeStrategy/HandleCommandStrategyTest.php

@@ -13,6 +13,7 @@
 
 use Prooph\ServiceBus\Plugin\InvokeStrategy\HandleCommandStrategy;
 use Prooph\ServiceBusTest\Mock\CustomMessage;
+use Prooph\ServiceBusTest\Mock\CustomMessageCommandHandler;
 use Prooph\ServiceBusTest\Mock\MessageHandler;
 use Prooph\ServiceBusTest\TestCase;
 
@@ -41,4 +42,22 @@ public function it_invokes_the_handle_command_method_of_the_handler()
 
         $this->assertSame($doSomething, $handleCommandHandler->getLastMessage());
     }
+
+    /**
+     * @test
+     */
+    public function it_invokes_the_handle_command_method_of_the_handler_without_command_name()
+    {
+        $handleCommandStrategy = new HandleCommandStrategy();
+
+        $doSomething = new CustomMessage("I am a command");
+
+        $handleCommandHandler = new CustomMessageCommandHandler();
+
+        $this->assertTrue($handleCommandStrategy->canInvoke($handleCommandHandler, $doSomething));
+
+        $handleCommandStrategy->invoke($handleCommandHandler, $doSomething);
+
+        $this->assertSame($doSomething, $handleCommandHandler->getLastMessage());
+    }
 }