Signed-off-by: Joey Smith <jsmith@webinertia.net>

src/MutableEvent.php → src/Event.php

@@ -16,50 +16,62 @@
 
 use Override;
 
-class MutableEvent implements MutableEventInterface
+class Event implements EventInterface, EventPropagationInterface
 {
+    use EventPropagationTrait;
+
     /**
      * @param array<array-key, mixed>|null $params
      */
     public function __construct(
         private ?string $name = null,
         private ?object $target = null,
-        private ?array $params = null,
+        private array $params = [],
     ) {}
 
+    #[Override]
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
     #[Override]
     public function getName(): string
     {
         return $this->name ?? static::class;
     }
 
     #[Override]
-    public function setName(string $name): void
+    public function setTarget(object $target): void
     {
-        $this->name = $name;
+        $this->target = $target;
     }
-
     #[Override]
     public function getTarget(): ?object
     {
         return $this->target;
     }
 
     #[Override]
-    public function setTarget(object $target): void
+    public function setParam(string $name, mixed $value): void
     {
-        $this->target = $target;
+        $this->params[$name] = $value;
     }
 
     #[Override]
-    public function getParams(): array
+    public function getParam(string $name, mixed $default = null): mixed
     {
-        return $this->params ?? [];
+        return $this->params[$name] ?? $default;
     }
 
     #[Override]
     public function setParams(array $params): void
     {
         $this->params = $params;
     }
+
+    #[Override]
+    public function getParams(): array
+    {
+        return $this->params;
+    }
 }

src/EventDispatcherAwareTrait.php

@@ -14,6 +14,7 @@
 
 namespace Webware\CommandBus\Event;
 
+use Override;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -23,11 +24,13 @@ trait EventDispatcherAwareTrait
 {
     protected EventDispatcherInterface $eventDispatcher;
 
+    #[Override]
     public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): void
     {
         $this->eventDispatcher = $eventDispatcher;
     }
 
+    #[Override]
     public function getEventDispatcher(): EventDispatcherInterface
     {
         return $this->eventDispatcher;

src/EventInterface.php

@@ -16,12 +16,23 @@
 
 interface EventInterface
 {
+    public function setName(string $name): void;
+
     public function getName(): string;
 
     public function getTarget(): ?object;
 
+    public function setTarget(object $target): void;
+
+    public function setParam(string $name, mixed $value): void;
+
+    public function getParam(string $name, mixed $default = null): mixed;
+
+    public function setParams(array $params): void;
+
     /**
-     * @return array<array-key, mixed>|null
+     * @return array<array-key, mixed>
      */
-    public function getParams(): ?array;
+    public function getParams(): array;
+
 }

src/EventPropagationInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webware\CommandBus\Event;
+
+interface EventPropagationInterface
+{
+    public function stopPropagation(): void;
+
+    public function isPropagationStopped(): bool;
+}

src/EventPropagationTrait.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webware\CommandBus\Event;
+
+use Override;
+
+trait EventPropagationTrait
+{
+    protected bool $propagationStopped = false;
+
+    #[Override]
+    public function stopPropagation(bool $flag = true): void
+    {
+        $this->propagationStopped = $flag;
+    }
+
+    #[Override]
+    public function isPropagationStopped(): bool
+    {
+        return $this->propagationStopped;
+    }
+}

src/PostHandleEvent.php

@@ -16,7 +16,7 @@
 
 use Webware\CommandBus\CommandInterface;
 
-final class PostHandleEvent extends MutableEvent
+final class PostHandleEvent extends Event
 {
     public function __construct(
         private CommandInterface $command,

src/PreHandleEvent.php

@@ -16,7 +16,7 @@
 
 use Webware\CommandBus\CommandInterface;
 
-final class PreHandleEvent extends MutableEvent
+final class PreHandleEvent extends Event
 {
     public function __construct(
         private readonly CommandInterface $command,