fix: event dispatch with class name and arguments

laravel · Aug 19, 2024 · 18d9057 · 18d9057
1 parent 81a0b5b
commit 18d9057
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Illuminate/Events/Dispatcher.php b/src/Illuminate/Events/Dispatcher.php
@@ -316,6 +316,8 @@ protected function parseEventAndPayload($event, $payload)
     {
         if (is_object($event)) {
             [$payload, $event] = [[$event], get_class($event)];
+        } elseif (class_exists($event)) {
+            [$payload, $event] = [[new $event(...$payload)], $event];
         }
 
         return [$event, Arr::wrap($payload)];

diff --git a/tests/Events/EventsDispatcherTest.php b/tests/Events/EventsDispatcherTest.php
@@ -583,6 +583,21 @@ public function testInvokeIsCalled()
 
         unset($_SERVER['__event.test']);
     }
+
+    public function testDispatchWithObjectAndClassWithArguments()
+    {
+        unset($_SERVER['__event.test']);
+        $d = new Dispatcher;
+        $d->listen(TestEvent1::class, [TestListener4::class, 'handle']);
+
+        $test = 'hello';
+
+        $d->dispatch(new TestEvent1($test));
+        $this->assertSame($test, $_SERVER['__event.test']);
+
+        $d->dispatch(TestEvent1::class, [$test]);
+        $this->assertSame($test, $_SERVER['__event.test']);
+    }
 }
 
 class TestListenerLean
@@ -726,3 +741,19 @@ public function handle()
         $_SERVER['__event.test'][] = 'handle-3';
     }
 }
+
+class TestEvent1
+{
+    public function __construct(
+        public string $test
+    ) {
+    }
+}
+
+class TestListener4
+{
+    public function handle(TestEvent1 $exampleEvent)
+    {
+        $_SERVER['__event.test'] = $exampleEvent->test;
+    }
+}