Merge pull request #10052 from nextcloud/backport/10051/stable3.7

[stable3.7] fix: don't fail on missing mailbox stats
nextcloud · Aug 26, 2024 · cbe761e · cbe761e
2 parents d677efb + 792d5c9
commit cbe761e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/lib/IMAP/MailboxSync.php b/lib/IMAP/MailboxSync.php
@@ -163,7 +163,7 @@ public function sync(Account $account,
 	public function syncStats(Account $account, Mailbox $mailbox): void {
 		$client = $this->imapClientFactory->getClient($account);
 		try {
-			$stats = $this->folderMapper->getFoldersStatusAsObject($client, [$mailbox->getName()])[$mailbox->getName()];
+			$allStats = $this->folderMapper->getFoldersStatusAsObject($client, [$mailbox->getName()]);
 		} catch (Horde_Imap_Client_Exception $e) {
 			$id = $mailbox->getId();
 			throw new ServiceException(
@@ -175,6 +175,11 @@ public function syncStats(Account $account, Mailbox $mailbox): void {
 			$client->logout();
 		}
 
+		if (!isset($allStats[$mailbox->getName()])) {
+			return;
+		}
+
+		$stats = $allStats[$mailbox->getName()];
 		$mailbox->setMessages($stats->getTotal());
 		$mailbox->setUnseen($stats->getUnread());
 		$this->mailboxMapper->update($mailbox);

diff --git a/tests/Unit/IMAP/MailboxSyncTest.php b/tests/Unit/IMAP/MailboxSyncTest.php
@@ -247,4 +247,29 @@ public function testSyncStats(): void {
 		$this->assertEquals(42, $mailbox->getMessages());
 		$this->assertEquals(10, $mailbox->getUnseen());
 	}
+
+	public function testSyncStatsWithNoStats(): void {
+		$account = $this->createMock(Account::class);
+		$client = $this->createMock(Horde_Imap_Client_Socket::class);
+		$this->imapClientFactory->expects($this->once())
+			->method('getClient')
+			->with($account)
+			->willReturn($client);
+		$stats = new MailboxStats(42, 10, null);
+		$mailbox = new Mailbox();
+		$mailbox->setMessages(10);
+		$mailbox->setUnseen(6);
+		$mailbox->setName('mailbox');
+		$this->folderMapper->expects(self::once())
+			->method('getFoldersStatusAsObject')
+			->with($client, [$mailbox->getName()])
+			->willReturn(['otherMailbox' => $stats]);
+		$this->mailboxMapper->expects(self::never())
+			->method('update');
+
+		$this->sync->syncStats($account, $mailbox);
+
+		$this->assertEquals(10, $mailbox->getMessages());
+		$this->assertEquals(6, $mailbox->getUnseen());
+	}
 }