classes simplified

Author: Webklex

CHANGELOG.md

@@ -26,6 +26,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - [Protocol::class](src/Connection/Protocols/Protocol.php)
 - [Query::class](src/Query/Query.php)
 - [WhereQuery::class](src/Query/WhereQuery.php)
+- [Message::class](src/Message.php)
 
 ### Breaking changes
 - All protocol methods which had a `boolean` `$uid` option no longer support a boolean. Use `IMAP::ST_UID` or `IMAP::NIL` instead. If you want to use an alternative to `UID` just use the string instead.

src/Connection/Protocols/ImapProtocol.php

@@ -556,7 +556,7 @@ public function fetch($items, $from, $to = null, $uid = IMAP::ST_UID) {
         $items = (array)$items;
         $itemList = $this->escapeList($items);
 
-        $this->sendRequest(trim($this->getUIDKey($uid) . ' FETCH'), [$set, $itemList], $tag);
+        $this->sendRequest($this->buildUIDCommand("FETCH", $uid), [$set, $itemList], $tag);
         $result = [];
         $tokens = null; // define $tokens variable before first use
         while (!$this->readLine($tokens, $tag)) {
@@ -753,33 +753,20 @@ public function folders($reference = '', $folder = '*') {
      * @throws RuntimeException
      */
     public function store(array $flags, $from, $to = null, $mode = null, $silent = true, $uid = IMAP::ST_UID, $item = null) {
-        if ($item === null) {
-            $item = 'FLAGS';
-        }
-        if ($mode == '+' || $mode == '-') {
-            $item = $mode . $item;
-        }
-
-        if ($silent) {
-            $item .= '.SILENT';
-        }
-
         $flags = $this->escapeList($flags);
-        $set = (int)$from;
-        if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
-        }
+        $set = $this->buildSet($from, $to);
 
-        $command = ($uid ? "UID " : "")."STORE";
-        $result = $this->requestAndResponse($command, [$set, $item, $flags], $silent);
+        $command = $this->buildUIDCommand("STORE", $uid);
+        $item = ($mode == '-' ? "-" : "+").($item === null ? "FLAGS" : $item).($silent ? '.SILENT' : "");
+
+        $response = $this->requestAndResponse($command, [$set, $item, $flags], $silent);
 
         if ($silent) {
-            return (bool)$result;
+            return (bool)$response;
         }
 
-        $tokens = $result;
         $result = [];
-        foreach ($tokens as $token) {
+        foreach ($response as $token) {
             if ($token[1] != 'FETCH' || $token[2][0] != 'FLAGS') {
                 continue;
             }
@@ -826,11 +813,8 @@ public function appendMessage($folder, $message, $flags = null, $date = null) {
      * @throws RuntimeException
      */
     public function copyMessage($folder, $from, $to = null, $uid = IMAP::ST_UID) {
-        $set = (int)$from;
-        if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
-        }
-        $command = trim($this->getUIDKey($uid)." COPY");
+        $set = $this->buildSet($from, $to);
+        $command = $this->buildUIDCommand("COPY", $uid);
         return $this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
     }
 
@@ -846,7 +830,7 @@ public function copyMessage($folder, $from, $to = null, $uid = IMAP::ST_UID) {
      * @throws RuntimeException
      */
     public function copyManyMessages($messages, $folder, $uid = IMAP::ST_UID) {
-        $command = trim($this->getUIDKey($uid)." COPY");
+        $command = $this->buildUIDCommand("COPY", $uid);
 
         $set = implode(',', $messages);
         $tokens = [$set, $this->escapeString($folder)];
@@ -867,11 +851,8 @@ public function copyManyMessages($messages, $folder, $uid = IMAP::ST_UID) {
      * @throws RuntimeException
      */
     public function moveMessage($folder, $from, $to = null, $uid = IMAP::ST_UID) {
-        $set = (int)$from;
-        if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
-        }
-        $command = trim($this->getUIDKey($uid)." MOVE");
+        $set = $this->buildSet($from, $to);
+        $command = $this->buildUIDCommand("MOVE", $uid);
 
         return $this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
     }
@@ -887,7 +868,7 @@ public function moveMessage($folder, $from, $to = null, $uid = IMAP::ST_UID) {
      * @throws RuntimeException
      */
     public function moveManyMessages($messages, $folder, $uid = IMAP::ST_UID) {
-        $command = trim($this->getUIDKey($uid)." MOVE");
+        $command = $this->buildUIDCommand("MOVE", $uid);
 
         $set = implode(',', $messages);
         $tokens = [$set, $this->escapeString($folder)];
@@ -1048,8 +1029,8 @@ public function done() {
      * @throws RuntimeException
      */
     public function search(array $params, $uid = IMAP::ST_UID) {
-        $token = trim($this->getUIDKey($uid)." SEARCH");
-        $response = $this->requestAndResponse($token, $params);
+        $command = $this->buildUIDCommand("SEARCH", $uid);
+        $response = $this->requestAndResponse($command, $params);
         if (!$response) {
             return $response;
         }
@@ -1106,4 +1087,19 @@ public function enableDebug(){
     public function disableDebug(){
         $this->debug = false;
     }
+
+    /**
+     * Build a valid UID number set
+     * @param $from
+     * @param null $to
+     *
+     * @return int|string
+     */
+    public function buildSet($from, $to = null) {
+        $set = (int)$from;
+        if ($to !== null) {
+            $set .= ':' . ($to == INF ? '*' : (int)$to);
+        }
+        return $set;
+    }
 }

src/Connection/Protocols/Protocol.php

@@ -238,4 +238,8 @@ public function getUIDKey($uid) {
         return "";
     }
 
+    public function buildUIDCommand($command, $uid) {
+        return trim($this->getUIDKey($uid)." ".$command);
+    }
+
 }