fix(events): prevent enum event naming collisions (#1681)

Author: brendt

packages/event-bus/src/EventBusDiscovery.php

@@ -10,6 +10,7 @@
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\TypeReflector;
 use Tempest\Support\Str;
+use UnitEnum;
 
 final class EventBusDiscovery implements Discovery
 {
@@ -30,6 +31,10 @@ public function discover(DiscoveryLocation $location, ClassReflector $class): vo
 
             $eventName = Str\parse($eventHandler->event, default: null);
 
+            if ($eventHandler->event instanceof UnitEnum) {
+                $eventName = $eventHandler->event::class . '::' . $eventName;
+            }
+
             if ($eventName === null) {
                 $parameters = iterator_to_array($method->getParameters());
 

packages/event-bus/src/GenericEventBus.php

@@ -7,6 +7,7 @@
 use Closure;
 use Tempest\Container\Container;
 use Tempest\Support\Str;
+use UnitEnum;
 
 final readonly class GenericEventBus implements EventBus
 {
@@ -33,6 +34,11 @@ public function dispatch(string|object $event): void
     private function resolveHandlers(string|object $event): array
     {
         $eventName = Str\parse($event) ?: $event::class;
+
+        if ($event instanceof UnitEnum) {
+            $eventName = $event::class . '::' . $eventName;
+        }
+
         $handlers = $this->eventBusConfig->handlers[$eventName] ?? [];
 
         if (is_object($event)) {

tests/Fixtures/Events/OtherEnumEvent.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Events;
+
+enum OtherEnumEvent
+{
+    case Foo;
+}

tests/Integration/EventBus/EventBusTest.php

@@ -7,6 +7,7 @@
 use Tests\Tempest\Fixtures\Events\DiscoveredEventBusMiddleware;
 use Tests\Tempest\Fixtures\Events\EnumEvent;
 use Tests\Tempest\Fixtures\Events\EventInterfaceImplementation;
+use Tests\Tempest\Fixtures\Events\OtherEnumEvent;
 use Tests\Tempest\Fixtures\Events\TestEventHandler;
 use Tests\Tempest\Fixtures\Handlers\EventInterfaceHandler;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
@@ -36,6 +37,15 @@ public function test_enum_events(): void
         $this->assertTrue(TestEventHandler::$fromEnumEvent);
     }
 
+    public function test_enum_events_with_colliding_names(): void
+    {
+        TestEventHandler::$fromEnumEvent = false;
+
+        event(OtherEnumEvent::Foo);
+
+        $this->assertFalse(TestEventHandler::$fromEnumEvent);
+    }
+
     public function test_interface_events_are_discovered(): void
     {
         EventInterfaceHandler::$itHappened = false;