Tweak event handler

daikon-cqrs · Jul 13, 2020 · 0f101bd · 0f101bd
1 parent f4057f4
commit 0f101bd
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 35 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Projection/EventHandlerTrait.php b/src/Projection/EventHandlerTrait.php
@@ -15,18 +15,18 @@
 trait EventHandlerTrait
 {
     /** @return static */
-    public function applyEvent(DomainEventInterface $event): ProjectionInterface
+    public function applyEvent(DomainEventInterface $event): self
     {
-        return $this->invokeEventHandler($event);
+        $projection = clone $this;
+        return $projection->invokeEventHandler($event);
     }
 
     /** @return static */
-    protected function invokeEventHandler(DomainEventInterface $event): ProjectionInterface
+    protected function invokeEventHandler(DomainEventInterface $event): self
     {
         $handlerName = (new ReflectionClass($event))->getShortName();
         $handlerMethod = 'when'.ucfirst($handlerName);
-        $projection = clone $this;
-        $handler = [$projection, $handlerMethod];
+        $handler = [$this, $handlerMethod];
         if (!is_callable($handler)) {
             throw new RuntimeException(
                 sprintf("Handler '%s' is not callable on '%s'.", $handlerMethod, static::class)