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

EventInterface.php

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

EventProvider.php

@@ -1,9 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Events;
 
 
+use Closure;
 use Psr\EventDispatcher\ListenerProviderInterface;
+use SplPriorityQueue;
 
 /**
  *
@@ -17,11 +20,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 +36,15 @@ class EventProvider implements ListenerProviderInterface
 
     /**
      * @param string $event
-	 * @param callable $handler
+     * @param array|Closure|string $handler
      * @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
     {
+        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 +54,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,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,17 @@
+<?php
+
+namespace Kiri\Events;
+
+class TestListener implements EventInterface
+{
+
+
+    /**
+     * @return void
+     */
+    public function process(): void
+    {
+        // TODO: Implement process() method.
+    }
+
+}