fix

Author: chaz6chez

src/Events/SwooleEvent.php

@@ -95,7 +95,10 @@ public function add($fd, $flag, $func, $args = [])
                 return $timerId;
             case EventInterface::EV_READ:
                 if (\is_resource($fd)) {
-                    if ($this->_reads[$key = (int) $fd] ?? null) {
+                    if (
+                        ($this->_reads[$key = (int) $fd] ?? null) or
+                        Event::isset($fd, SWOOLE_EVENT_READ)
+                    ) {
                         $this->del($fd, EventInterface::EV_READ);
                     }
                     if ($res = Event::add($fd, $func, null, SWOOLE_EVENT_READ)) {
@@ -108,7 +111,10 @@ public function add($fd, $flag, $func, $args = [])
                 return false;
             case self::EV_WRITE:
                 if (\is_resource($fd)) {
-                    if ($this->_writes[$key = (int) $fd] ?? null) {
+                    if (
+                        ($this->_writes[$key = (int) $fd] ?? null) or
+                        Event::isset($fd, SWOOLE_EVENT_WRITE)
+                    ) {
                         $this->del($fd, EventInterface::EV_WRITE);
                     }
                     if ($res = Event::add($fd, null, $func, SWOOLE_EVENT_WRITE)) {
@@ -150,30 +156,32 @@ public function del($fd, $flag)
 
                 return false;
             case self::EV_READ:
-                if (
-                    \is_resource($fd) and
-                    isset($this->_reads[$key = (int) $fd]) and
-                    Event::isset($fd, SWOOLE_EVENT_READ)
-                ) {
-                    if (Event::del($fd)) {
-                        unset($this->_reads[$key]);
+                if (\is_resource($fd)) {
+                    $key = (int) $fd;
+                    if (Event::isset($fd, SWOOLE_EVENT_READ)){
+                        if (Event::del($fd)) {
 
-                        return true;
+                            return false;
+                        }
                     }
+                    unset($this->_reads[$key]);
+
+                    return true;
                 }
 
                 return false;
             case self::EV_WRITE:
-                if (
-                    \is_resource($fd) and
-                    isset($this->_writes[$key = (int) $fd]) and
-                    Event::isset($fd, SWOOLE_EVENT_WRITE)
-                ) {
-                    if (Event::del($fd)) {
-                        unset($this->_writes[$key]);
+                if (\is_resource($fd)) {
+                    $key = (int) $fd;
+                    if (Event::isset($fd, SWOOLE_EVENT_WRITE)){
+                        if (Event::del($fd)) {
 
-                        return true;
+                            return false;
+                        }
                     }
+                    unset($this->_writes[$key]);
+
+                    return true;
                 }
 
                 return false;

tests/EventsCase/SwooleEventTest.php

@@ -135,6 +135,7 @@ public function testAddAndDelRead()
             $this->assertNull($writeCallback);
             return true;
         });
+        $eventMock->shouldReceive('isset')->andReturn(false);
 
         $stream = fopen('php://memory', 'r+');
         $result = $swooleEvent->add($stream, EventInterface::EV_READ, function () {
@@ -163,6 +164,7 @@ public function testAddAndDelWrite()
             $this->assertNull($readCallback);
             return true;
         });
+        $eventMock->shouldReceive('isset')->andReturn(false);
 
         $stream = fopen('php://memory', 'w+');
         $result = $swooleEvent->add($stream, EventInterface::EV_WRITE, function () {