fixing unit tests & get mailbox status once for all boxes

lib/account.php

@@ -123,6 +123,7 @@ class Account {
 		$conn->createMailbox($mailBox);
 		$this->mailboxes = null;
 
+//		$mailBox = \Horde_Imap_Client_Mailbox::get($mailBox, false)->utf7imap;
 		return $this->getMailbox($mailBox);
 	}
 
@@ -203,8 +204,19 @@ class Account {
 	public function getListArray() {
 
 		$folders = array();
-		foreach ($this->getMailboxes() as $mailbox) {
-			$folders[] = $mailbox->getListArray($this->getId());
+		$mailBoxes = $this->getMailboxes();
+		$mailBoxNames = array_map(function($mb) {
+			/** @var Mailbox $mb */
+			return $mb->getFolderId();
+		}, array_filter($mailBoxes, function($mb) {
+			/** @var Mailbox $mb */
+			return (!$mb instanceof SearchMailbox) && (!in_array('\noselect', $mb->attributes()));
+		}));
+
+		$status = $this->getImapConnection()->status($mailBoxNames);
+		foreach ($mailBoxes as $mailbox) {
+			$s = isset($status[$mailbox->getFolderId()]) ? $status[$mailbox->getFolderId()] : null;
+			$folders[] = $mailbox->getListArray($this->getId(), $s);
 		}
 		return array(
 			'id'             => $this->getId(),
@@ -517,5 +529,14 @@ class Account {
 
 		return $changedBoxes;
 	}
+
+	public function reconnect() {
+		$this->mailboxes = null;
+		if ($this->client) {
+			$this->client->close();
+			$this->client = null;
+		}
+		$this->getImapConnection();
+	}
 }
 

lib/mailbox.php

@@ -124,6 +124,10 @@ class Mailbox {
 		return $messages;
 	}
 
+	public function attributes() {
+		return $this->attributes;
+	}
+
 	/**
 	 * @param $messageId
 	 * @return Message