WIP

Author: stevebauman

src/Connection/Connection.php

@@ -337,7 +337,7 @@ public function nextReply(): Response
     /**
      * Send an IMAP command.
      */
-    public function send(string $name, array $tokens, ?string &$tag): void
+    public function send(string $name, array $tokens = [], ?string &$tag = null): void
     {
         $command = new ImapCommand($name, $tokens);
 
@@ -381,7 +381,7 @@ protected function write(string $data): void
      * This method compiles the FETCH command, sends it, and then uses the new parser
      * to obtain the parsed result.
      */
-    public function fetch(array|string $items, array|int $from, mixed $to = null, $identifier = Imap::ST_UID): Response
+    public function fetch(array|string $items, array|int $from, mixed $to = null, $identifier = Imap::ST_UID): UntaggedResponse
     {
         if (is_array($from) && count($from) > 1) {
             $set = implode(',', $from);
@@ -398,22 +398,16 @@ public function fetch(array|string $items, array|int $from, mixed $to = null, $i
         $items = (array) $items;
         $prefix = ($identifier === Imap::ST_UID) ? 'UID' : '';
 
-        // Send the FETCH command.
-        $response = $this->send(
+        $this->send(
             trim($prefix.' FETCH'),
             [$set, $this->escapeList($items)],
             $tag
         );
 
-        // Use the new parser to parse the FETCH response.
-        $tokenizer = new ImapTokenizer($this->stream);
-        $parser = new ImapParser($tokenizer);
-        $parsedData = $parser->next();
-
-        // Process $parsedData as needed; here we simply assign it.
-        $response->setResult($parsedData);
-
-        return $response;
+        return $this->assertUntaggedResponse(
+            fn (UntaggedResponse $response) => $response->tokenAt(2)?->is('FETCH'),
+            fn () => new RuntimeException('Failed to fetch items')
+        );
     }
 
     /**

src/Connection/ConnectionInterface.php

@@ -4,6 +4,7 @@
 
 use DirectoryTree\ImapEngine\Collections\ResponseCollection;
 use DirectoryTree\ImapEngine\Connection\Responses\TaggedResponse;
+use DirectoryTree\ImapEngine\Connection\Responses\UntaggedResponse;
 
 interface ConnectionInterface
 {
@@ -45,19 +46,17 @@ public function done(): void;
     /**
      * Send noop command.
      */
-    public function noop(): ResponseCollection;
+    public function noop(): TaggedResponse;
 
     /**
      * Apply session saved changes to the server.
      */
     public function expunge(): ResponseCollection;
 
     /**
-     * Get an array of available capabilities.
-     *
-     * @return ResponseCollection containing a list of capabilities
+     * Get the mailboxes available capabilities.
      */
-    public function capability(): ResponseCollection;
+    public function capability(): UntaggedResponse;
 
     /**
      * Execute a search request.
@@ -76,27 +75,27 @@ public function id(?array $ids = null): ResponseCollection;
     /**
      * Fetch message UIDs using the given message numbers.
      */
-    public function uids(int|array $msgns): ResponseCollection;
+    public function uids(int|array $msgns): UntaggedResponse;
 
     /**
      * Fetch message contents.
      */
-    public function contents(int|array $ids): ResponseCollection;
+    public function contents(int|array $ids): UntaggedResponse;
 
     /**
      * Fetch message headers.
      */
-    public function headers(int|array $ids): ResponseCollection;
+    public function headers(int|array $ids): UntaggedResponse;
 
     /**
      * Fetch message flags.
      */
-    public function flags(int|array $ids): ResponseCollection;
+    public function flags(int|array $ids): UntaggedResponse;
 
     /**
      * Fetch message sizes.
      */
-    public function sizes(int|array $ids): ResponseCollection;
+    public function sizes(int|array $ids): UntaggedResponse;
 
     /**
      * Select the given folder.
@@ -122,7 +121,7 @@ public function folders(string $reference = '', string $folder = '*'): ResponseC
      *
      * @return ResponseCollection list of STATUS items
      */
-    public function folderStatus(string $folder, array $arguments = ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY']): ResponseCollection;
+    public function folderStatus(string $folder, array $arguments = ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY']): UntaggedResponse;
 
     /**
      * Set message flags.
@@ -191,32 +190,32 @@ public function moveManyMessages(array $messages, string $folder): ResponseColle
      */
     public function createFolder(string $folder): ResponseCollection;
 
-    /**
-     * Rename an existing folder.
-     *
-     * @param  string  $oldPath  old name
-     * @param  string  $newPath  new name
-     */
-    public function renameFolder(string $oldPath, string $newPath): ResponseCollection;
-
     /**
      * Delete a folder.
      *
      * @param  string  $folder  folder name
      */
-    public function deleteFolder(string $folder): ResponseCollection;
+    public function deleteFolder(string $folder): TaggedResponse;
 
     /**
      * Subscribe to a folder.
      *
      * @param  string  $folder  folder name
      */
-    public function subscribeFolder(string $folder): ResponseCollection;
+    public function subscribeFolder(string $folder): TaggedResponse;
 
     /**
      * Unsubscribe from a folder.
      *
      * @param  string  $folder  folder name
      */
-    public function unsubscribeFolder(string $folder): ResponseCollection;
+    public function unsubscribeFolder(string $folder): TaggedResponse;
+
+    /**
+     * Rename an existing folder.
+     *
+     * @param  string  $oldPath  old name
+     * @param  string  $newPath  new name
+     */
+    public function renameFolder(string $oldPath, string $newPath): TaggedResponse;
 }