eee

This reverts commit fdf58326

.gitignore

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

.phpstorm.meta.php

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

EventDispatch.php

@@ -1,37 +1,55 @@
-<?php
+<?php
-
+declare(strict_types=1);
-namespace Kiri\Events;
+
-
+namespace Kiri\Events;
-use Kiri\Abstracts\Component;
+
-use Kiri\Kiri;
+use Kiri\Abstracts\Component;
-use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\EventDispatcher\StoppableEventInterface;
+use Psr\EventDispatcher\StoppableEventInterface;
-
+use SplPriorityQueue;
-
+
-/**
+
- *
+/**
- */
+ *
-class EventDispatch extends Component implements EventDispatcherInterface
+ */
-{
+class EventDispatch extends Component implements EventDispatcherInterface
-
+{
-
+
-	/**
+
-	 * @param object $event
+	/**
-	 * @return object
+	 * @param object $event
-	 * @throws \ReflectionException
+	 * @return object
-	 */
+     */
-	public function dispatch(object $event): object
+	public function dispatch(object $event): object
-	{
+	{
-		$lists = $this->eventProvider->getListenersForEvent($event);
+		$lists = make(EventProvider::class)->getListenersForEvent($event);
-		foreach ($lists as $listener) {
+
-			/** @var Struct $list */
+		return $this->execute($lists, $event);
-			$listener($event);
+	}
-			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
+
-				break;
+
-			}
+    /**
-		}
+     * @param SplPriorityQueue $lists
-		return $event;
+     * @param object $event
-	}
+     * @return object
-
+     */
-
+	public function execute(SplPriorityQueue $lists, object $event): object
-}
+	{
+		if ($lists->isEmpty()) {
+			return $event;
+		}
+        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,44 +1,67 @@
-<?php
+<?php
-
+declare(strict_types=1);
-namespace Kiri\Events;
+
-
+namespace Kiri\Events;
-
+
-use Psr\EventDispatcher\ListenerProviderInterface;
+
-
+use Closure;
-/**
+use Psr\EventDispatcher\ListenerProviderInterface;
- *
+use SplPriorityQueue;
- */
+
-class EventProvider implements ListenerProviderInterface
+/**
-{
+ *
-
+ */
-	/** @var Struct[] */
+class EventProvider implements ListenerProviderInterface
-	private array $_listeners = [];
+{
-
+
-
+    /** @var Struct[] */
-	/**
+    private array $_listeners = [];
-	 * @param object $event
+
-	 * @return iterable
+
-	 */
+    /**
-	public function getListenersForEvent(object $event): iterable
+     * @param object $event
-	{
+     * @return SplPriorityQueue
-		$queue = new \SplPriorityQueue();
+     */
-		// TODO: Implement getListenersForEvent() method.
+    public function getListenersForEvent(object $event): SplPriorityQueue
-		foreach ($this->_listeners[get_class($event)] ?? [] as $listener) {
+    {
-			$queue->insert($listener->listener, $listener->priority);
+        $queue = new SplPriorityQueue();
-		}
+        $queue->setExtractFlags(SplPriorityQueue::EXTR_DATA);
-		return $queue;
+        // 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)
+     * @param string $event
-	{
+     * @param array|Closure|string $handler
-		$this->_listeners[$event][] = new Struct($event, $handler, $zOrder);
+     * @param int $zOrder
-	}
+     * @throws
-
+     */
-
+    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);
+    }
+
+
+    /**
+     * @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,31 @@
-<?php
+<?php
-
+
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-namespace Kiri\Events;
+namespace Kiri\Events;
-
+
-/**
+/**
- *
+ *
- */
+ */
-class Struct
+class Struct
-{
+{
-
+
-	public string $event;
+	public string $event;
-
+
-	public array|\Closure $listener;
+	public array|\Closure|string $listener;
-
+
-	public int $priority;
+	public int $priority;
-
+
-	public function __construct(string $event, callable $listener, int $priority)
+
-	{
+    /**
-		$this->event = $event;
+     * @param string $event
-		$this->listener = $listener;
+     * @param array|\Closure|string $listener
-		$this->priority = $priority;
+     * @param int $priority
-	}
+     */
-}
+	public function __construct(string $event, array|\Closure|string $listener, int $priority)
+	{
+		$this->event = $event;
+		$this->listener = $listener;
+		$this->priority = $priority;
+	}
+}

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,8 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.4",
-    "ext-json": "*",
     "psr/event-dispatcher": "^1.0"
   },
   "autoload": {
@@ -19,6 +18,5 @@
      }
   },
   "require-dev": {
-    "kwn/php-rdkafka-stubs": "^2.0"
   }
 }