变更

This reverts commit fdf58326

.gitignore

@@ -1,34 +1,34 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Yii template
-assets/*
-!assets/.gitignore
-protected/runtime/*
-!protected/runtime/.gitignore
-protected/data/*.db
-themes/classic/views/
-
-### Example user template template
-### Example user template
-
-# IntelliJ project files
-.idea
-*.iml
-out
-gen
-
-composer.lock
-
-*.log
-commands/result
-config/setting.php
-tests/
-vendor/
-runtime/
-
-*.xml
-*.lock
-
-oot
-d
-
-composer.lock
+# Created by .ignore support plugin (hsz.mobi)
+### Yii template
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+
+composer.lock
+
+*.log
+commands/result
+config/setting.php
+tests/
+vendor/
+runtime/
+
+*.xml
+*.lock
+
+oot
+d
+
+composer.lock

.phpstorm.meta.php

@@ -1,17 +1,17 @@
-<?php
-
-namespace PHPSTORM_META {
-
-    // Reflect
-	use Http\Context\Context;
-	use Kiri\Di\Container;
-
-	override(Container::get(0), map('@'));
-	override(Container::newObject(0), map('@'));
-//    override(\Hyperf\Utils\Context::get(0), map('@'));
-//    override(\make(0), map('@'));
-    override(\di(0), map('@'));
-    override(\duplicate(0), map('@'));
-    override(Context::getContext(0), map('@'));
-
-}
+<?php
+
+namespace PHPSTORM_META {
+
+    // Reflect
+	use Kiri\Message\Context\Context;
+	use Kiri\Di\Container;
+
+	override(Container::get(0), map('@'));
+	override(Container::newObject(0), map('@'));
+//    override(\Hyperf\Utils\Context::get(0), map('@'));
+//    override(\make(0), map('@'));
+    override(\di(0), map('@'));
+    override(\duplicate(0), map('@'));
+    override(Context::getContext(0), map('@'));
+
+}

EventDispatch.php

@@ -1,37 +1,59 @@
-<?php
-
-namespace Kiri\Events;
-
-use Kiri\Abstracts\Component;
-use Kiri\Kiri;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\EventDispatcher\StoppableEventInterface;
-
-
-/**
- *
- */
-class EventDispatch extends Component implements EventDispatcherInterface
-{
-
-
-	/**
-	 * @param object $event
-	 * @return object
-	 * @throws \ReflectionException
-	 */
-	public function dispatch(object $event): object
-	{
-		$lists = $this->eventProvider->getListenersForEvent($event);
-		foreach ($lists as $listener) {
-			/** @var Struct $list */
-			$listener($event);
-			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
-				break;
-			}
-		}
-		return $event;
-	}
-
-
-}
+<?php
+
+namespace Kiri\Events;
+
+use Kiri;
+use Kiri\Abstracts\Component;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\EventDispatcher\StoppableEventInterface;
+
+
+/**
+ *
+ */
+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
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function dispatch(object $event): object
+	{
+		$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

@@ -1,44 +1,65 @@
-<?php
-
-namespace Kiri\Events;
-
-
-use Psr\EventDispatcher\ListenerProviderInterface;
-
-/**
- *
- */
-class EventProvider implements ListenerProviderInterface
-{
-
-	/** @var Struct[] */
-	private array $_listeners = [];
-
-
-	/**
-	 * @param object $event
-	 * @return iterable
-	 */
-	public function getListenersForEvent(object $event): iterable
-	{
-		$queue = new \SplPriorityQueue();
-		// TODO: Implement getListenersForEvent() method.
-		foreach ($this->_listeners[get_class($event)] ?? [] as $listener) {
-			$queue->insert($listener->listener, $listener->priority);
-		}
-		return $queue;
-	}
-
-
-	/**
-	 * @param string $event
-	 * @param callable $handler
-	 * @param int $zOrder
-	 */
-	public function on(string $event, callable $handler, int $zOrder = 1)
-	{
-		$this->_listeners[$event][] = new Struct($event, $handler, $zOrder);
-	}
-
-
-}
+<?php
+
+namespace Kiri\Events;
+
+
+use Psr\EventDispatcher\ListenerProviderInterface;
+use SplPriorityQueue;
+
+/**
+ *
+ */
+class EventProvider implements ListenerProviderInterface
+{
+
+	/** @var Struct[] */
+	private array $_listeners = [];
+
+
+	/**
+	 * @param object $event
+	 * @return SplPriorityQueue
+	 */
+	public function getListenersForEvent(object $event): 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);
+		}
+		return $queue;
+	}
+
+
+	/**
+	 * @param string $event
+	 * @param array|\Closure|string $handler
+	 * @param int $zOrder
+	 * @throws \Exception
+	 */
+	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);
+	}
+
+
+	/**
+	 * @param string $event
+	 * @param callable $handler
+	 * @return void
+	 */
+	public function off(string $event, callable $handler): void
+	{
+		$events = $this->_listeners[$event] ?? [];
+
+		$this->_listeners[$event] = array_filter($events, function ($value) use ($handler) {
+			return $value->listener !== $handler;
+		});
+	}
+
+
+}

Struct.php

@@ -1,25 +1,25 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Kiri\Events;
-
-/**
- *
- */
-class Struct
-{
-
-	public string $event;
-
-	public array|\Closure $listener;
-
-	public int $priority;
-
-	public function __construct(string $event, callable $listener, int $priority)
-	{
-		$this->event = $event;
-		$this->listener = $listener;
-		$this->priority = $priority;
-	}
-}
+<?php
+
+declare(strict_types=1);
+
+namespace Kiri\Events;
+
+/**
+ *
+ */
+class Struct
+{
+
+	public string $event;
+
+	public array|\Closure|string $listener;
+
+	public int $priority;
+
+	public function __construct(string $event, array|\Closure|string $listener, int $priority)
+	{
+		$this->event = $event;
+		$this->listener = $listener;
+		$this->priority = $priority;
+	}
+}

composer.json

@@ -10,7 +10,6 @@
   "license": "MIT",
   "require": {
     "php": ">=8.0",
-    "ext-json": "*",
     "psr/event-dispatcher": "^1.0"
   },
   "autoload": {
@@ -19,6 +18,5 @@
      }
   },
   "require-dev": {
-    "kwn/php-rdkafka-stubs": "^2.0"
   }
 }