变更

EventDispatch.php

@@ -2,8 +2,8 @@
 
 namespace Kiri\Events;
 
-use Kiri\Abstracts\Component;
 use Kiri;
+use Kiri\Abstracts\Component;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -17,6 +17,17 @@ class EventDispatch extends Component implements EventDispatcherInterface
 {
 
 
+	/**
+	 * @param EventProvider $eventProvider
+	 * @param array $config
+	 * @throws \Exception
+	 */
+	public function __construct(public EventProvider $eventProvider, array $config = [])
+	{
+		parent::__construct($config);
+	}
+
+
 	/**
 	 * @param object $event
 	 * @return object
@@ -25,13 +36,21 @@ class EventDispatch extends Component implements EventDispatcherInterface
 	 */
 	public function dispatch(object $event): object
 	{
-		$lists = $this->getEventProvider()->getListenersForEvent($event);
-		foreach ($lists as $listener) {
-			/** @var Struct $list */
-			$listener($event);
+		$lists = $this->eventProvider->getListenersForEvent($event);
+		if (!$lists->valid()) {
+			return $event;
+		}
+		$lists->top();
+		while ($lists->valid()) {
+			try {
+				call_user_func($lists->current(), $event);
+			} catch (\Throwable $exception) {
+				$this->logger->error($exception->getMessage(), [$exception]);
+			}
 			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
 				break;
 			}
+			$lists->next();
 		}
 		return $event;
 	}

EventProvider.php

@@ -4,6 +4,7 @@ namespace Kiri\Events;
 
 
 use Psr\EventDispatcher\ListenerProviderInterface;
+use SplPriorityQueue;
 
 /**
  *
@@ -17,11 +18,12 @@ class EventProvider implements ListenerProviderInterface
 
 	/**
 	 * @param object $event
-	 * @return iterable
+	 * @return SplPriorityQueue
 	 */
-	public function getListenersForEvent(object $event): iterable
+	public function getListenersForEvent(object $event): SplPriorityQueue
 	{
-		$queue = new \SplPriorityQueue();
+		$queue = new SplPriorityQueue();
+		$queue->setExtractFlags(SplPriorityQueue::EXTR_DATA);
 		// TODO: Implement getListenersForEvent() method.
 		foreach ($this->_listeners[get_class($event)] ?? [] as $listener) {
 			$queue->insert($listener->listener, $listener->priority);
@@ -32,11 +34,15 @@ class EventProvider implements ListenerProviderInterface
 
 	/**
 	 * @param string $event
-	 * @param callable $handler
+	 * @param array|\Closure|string $handler
 	 * @param int $zOrder
+	 * @throws \Exception
 	 */
-	public function on(string $event, callable $handler, int $zOrder = 1)
+	public function on(string $event, array|\Closure|string $handler, int $zOrder = 1)
 	{
+		if (is_string($handler) && !is_callable($handler, true)) {
+			throw new \Exception('Event handler must is execute function.');
+		}
 		$this->_listeners[$event][] = new Struct($event, $handler, $zOrder);
 	}
 
@@ -46,7 +52,7 @@ class EventProvider implements ListenerProviderInterface
 	 * @param callable $handler
 	 * @return void
 	 */
-	public function off(string $event, callable $handler)
+	public function off(string $event, callable $handler): void
 	{
 		$events = $this->_listeners[$event] ?? [];
 

Struct.php

@@ -12,11 +12,11 @@ class Struct
 
 	public string $event;
 
-	public array|\Closure $listener;
+	public array|\Closure|string $listener;
 
 	public int $priority;
 
-	public function __construct(string $event, callable $listener, int $priority)
+	public function __construct(string $event, array|\Closure|string $listener, int $priority)
 	{
 		$this->event = $event;
 		$this->listener = $listener;