zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-20 15:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix EventMapIterator bug and add tests

Browse Source
This commit is contained in:
crazywhalecc
2022-05-04 21:05:10 +08:00
parent 54eabc948f
commit 94d6a51358
3 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ZM/Event/EventMapIterator.php
View File

@@ -5,7 +5,7 @@ declare(strict_types=1);
namespace ZM\Event;
use Iterator;
use ReturnTypeWillChange;
use ZM\Console\Console;
class EventMapIterator implements Iterator
{
@@ -22,40 +22,54 @@ class EventMapIterator implements Iterator
$this->class = $class;
$this->method = $method;
$this->event_name = $event_name;
$this->nextToValid();
}
public function current()
{
Console::debug('从 [' . $this->offset . '] 开始获取');
return EventManager::$event_map[$this->class][$this->method][$this->offset];
}
public function next(): void
{
++$this->offset;
Console::debug('下一个offset为 [' . ++$this->offset . ']');
$this->nextToValid();
}
#[ReturnTypeWillChange]
public function key()
{
return $this->offset;
Console::debug('返回key：' . $this->offset);
return isset(EventManager::$event_map[$this->class][$this->method][$this->offset]) ? $this->offset : null;
}
public function valid(): bool
public function valid($s = false): bool
{
return isset(EventManager::$event_map[$this->class][$this->method][$this->offset]);
Console::debug(
"[{$this->offset}] " .
($s ? 'valid' : '') . '存在：' .
(!isset(EventManager::$event_map[$this->class][$this->method][$this->offset]) ? Console::setColor('false', 'red') : ('true' .
(is_a(EventManager::$event_map[$this->class][$this->method][$this->offset], $this->event_name, true) ? '，是目标对象' : '，不是目标对象')))
);
return
isset(EventManager::$event_map[$this->class][$this->method][$this->offset])
&& is_a(EventManager::$event_map[$this->class][$this->method][$this->offset], $this->event_name, true);
}
public function rewind(): void
{
Console::debug('回到0');
$this->offset = 0;
$this->nextToValid();
}
private function nextToValid()
{
while ($this->valid() && !is_a($this->current(), $this->event_name, true)) {
while (
isset(EventManager::$event_map[$this->class][$this->method][$this->offset])
&& !is_a(EventManager::$event_map[$this->class][$this->method][$this->offset], $this->event_name, true)
) {
++$this->offset;
}
Console::debug('内部偏移offset为 [' . $this->offset . ']');
}
}