Skip to content

Fix UID quoting when building search queries #79

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
Jun 6, 2025
Merged

Fix UID quoting when building search queries #79

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
ed81c6d
Fix UID query quoting
stevebauman Jun 4, 2025
e728837
Force integers in UID
stevebauman Jun 5, 2025
45b4890
Fix test
stevebauman Jun 5, 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
4 changes: 3 additions & 1 deletion src/Connection/ImapQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,9 @@ public function header(string $header, string $value): static
*/
public function uid(int|string|array $uid): static
{
return $this->where(ImapSearchKey::Uid, implode(',', (array) $uid));
return $this->where(ImapSearchKey::Uid, new RawQueryValue(
Str::set(array_map('intval', (array) $uid))
));
}

/**
Expand Down
16 changes: 16 additions & 0 deletions tests/Unit/Connection/ImapQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,3 +228,19 @@ function (ImapQueryBuilder $q) {

expect($builder->toImap())->toBe('FOO "Jou&AOk-"');
});

test('compiles UID condition without quotes', function () {
$builder = new ImapQueryBuilder;

$builder->uid(2);

expect($builder->toImap())->toBe('UID 2');
});

test('compiles multiple UID values without quotes', function () {
$builder = new ImapQueryBuilder;

$builder->uid([2, 3, 5]);

expect($builder->toImap())->toBe('UID 2,3,5');
});