Refactor BotEventListener: extract methods and add loop tests (#4)

Author: antonkomarev

src/BotEventListener.php

@@ -153,29 +153,7 @@ public function listen(
                 );
 
                 try {
-                    if ($eventType === EventTypeEnum::MessageNew) {
-                        $text = isset($event['payload']['text']) && is_string($event['payload']['text'])
-                            ? $event['payload']['text']
-                            : '';
-
-                        foreach ($this->commandHandlers as $command => $handler) {
-                            if (
-                                $text === $command
-                                || str_starts_with($text, $command . ' ')
-                                || str_starts_with($text, $command . '@')
-                            ) {
-                                $handler($this->bot, $eventDto);
-
-                                continue 2;
-                            }
-                        }
-                    }
-
-                    if (array_key_exists($eventType->value, $this->handlers)) {
-                        foreach ($this->handlers[$eventType->value] as $handler) {
-                            $handler($this->bot, $eventDto);
-                        }
-                    }
+                    $this->handleEvent($eventDto);
                 } catch (\Exception $e) {
                     if ($onException === null) {
                         throw $e;
@@ -187,6 +165,48 @@ public function listen(
         }
     }
 
+    private function handleEvent(
+        EventDto $event,
+    ): void {
+        if ($event->type === EventTypeEnum::MessageNew) {
+            $text = isset($event->payload['text']) && is_string($event->payload['text'])
+                ? $event->payload['text']
+                : '';
+
+            $commandHandler = $this->matchCommand($text);
+            if ($commandHandler !== null) {
+                $commandHandler($this->bot, $event);
+
+                return;
+            }
+        }
+
+        if (array_key_exists($event->type->value, $this->handlers)) {
+            foreach ($this->handlers[$event->type->value] as $handler) {
+                $handler($this->bot, $event);
+            }
+        }
+    }
+
+    /**
+     * @return (\Closure(Bot, EventDto): void)|null
+     */
+    private function matchCommand(
+        string $text,
+    ): ?\Closure {
+        foreach ($this->commandHandlers as $command => $handler) {
+            if (
+                $text === $command
+                || str_starts_with($text, $command . ' ')
+                || str_starts_with($text, $command . '@')
+            ) {
+                return $handler;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param int $pollTime Maximum polling request duration (1-60 sec)
      * @return list<array{

test/Unit/BotEventListenerTest.php

@@ -219,6 +219,145 @@ public function testExceptionBubblesWithoutOnExceptionCallback(): void
         $listener->listen(1);
     }
 
+    public function testStopFromHandlerStopsLoop(): void
+    {
+        $httpClient = $this->createMock(HttpClient::class);
+        $bot = new Bot($httpClient);
+        $listener = new BotEventListener($bot);
+
+        $pollCount = 0;
+        $httpClient
+            ->method('get')
+            ->willReturnCallback(function () use (&$pollCount, $listener) {
+                $pollCount++;
+                return [
+                    'events' => [
+                        [
+                            'eventId' => $pollCount,
+                            'type' => 'newMessage',
+                            'payload' => ['text' => 'msg'],
+                        ],
+                    ],
+                ];
+            });
+
+        $listener->onMessage(function (Bot $bot, EventDto $event) use ($listener) {
+            if ($event->eventId === 2) {
+                $listener->stop();
+            }
+        });
+
+        $listener->listen(1);
+
+        $this->assertSame(2, $pollCount, 'Loop should stop after handler calls stop()');
+    }
+
+    public function testUnknownEventTypeIsSkipped(): void
+    {
+        $httpClient = $this->createMock(HttpClient::class);
+        $bot = new Bot($httpClient);
+        $listener = new BotEventListener($bot);
+
+        $callCount = 0;
+        $this->mockEventsGet($httpClient, $listener, $callCount, [
+            'events' => [
+                [
+                    'eventId' => 1,
+                    'type' => 'unknownEventType',
+                    'payload' => ['text' => 'hello'],
+                ],
+                [
+                    'eventId' => 2,
+                    'type' => 'newMessage',
+                    'payload' => ['text' => 'world'],
+                ],
+            ],
+        ]);
+
+        $receivedEvents = [];
+        $listener->onMessage(function (Bot $bot, EventDto $event) use (&$receivedEvents) {
+            $receivedEvents[] = $event->eventId;
+        });
+
+        $listener->listen(1);
+
+        $this->assertSame([2], $receivedEvents, 'Unknown event should be skipped, known event processed');
+    }
+
+    public function testLastEventIdIsPassedToNextPoll(): void
+    {
+        $httpClient = $this->createMock(HttpClient::class);
+        $bot = new Bot($httpClient);
+        $listener = new BotEventListener($bot);
+
+        $receivedLastEventIds = [];
+        $pollCount = 0;
+        $httpClient
+            ->method('get')
+            ->willReturnCallback(function (string $path, array $params) use (&$receivedLastEventIds, &$pollCount, $listener) {
+                $receivedLastEventIds[] = $params['lastEventId'];
+                $pollCount++;
+                if ($pollCount === 1) {
+                    return [
+                        'events' => [
+                            ['eventId' => 42, 'type' => 'newMessage', 'payload' => ['text' => 'hi']],
+                        ],
+                    ];
+                }
+                $listener->stop();
+                return ['events' => []];
+            });
+
+        $listener->onMessage(function () {});
+        $listener->listen(1);
+
+        $this->assertSame(0, $receivedLastEventIds[0], 'First poll should use lastEventId=0');
+        $this->assertSame(42, $receivedLastEventIds[1], 'Second poll should use lastEventId from previous batch');
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('signalProvider')]
+    public function testStopOnSignal(int $signal): void
+    {
+        if (!function_exists('pcntl_signal')) {
+            $this->markTestSkipped('pcntl extension required');
+        }
+
+        $httpClient = $this->createMock(HttpClient::class);
+        $bot = new Bot($httpClient);
+        $listener = new BotEventListener($bot);
+
+        $pollCount = 0;
+        $httpClient
+            ->method('get')
+            ->willReturnCallback(function () use (&$pollCount, $signal) {
+                $pollCount++;
+                if ($pollCount === 1) {
+                    posix_kill(posix_getpid(), $signal);
+                    return [
+                        'events' => [
+                            ['eventId' => 1, 'type' => 'newMessage', 'payload' => ['text' => 'hi']],
+                        ],
+                    ];
+                }
+                $this->fail('Loop should have stopped after signal');
+                return ['events' => []];
+            });
+
+        $listener->onMessage(function () {});
+        $listener->listen(1);
+
+        $this->assertSame(1, $pollCount, 'Loop should stop after signal');
+    }
+
+    /**
+     * @return iterable<string, array{int}>
+     */
+    public static function signalProvider(): iterable
+    {
+        yield 'SIGTERM' => [SIGTERM];
+        yield 'SIGINT' => [SIGINT];
+    }
+
     /**
      * Configure HttpClient mock to return $eventsBatch on first call,
      * then empty events + stop() on subsequent calls.