fix

Author: francescobianco

Makefile

@@ -83,6 +83,9 @@ test-ping:
 test-get-mailboxes:
 	@docker-compose run --rm phpunit tests --filter CompatibilityTest::testGetMailboxes
 
+test-delete-mailbox:
+	@docker-compose run --rm phpunit tests --filter CompatibilityTest::testDeleteMailbox
+
 test-xoauth:
 	@docker-compose run --rm phpunit tests --filter XoauthTest
 

README.md

@@ -113,6 +113,10 @@
 - [ ] imap_timeout
 - [ ] imap_undelete
 
+## Gmail OAuth
+
+Scope: 
+
 ## Reference
 
 - <https://www.atmail.com/blog/imap-commands/>

src/Errors.php

@@ -15,14 +15,44 @@
 
 class Errors
 {
+    protected static $alerts = [];
+
+    protected static $errors = [];
+
+    public static function appendAlert($alert)
+    {
+        self::$alerts[] = $alert;
+    }
+
+    public static function appendError($error)
+    {
+        self::$errors[] = $error;
+    }
+
     public static function alerts()
     {
-        return false;
+        if (empty(self::$alerts)) {
+            return false;
+        }
+
+        $return = self::$alerts;
+
+        self::$alerts = [];
+
+        return $return;
     }
 
     public static function errors()
     {
-        return false;
+        if (empty(self::$errors)) {
+            return false;
+        }
+
+        $return = self::$errors;
+
+        self::$errors = [];
+
+        return $return;
     }
 
     public static function lastError()

src/Mailbox.php

@@ -264,8 +264,21 @@ public static function deleteMailbox($imap, $mailbox)
         }
 
         $client = $imap->getClient();
+        $client->setDebug(true);
 
-        return $client->deleteFolder($mailbox);
+        if ($mailbox[0] == '{') {
+            $mailbox = (string) \preg_replace('/^{.+}/', '', $mailbox);
+        }
+
+        $result = $client->execute('DELETE', array($client->escape($mailbox)), ImapClient::COMMAND_LASTLINE);
+
+        $success = $result[0] == ImapClient::ERROR_OK;
+
+        if (empty($success)) {
+            Errors::appendError("Can't delete mailbox {$mailbox}: no such mailbox");
+        }
+
+        return $success;
     }
 
     /**

tests/CompatibilityTest.php

@@ -343,6 +343,33 @@ public function testCreateMailbox()
         imap2_close($imap2);
     }
 
+    public function testDeleteMailbox()
+    {
+        $imap1 = imap_open($this->mailbox, $this->username, $this->password);
+        $imap2 = imap2_open($this->mailbox, $this->username, $this->accessToken, OP_XOAUTH2);
+
+        // Reset error buffers
+        imap_alerts();
+        imap_errors();
+        imap2_alerts();
+        imap2_errors();
+
+        $unknownMailbox = 'the-unknown-mailbox';
+        $deleteMailbox1 = imap_deletemailbox($imap1, $unknownMailbox);
+        $imapAlerts1 = imap_alerts();
+        $imapErrors1 = imap_errors();
+        $deleteMailbox2 = imap2_deletemailbox($imap2, $unknownMailbox);
+        $imapAlerts2 = imap2_alerts();
+        $imapErrors2 = imap2_errors();
+
+        $this->assertEquals($deleteMailbox1, $deleteMailbox2);
+        $this->assertEquals($imapAlerts1, $imapAlerts2);
+        $this->assertEquals($imapErrors1, $imapErrors2);
+
+        imap_close($imap1);
+        imap2_close($imap2);
+    }
+
     public function testCopy()
     {
         $imap1 = imap_open($this->mailbox, $this->username, $this->password);