eee

.phpstorm.meta.php

@@ -12,6 +12,6 @@ namespace PHPSTORM_META {
 //    override(\make(0), map('@'));
     override(\di(0), map('@'));
     override(\duplicate(0), map('@'));
-    override(Context::getContext(0), map('@'));
+    override(Context::get(0), map('@'));
 
 }

EventDispatch.php

@@ -1,13 +1,12 @@
 <?php
+declare(strict_types=1);
 
 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;
+use SplPriorityQueue;
 
 
 /**
@@ -18,32 +17,37 @@ class EventDispatch extends Component implements EventDispatcherInterface
 
 
 	/**
-	 * @param EventProvider $eventProvider
+	 * @param object $event
-	 * @param array $config
+	 * @return object
-	 * @throws \Exception
+     */
-	 */
+	public function dispatch(object $event): object
-	public function __construct(public EventProvider $eventProvider, array $config = [])
 	{
-		parent::__construct($config);
+		$lists = make(EventProvider::class)->getListenersForEvent($event);
+
+		return $this->execute($lists, $event);
 	}
 
 
-	/**
+    /**
-	 * @param object $event
+     * @param SplPriorityQueue $lists
-	 * @return object
+     * @param object $event
-	 * @throws ContainerExceptionInterface
+     * @return object
-	 * @throws NotFoundExceptionInterface
+     */
-	 */
+	public function execute(SplPriorityQueue $lists, object $event): object
-	public function dispatch(object $event): object
 	{
-		$lists = $this->eventProvider->getListenersForEvent($event);
+		if ($lists->isEmpty()) {
-		foreach ($lists as $listener) {
+			return $event;
-			/** @var Struct $list */
-			$listener($event);
-			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
-				break;
-			}
 		}
+        foreach ($lists as $item)  {
+            try {
+                call_user_func($item, $event);
+            } catch (\Throwable $exception) {
+				\Kiri::getLogger()->json_log($exception);
+            }
+            if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
+                break;
+            }
+        }
 		return $event;
 	}
 

EventInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Events;
+
+interface EventInterface
+{
+	
+	/**
+	 * @param object $event
+	 * @return void
+	 */
+    public function process(object $event): void;
+
+}

EventListener.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Kiri\Events;
+
+
+use Exception;
+use Kiri\Di\Interface\InjectTargetInterface;
+
+#[\Attribute]
+readonly class EventListener implements InjectTargetInterface
+{
+
+
+    /**
+     * @param string $event
+     * @throws Exception
+     */
+    public function __construct(public string $event)
+    {
+    }
+
+
+    /**
+     * @param string $class
+     * @return void
+     * @throws Exception
+     */
+    public function dispatch(string $class): void
+    {
+        // TODO: Implement dispatch() method.
+        $target = \Kiri::getDi()->getReflectionClass($class)->newInstanceWithoutConstructor();
+		
+		if (!($target instanceof EventInterface)) {
+            throw new Exception("Event listen must implement " . EventInterface::class);
+        }
+        on($this->event, [$target, "process"]);
+    }
+
+}

EventProvider.php

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

Struct.php

@@ -12,11 +12,17 @@ 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)
+
+    /**
+     * @param string $event
+     * @param array|\Closure|string $listener
+     * @param int $priority
+     */
+	public function __construct(string $event, array|\Closure|string $listener, int $priority)
 	{
 		$this->event = $event;
 		$this->listener = $listener;

TestListener.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Kiri\Events;
+
+class TestListener implements EventInterface
+{
+	
+	
+	/**
+	 * @param object $event
+	 * @return void
+	 */
+    public function process(object $event): void
+    {
+        // TODO: Implement process() method.
+    }
+
+}

composer.json

@@ -9,7 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.5",
     "psr/event-dispatcher": "^1.0"
   },
   "autoload": {