Merge pull request #108 from robertlemke/issue-107-oneventstrategy

Resolve #107 - Correctly detect event name in OnEventStrategy

src/Plugin/InvokeStrategy/OnEventStrategy.php

@@ -21,6 +21,8 @@
  */
 class OnEventStrategy extends AbstractInvokeStrategy
 {
+    protected $foo = 'bar';
+
     /**
      * @param mixed $handler
      * @param mixed $message
@@ -50,7 +52,7 @@ public function invoke($handler, $message)
      */
     protected function determineEventName($event)
     {
-        $eventName = ($event instanceof HasMessageName)? $event->messageName() : is_object($event)? get_class($event) : gettype($event);
+        $eventName = ($event instanceof HasMessageName)? $event->messageName() : (is_object($event)? get_class($event) : gettype($event));
         return implode('', array_slice(explode('\\', $eventName), -1));
     }
 }

tests/Mock/CustomMessageWithName.php

@@ -0,0 +1,38 @@
+<?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:35 PM
+ */
+
+namespace ProophTest\ServiceBus\Mock;
+
+use Prooph\Common\Messaging\HasMessageName;
+
+/**
+ * Class CustomMessage
+ * @package ProophTest\ServiceBus\Mock
+ */
+final class CustomMessageWithName implements HasMessageName
+{
+    private $text;
+
+    public function __construct($text)
+    {
+        $this->text = $text;
+    }
+
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    public function messageName()
+    {
+        return 'Prooph\Test\ServiceBus\Mock\CustomMessageWithSomeOtherName';
+    }
+}

tests/Plugin/InvokeStrategy/OnEventStrategyTest.php

@@ -13,6 +13,7 @@
 
 use Prooph\ServiceBus\Plugin\InvokeStrategy\OnEventStrategy;
 use ProophTest\ServiceBus\Mock\CustomMessage;
+use ProophTest\ServiceBus\Mock\CustomMessageWithName;
 use ProophTest\ServiceBus\Mock\MessageHandler;
 use ProophTest\ServiceBus\TestCase;
 
@@ -41,4 +42,20 @@ public function it_invokes_the_on_event_method_of_the_handler()
 
         $this->assertSame($customEvent, $onEventHandler->getLastMessage());
     }
+
+    /**
+     * @test
+     */
+    public function it_determines_the_event_name_from_message_name_call_if_event_has_one()
+    {
+        $onEventStrategy = new OnEventStrategy();
+        $customEvent = new CustomMessageWithName("I am an event with a messageName() method");
+
+        $closure = function ($event) {
+            return $this->determineEventName($event);
+        };
+        $determineEventName = $closure->bindTo($onEventStrategy, $onEventStrategy);
+
+        $this->assertSame('CustomMessageWithSomeOtherName', $determineEventName($customEvent));
+    }
 }