WIP

Author: stevebauman

src/Connection/ConnectionInterface.php

@@ -68,7 +68,7 @@ public function search(array $params): UntaggedResponse;
      *
      * @see https://datatracker.ietf.org/doc/html/rfc2971.
      */
-    public function id(?array $ids = null): ResponseCollection;
+    public function id(?array $ids = null): UntaggedResponse;
 
     /**
      * Fetch message UIDs using the given message numbers.

src/Connection/ImapConnection.php

@@ -216,7 +216,7 @@ public function copyManyMessages(array $messages, string $folder): ResponseColle
 
         $tokens = [$set, $this->escapeString($folder)];
 
-        $this->send('UID COPY', $tokens, false);
+        $this->send('UID COPY', $tokens);
     }
 
     /**
@@ -226,7 +226,7 @@ public function moveMessage(string $folder, $from, ?int $to = null): ResponseCol
     {
         $set = $this->buildSet($from, $to);
 
-        return $this->send('UID MOVE', [$set, $this->escapeString($folder)], false);
+        return $this->send('UID MOVE', [$set, $this->escapeString($folder)]);
     }
 
     /**
@@ -238,37 +238,27 @@ public function moveManyMessages(array $messages, string $folder): ResponseColle
 
         $tokens = [$set, $this->escapeString($folder)];
 
-        return $this->send('UID MOVE', $tokens, false);
+        return $this->send('UID MOVE', $tokens);
     }
 
     /**
      * {@inheritDoc}
      */
     public function store(array|string $flags, int $from, ?int $to = null, ?string $mode = null, bool $silent = true, ?string $item = null): ResponseCollection
     {
-        $flags = $this->escapeList(Arr::wrap($flags));
-
         $set = $this->buildSet($from, $to);
 
-        $item = ($mode == '-' ? '-' : '+').(is_null($item) ? 'FLAGS' : $item).($silent ? '.SILENT' : '');
-
-        $response = $this->send('UID STORE', [$set, $item, $flags], ! $silent);
+        $flags = $this->escapeList(Arr::wrap($flags));
 
-        if ($silent) {
-            return $response;
-        }
+        $item = ($mode == '-' ? '-' : '+').(is_null($item) ? 'FLAGS' : $item).($silent ? '.SILENT' : '');
 
-        $result = [];
+        $this->send('UID STORE', [$set, $item, $flags], tag: $tag);
 
-        foreach ($response->data() as $token) {
-            if ($token[1] != 'FETCH' || $token[2][0] != 'FLAGS') {
-                continue;
-            }
+        $this->assertTaggedResponse($tag, fn () => new RuntimeException('Failed to store flags'));
 
-            $result[$token[0]] = $token[2][1];
-        }
-
-        return $response->setResult($result);
+        return $silent ? new ResponseCollection : $this->result->responses()->untagged()->filter(
+            fn (UntaggedResponse $response) => $response->type()->is('FETCH')
+        );
     }
 
     /**
@@ -320,7 +310,7 @@ public function search(array $params): UntaggedResponse
 
         $this->assertTaggedResponse($tag, fn () => new RuntimeException('Failed to search messages'));
 
-        return $this->result->responses()->untagged()->firstWhere(
+        return $this->result->responses()->untagged()->firstOrFail(
             fn (UntaggedResponse $response) => $response->type()->is('SEARCH')
         );
     }
@@ -334,15 +324,15 @@ public function capability(): UntaggedResponse
 
         $this->assertTaggedResponse($tag, fn () => new RuntimeException('Failed to fetch capabilities'));
 
-        return $this->result->responses()->untagged()->firstWhere(
+        return $this->result->responses()->untagged()->firstOrFail(
             fn (UntaggedResponse $response) => $response->type()->is('CAPABILITY')
         );
     }
 
     /**
      * {@inheritDoc}
      */
-    public function id(?array $ids = null): ResponseCollection
+    public function id(?array $ids = null): UntaggedResponse
     {
         $token = 'NIL';
 
@@ -356,7 +346,13 @@ public function id(?array $ids = null): ResponseCollection
             $token = rtrim($token).')';
         }
 
-        return $this->requestAndResponse('ID', [$token], false);
+        $this->send('ID', [$token], tag: $tag);
+
+        $this->assertTaggedResponse($tag, fn () => new RuntimeException('Failed to send ID'));
+
+        return $this->result->responses()->untagged()->firstOrFail(
+            fn (UntaggedResponse $response) => $response->type()->is('CAPABILITY')
+        );
     }
 
     /**

src/Connection/Tokens/Atom.php

@@ -2,6 +2,9 @@
 
 namespace DirectoryTree\ImapEngine\Connection\Tokens;
 
+/**
+ * @see https://datatracker.ietf.org/doc/html/rfc9051#name-atom
+ */
 class Atom extends Token
 {
     /**

src/MessageQuery.php

@@ -655,6 +655,7 @@ public function getQuery(): string
      */
     protected function search(): Collection
     {
+        // If no conditions are set, default to fetching all.
         if (empty($this->conditions)) {
             $this->all();
         }

tests/ImapParserTest.php

@@ -149,6 +149,42 @@
     expect((string) $response5)->toBe('TAG2 OK FETCH completed');
 });
 
+test('parses list response', function () {
+    $stream = new FakeStream;
+    $stream->open();
+
+    $stream->feed([
+        '* LIST (\Marked \NoInferiors) "/" "inbox"',
+        '* LIST () "/" "Fruit"',
+        '* LIST () "/" "Fruit/Apple"',
+        '* LIST () "/" "Fruit/Banana"',
+    ]);
+
+    $tokenizer = new ImapTokenizer($stream);
+    $parser = new ImapParser($tokenizer);
+
+    $response1 = $parser->next();
+    $response2 = $parser->next();
+    $response3 = $parser->next();
+    $response4 = $parser->next();
+
+    expect($response1)->toBeInstanceOf(UntaggedResponse::class);
+    expect($response1->tokens())->toHaveCount(5);
+    expect((string) $response1)->toBe('* LIST (\Marked \NoInferiors) "/" "inbox"');
+
+    expect($response2)->toBeInstanceOf(UntaggedResponse::class);
+    expect($response2->tokens())->toHaveCount(5);
+    expect((string) $response2)->toBe('* LIST () "/" "Fruit"');
+
+    expect($response3)->toBeInstanceOf(UntaggedResponse::class);
+    expect($response3->tokens())->toHaveCount(5);
+    expect((string) $response3)->toBe('* LIST () "/" "Fruit/Apple"');
+
+    expect($response4)->toBeInstanceOf(UntaggedResponse::class);
+    expect($response4->tokens())->toHaveCount(5);
+    expect((string) $response4)->toBe('* LIST () "/" "Fruit/Banana"');
+});
+
 test('parses quota response', function () {
     $stream = new FakeStream;
     $stream->open();