Skip to content

Fix parser exception being thrown when there are no more tokens in response #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevebauman merged 3 commits into from
Feb 13, 2025
Merged

Fix parser exception being thrown when there are no more tokens in response #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
937727e
Don't throw exception when no token is found
stevebauman Feb 13, 2025
df9f6a6
Update test
stevebauman Feb 13, 2025
f2504e6
Fix code style
stevebauman Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Connection/ImapParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Connection/ImapConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -681,7 +681,7 @@

expect(function () use ($connection) {
iterator_to_array($connection->idle(30));
})->toThrow(ImapParserException::class);
})->toThrow(ImapConnectionException::class);

$stream->assertWritten('TAG1 IDLE');
});
Expand Down
Loading