Merge pull request #15 from DirectoryTree/BUG-13

Fix parser exception being thrown when there are no more tokens in response
DirectoryTree · Feb 13, 2025 · 12b474f · 12b474f
2 parents c2a2c54 + f2504e6
commit 12b474f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Connection/ImapParser.php b/src/Connection/ImapParser.php
@@ -45,13 +45,14 @@ public function __construct(ImapTokenizer $tokenizer)
      */
     public function next(): Data|Token|Response|null
     {
-        // Load the first token.
+        // Attempt to load the first token.
         if (! $this->currentToken) {
             $this->advance();
         }
 
+        // No token was found, return null.
         if (! $this->currentToken) {
-            throw new ImapParserException('Empty response');
+            return null;
         }
 
         // If the token indicates the beginning of a list, parse it.

diff --git a/tests/Unit/Connection/ImapConnectionTest.php b/tests/Unit/Connection/ImapConnectionTest.php
@@ -3,8 +3,8 @@
 use DirectoryTree\ImapEngine\Connection\ImapConnection;
 use DirectoryTree\ImapEngine\Connection\Streams\FakeStream;
 use DirectoryTree\ImapEngine\Exceptions\ImapCommandException;
+use DirectoryTree\ImapEngine\Exceptions\ImapConnectionException;
 use DirectoryTree\ImapEngine\Exceptions\ImapConnectionFailedException;
-use DirectoryTree\ImapEngine\Exceptions\ImapParserException;
 use DirectoryTree\ImapEngine\Support\Str;
 
 test('connect success', function () {
@@ -681,7 +681,7 @@
 
     expect(function () use ($connection) {
         iterator_to_array($connection->idle(30));
-    })->toThrow(ImapParserException::class);
+    })->toThrow(ImapConnectionException::class);
 
     $stream->assertWritten('TAG1 IDLE');
 });