Extract message response parsing into static class

Author: stevebauman

src/Connection/Responses/MessageResponseParser.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace DirectoryTree\ImapEngine\Connection\Responses;
+
+class MessageResponseParser
+{
+    /**
+     * Get the flags from an untagged response.
+     *
+     * @return array<string, string[]>
+     */
+    public static function getFlags(UntaggedResponse $response): array
+    {
+        $data = $response->tokenAt(3);
+
+        $uid = $data->lookup('UID')->value;
+        $flags = $data->lookup('FLAGS')->values();
+
+        return [$uid => $flags];
+    }
+
+    /**
+     * Get the body header from an untagged response.
+     *
+     * @return array<string, string>
+     */
+    public static function getBodyHeader(UntaggedResponse $response): array
+    {
+        $data = $response->tokenAt(3);
+
+        $uid = $data->lookup('UID')->value;
+        $headers = $data->lookup('[HEADER]')->value;
+
+        return [$uid => $headers];
+    }
+
+    /**
+     * Get the body text from an untagged response.
+     *
+     * @return array<string, string>
+     */
+    public static function getBodyText(UntaggedResponse $response): array
+    {
+        $data = $response->tokenAt(3);
+
+        $uid = $data->lookup('UID')->value;
+        $contents = $data->lookup('[TEXT]')->value;
+
+        return [$uid => $contents];
+    }
+}

src/MessageQuery.php

@@ -6,6 +6,7 @@
 use DirectoryTree\ImapEngine\Collections\ResponseCollection;
 use DirectoryTree\ImapEngine\Connection\ConnectionInterface;
 use DirectoryTree\ImapEngine\Connection\ImapQueryBuilder;
+use DirectoryTree\ImapEngine\Connection\Responses\MessageResponseParser;
 use DirectoryTree\ImapEngine\Connection\Responses\UntaggedResponse;
 use DirectoryTree\ImapEngine\Connection\Tokens\Atom;
 use DirectoryTree\ImapEngine\Enums\ImapFetchIdentifier;
@@ -336,36 +337,15 @@ protected function fetch(Collection $messages): array
 
         $flags = $this->fetchFlags ? $this->connection()
             ->flags($uids)
-            ->mapWithKeys(function (UntaggedResponse $response) {
-                $data = $response->tokenAt(3);
-
-                $uid = $data->lookup('UID')->value;
-                $flags = $data->lookup('FLAGS')->values();
-
-                return [$uid => $flags];
-            }) : new Collection;
+            ->mapWithKeys(MessageResponseParser::getFlags(...))->all() : [];
 
         $headers = $this->fetchHeaders ? $this->connection()
             ->bodyHeader($uids, $this->fetchAsUnread)
-            ->mapWithKeys(function (UntaggedResponse $response) {
-                $data = $response->tokenAt(3);
-
-                $uid = $data->lookup('UID')->value;
-                $headers = $data->lookup('[HEADER]')->value;
-
-                return [$uid => $headers];
-            }) : new Collection;
+            ->mapWithKeys(MessageResponseParser::getBodyHeader(...))->all() : [];
 
         $contents = $this->fetchBody ? $this->connection()
             ->bodyText($uids, $this->fetchAsUnread)
-            ->mapWithKeys(function (UntaggedResponse $response) {
-                $data = $response->tokenAt(3);
-
-                $uid = $data->lookup('UID')->value;
-                $contents = $data->lookup('[TEXT]')->value;
-
-                return [$uid => $contents];
-            }) : new Collection;
+            ->mapWithKeys(MessageResponseParser::getBodyText(...)) : [];
 
         return [
             'uids' => $uids,
@@ -380,13 +360,7 @@ protected function fetch(Collection $messages): array
      */
     protected function newMessage(int $uid, array $flags, string $headers, string $contents): Message
     {
-        return new Message(
-            $this->folder,
-            $uid,
-            $flags,
-            $headers,
-            $contents,
-        );
+        return new Message($this->folder, $uid, $flags, $headers, $contents);
     }
 
     /**
@@ -446,11 +420,11 @@ public function get(): MessageCollection
      */
     public function append(string $message, mixed $flags = null): int
     {
-        $result = $this->connection()->append(
+        $response = $this->connection()->append(
             $this->folder->path(), $message, Str::enums($flags),
         );
 
-        return $result // TAG4 OK [APPENDUID <uidvalidity> <uid>] APPEND completed.
+        return $response // TAG4 OK [APPENDUID <uidvalidity> <uid>] APPEND completed.
             ->tokenAt(2) // [APPENDUID <uidvalidity> <uid>]
             ->tokenAt(2) // <uid>
             ->value;