Folder status retrieval fixed and missing methods added

Author: Webklex

src/Connection/Protocols/ImapProtocol.php

@@ -536,25 +536,6 @@ public function getCapabilities(): Response {
         return $response->setResult($response->validatedData()[0]);
     }
 
-	/**
-	 * Get an array of available STATUS items
-	 *
-	 * @return Response list of STATUS items
-	 *
-	 * @throws ImapBadRequestException
-	 * @throws ImapServerErrorException
-	 * @throws RuntimeException
-	 * @throws ResponseException
-	 */
-	public function getStatus(): Response {
-		$s = implode(" ", $properties);
-		$response = $this->requestAndResponse('STATUS', array($this->escapeString($folder), "(" . $s . ")"));
-
-		if (!$response->getResponse()) return $response;
-
-		return $response->setResult($response->validatedData()[0]);
-	}
-
     /**
      * Examine and select have the same response.
      * @param string $command can be 'EXAMINE' or 'SELECT'
@@ -628,6 +609,42 @@ public function examineFolder(string $folder = 'INBOX'): Response {
         return $this->examineOrSelect('EXAMINE', $folder);
     }
 
+    /**
+     * Get the status of a given folder
+     *
+     * @param string $folder
+     * @param string[] $arguments
+     * @return Response list of STATUS items
+     *
+     * @throws ImapBadRequestException
+     * @throws ImapServerErrorException
+     * @throws ResponseException
+     * @throws RuntimeException
+     */
+    public function folderStatus(string $folder = 'INBOX', $arguments = ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY']): Response {
+        $response = $this->requestAndResponse('STATUS', [$this->escapeString($folder), $this->escapeList($arguments)], false);
+        $data = $response->validatedData();
+
+        if (!isset($data[0]) || !isset($data[0][2])) {
+            throw new RuntimeException("folder status could not be fetched");
+        }
+
+        $result = [];
+        $key = null;
+        foreach($data[0][2] as $value) {
+            if ($key === null) {
+                $key = $value;
+            } else {
+                $result[$key] = (int)$value;
+                $key = null;
+            }
+        }
+
+        $response->setResult($result);
+
+        return $response;
+    }
+
     /**
      * Fetch one or more items of one or more messages
      * @param array|string $items items to fetch [RFC822.HEADER, FLAGS, RFC822.TEXT, etc]

src/Connection/Protocols/LegacyProtocol.php

@@ -236,6 +236,16 @@ public function examineFolder(string $folder = 'INBOX'): Response {
         });
     }
 
+    /**
+     * Get the status of a given folder
+     *
+     * @return Response list of STATUS items
+     * @throws MethodNotSupportedException
+     */
+    public function folderStatus(string $folder = 'INBOX', $arguments = ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY']): Response {
+        throw new MethodNotSupportedException();
+    }
+
     /**
      * Fetch message content
      * @param int|array $uids

src/Connection/Protocols/ProtocolInterface.php

@@ -117,6 +117,17 @@ public function selectFolder(string $folder = 'INBOX'): Response;
      */
     public function examineFolder(string $folder = 'INBOX'): Response;
 
+    /**
+     * Get the status of a given folder
+     *
+     * @return Response list of STATUS items
+     *
+     * @throws ImapBadRequestException
+     * @throws ImapServerErrorException
+     * @throws RuntimeException
+     */
+    public function folderStatus(string $folder = 'INBOX', $arguments = ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY']): Response;
+
     /**
      * Fetch message headers
      * @param int|array $uids

src/Folder.php

@@ -491,28 +491,6 @@ public function idle(callable $callback, int $timeout = 300): void {
         }
     }
 
-	/**
-	 * Get the standard folder status items from STATUS command
-	 *
-	 * @return array
-	 * @throws ConnectionFailedException
-	 * @throws ImapbadRequestException
-	 * @throws ImapServerErrorException
-	 * @throws RuntimeException
-	 * @throws AuthFailedException
-	 * @throws ResponseException
-	 */
-	public function getFolderStatus(string $folder, array $properties): array {
-		$status = $client->getConnection()->getStatus($folder->full_name, array('MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY'))->validatedData();
-		$c = count($status[2]);
-		$s = array();
-		for ($i = 0; $i < $c; $i++) {
-			$a = $i++;
-			$s[$status[2][$a]] = $status[2][$i];
-		}
-		return $s;
-	}
-
     /**
      * Get folder status information from the EXAMINE command
      *
@@ -525,7 +503,7 @@ public function getFolderStatus(string $folder, array $properties): array {
      * @throws ResponseException
      */
     public function getStatus(): array {
-        return $this->examine();
+        return $this->client->getConnection()->folderStatus($this->path, ['MESSAGES', 'UNSEEN', 'RECENT', 'UIDNEXT', 'UIDVALIDITY'])->validatedData();
     }
 
     /**