fix

Author: francescobianco

README.md

@@ -115,7 +115,7 @@
 
 ## Gmail OAuth
 
-Scope: 
+Scope: https://mail.google.com/
 
 ## Reference
 

src/Connection.php

@@ -27,6 +27,7 @@ class Connection
     protected $sslMode;
     protected $currentMailbox;
     protected $connected;
+    protected $registry;
 
     /**
      *
@@ -248,4 +249,30 @@ public static function isValid($imap)
     {
         return is_a($imap, Connection::class) && $imap->isConnected();
     }
+
+    public function setRegistryValue($space, $item, $key, $value)
+    {
+        if (empty($this->registry)) {
+            $this->registry = [];
+        }
+
+        if (empty($this->registry[$space])) {
+            $this->registry[$space] = [];
+        }
+
+        if (empty($this->registry[$space][$item])) {
+            $this->registry[$space][$item] = [];
+        }
+
+        $this->registry[$space][$item][$key] = $value;
+    }
+
+    public function getRegistryValue($space, $item, $key)
+    {
+        if (isset($this->registry[$space][$item][$key])) {
+            return $this->registry[$space][$item][$key];
+        }
+
+        return false;
+    }
 }

src/ImapClient.php

@@ -75,6 +75,7 @@ class ImapClient
     const COMMAND_CAPABILITY = 2;
     const COMMAND_LASTLINE   = 4;
     const COMMAND_ANONYMIZED = 8;
+    const COMMAND_RAW_LASTLINE = 16;
 
     const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n
 
@@ -3801,6 +3802,11 @@ public function execute($command, $arguments = array(), $options = 0, $filter =
             $response = preg_replace("/^$tag (OK|NO|BAD|BYE|PREAUTH)?\s*(\[[a-z-]+\])?\s*/i", '', trim($line));
         }
 
+        // return raw last line only (without command tag, result and response code)
+        if ($line && ($options & self::COMMAND_RAW_LASTLINE)) {
+            $response = preg_replace("/^$tag (OK|NO|BAD|BYE|PREAUTH)?\s*/i", '', trim($line));
+        }
+
         return $noresp ? $code : array($code, $response);
     }
 

src/Mailbox.php

@@ -269,12 +269,16 @@ public static function deleteMailbox($imap, $mailbox)
             $mailbox = (string) \preg_replace('/^{.+}/', '', $mailbox);
         }
 
-        $result = $client->execute('DELETE', array($client->escape($mailbox)), ImapClient::COMMAND_LASTLINE);
+        $result = $client->execute('DELETE', array($client->escape($mailbox)), ImapClient::COMMAND_RAW_LASTLINE);
 
         $success = $result[0] == ImapClient::ERROR_OK;
 
-        if (!$success) {
+        if (!$success && $imap->getRegistryValue('mailbox', $mailbox, 'deleted')) {
+            Errors::appendError($result[1]);
+        } elseif (!$success) {
             Errors::appendError("Can't delete mailbox {$mailbox}: no such mailbox");
+        } else {
+            $imap->setRegistryValue('mailbox', $mailbox, 'deleted', true);
         }
 
         return $success;

tests/CompatibilityTest.php

@@ -366,6 +366,23 @@ public function testDeleteMailbox()
         $this->assertEquals($imapAlerts1, $imapAlerts2);
         $this->assertEquals($imapErrors1, $imapErrors2);
 
+        $newMailboxName1 = uniqid('new-mailbox-');
+        imap_createmailbox($imap1, $this->mailbox.$newMailboxName1);
+        imap_deletemailbox($imap1, $this->mailbox.$newMailboxName1);
+        imap_deletemailbox($imap1, $this->mailbox.$newMailboxName1);
+        $imapAlerts1 = imap_alerts();
+        $imapErrors1 = imap_errors();
+
+        $newMailboxName2 = uniqid('new-mailbox-');
+        imap2_createmailbox($imap2, $this->mailbox.$newMailboxName2);
+        imap2_deletemailbox($imap2, $this->mailbox.$newMailboxName2);
+        imap2_deletemailbox($imap2, $this->mailbox.$newMailboxName2);
+        $imapAlerts2 = imap2_alerts();
+        $imapErrors2 = imap2_errors();
+
+        $this->assertEquals($imapAlerts1, $imapAlerts2);
+        $this->assertEquals($imapErrors1, $imapErrors2);
+
         imap_close($imap1);
         imap2_close($imap2);
     }