chore: extract dispatch and event helper functions

composer.json

@@ -51,6 +51,7 @@
         },
         "files": [
             "src/auth/src/Functions.php",
+            "src/bus/src/Functions.php",
             "src/cache/src/Functions.php",
             "src/config/src/Functions.php",
             "src/event/src/Functions.php",

src/bus/composer.json

@@ -39,7 +39,10 @@
     "autoload": {
         "psr-4": {
             "SwooleTW\\Hyperf\\Bus\\": "src/"
-        }
+        },
+        "files": [
+            "src/Functions.php"
+        ]
     },
     "extra": {
         "hyperf": {

src/bus/src/Functions.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SwooleTW\Hyperf\Bus;
+
+use Closure;
+use Hyperf\Context\ApplicationContext;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use SwooleTW\Hyperf\Bus\Contracts\Dispatcher;
+use SwooleTW\Hyperf\Queue\CallQueuedClosure;
+
+/**
+ * Dispatch a job to its appropriate handler.
+ *
+ * @param mixed $job
+ * @return ($job is Closure ? PendingClosureDispatch : PendingDispatch)
+ */
+function dispatch($job): PendingClosureDispatch|PendingDispatch
+{
+    return $job instanceof Closure
+        ? new PendingClosureDispatch(CallQueuedClosure::create($job))
+        : new PendingDispatch($job);
+}
+
+/**
+ * Dispatch a command to its appropriate handler in the current process.
+ *
+ * Queueable jobs will be dispatched to the "sync" queue.
+ */
+function dispatch_sync(mixed $job, mixed $handler = null): mixed
+{
+    return ApplicationContext::getContainer()
+        ->get(Dispatcher::class)
+        ->dispatchSync($job, $handler);
+}
+
+/**
+ * Dispatch an event and call the listeners.
+ *
+ * @template T of object
+ *
+ * @param T $event
+ *
+ * @return T
+ */
+function event(object $event)
+{
+    return ApplicationContext::getContainer()
+        ->get(EventDispatcherInterface::class)
+        ->dispatch($event);
+}

src/event/src/EventDispatcher.php

@@ -370,7 +370,6 @@ protected function createQueuedHandlerCallable(object|string $class, string $met
     {
         return function () use ($class, $method) {
             $arguments = array_map(function ($a) {
-                // dd(debug_backtrace(2));
                 return is_object($a) ? clone $a : $a;
             }, func_get_args());
 

src/event/src/Functions.php

@@ -5,10 +5,26 @@
 namespace SwooleTW\Hyperf\Event;
 
 use Closure;
+use Hyperf\Context\ApplicationContext;
+use Psr\EventDispatcher\EventDispatcherInterface;
 
-if (! function_exists('SwooleTW\Hyperf\Event\queueable')) {
-    function queueable(Closure $closure): QueuedClosure
-    {
-        return new QueuedClosure($closure);
-    }
+/**
+ * Dispatch an event and call the listeners.
+ *
+ * @template T of object
+ *
+ * @param T $event
+ *
+ * @return T
+ */
+function event(object $event)
+{
+    return ApplicationContext::getContainer()
+        ->get(EventDispatcherInterface::class)
+        ->dispatch($event);
+}
+
+function queueable(Closure $closure): QueuedClosure
+{
+    return new QueuedClosure($closure);
 }

src/event/src/QueuedClosure.php

@@ -10,6 +10,8 @@
 use Illuminate\Events\CallQueuedListener;
 use Laravel\SerializableClosure\SerializableClosure;
 
+use function SwooleTW\Hyperf\Bus\dispatch;
+
 class QueuedClosure
 {
     /**

src/foundation/src/helpers.php

@@ -13,7 +13,6 @@
 use Hyperf\ViewEngine\Contract\FactoryInterface;
 use Hyperf\ViewEngine\Contract\ViewInterface;
 use Psr\Container\ContainerInterface;
-use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 use SwooleTW\Hyperf\Auth\Contracts\Gate;
@@ -26,7 +25,6 @@
 use SwooleTW\Hyperf\HttpMessage\Exceptions\HttpException;
 use SwooleTW\Hyperf\HttpMessage\Exceptions\HttpResponseException;
 use SwooleTW\Hyperf\HttpMessage\Exceptions\NotFoundHttpException;
-use SwooleTW\Hyperf\Queue\CallQueuedClosure;
 use SwooleTW\Hyperf\Router\UrlGenerator;
 use SwooleTW\Hyperf\Support\Contracts\Responsable;
 
@@ -308,9 +306,7 @@ function app(?string $abstract = null, array $parameters = [])
      */
     function dispatch($job): PendingClosureDispatch|PendingDispatch
     {
-        return $job instanceof Closure
-            ? new PendingClosureDispatch(CallQueuedClosure::create($job))
-            : new PendingDispatch($job);
+        return \SwooleTW\Hyperf\Bus\dispatch($job);
     }
 }
 
@@ -322,8 +318,7 @@ function dispatch($job): PendingClosureDispatch|PendingDispatch
      */
     function dispatch_sync(mixed $job, mixed $handler = null): mixed
     {
-        return app(Dispatcher::class)
-            ->dispatchSync($job, $handler);
+        return \SwooleTW\Hyperf\Bus\dispatch_sync($job, $handler);
     }
 }
 
@@ -339,7 +334,7 @@ function dispatch_sync(mixed $job, mixed $handler = null): mixed
      */
     function event(object $event)
     {
-        return app(EventDispatcherInterface::class)->dispatch($event);
+        return \SwooleTW\Hyperf\Event\event($event);
     }
 }