修复在事件中取消事件监听报错 (#592)

imiphp · Oct 20, 2023 · d980eaa · d980eaa
1 parent fe905f1
commit d980eaa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Event/TEvent.php b/src/Event/TEvent.php
@@ -210,7 +210,7 @@ public function trigger(string $name, array $data = [], ?object $target = null,
         finally
         {
             // 仅触发一次的处理
-            if ($oneTimeCallbacks)
+            if ($oneTimeCallbacks && isset($this->__events[$name]))
             {
                 $eventsMap = &$this->__events[$name];
                 foreach ($eventsMap as $eventsKey => $item)

diff --git a/tests/unit/Component/Tests/EventTest.php b/tests/unit/Component/Tests/EventTest.php
@@ -55,6 +55,15 @@ public function testOne(): void
             'return' => &$return,
         ], $this);
         Assert::assertNull($return);
+
+        // 测试在事件中取消事件监听
+        $return = null;
+        Event::one('IMITEST.EVENT.OFF', static function () use (&$return) {
+            Event::off('IMITEST.EVENT.OFF');
+            $return = 114514;
+        });
+        Event::trigger('IMITEST.EVENT.OFF');
+        Assert::assertEquals(114514, $return);
     }
 
     public function testOff(): void