coverage

Author: francescobianco

bootstrap.php

@@ -197,12 +197,16 @@ function imap2_open($mailbox, $user, $password, $flags = 0, $retries = 0, $optio
 if (!function_exists('imap_reopen')) {
     function imap_reopen($imap, $mailbox, $flags = 0, $retries = 0)
     {
-        return Connection::reopen($imap, $mailbox, $flags, $retries);
+        return imap2_reopen($imap, $mailbox, $flags, $retries);
     }
 }
 if (!function_exists('imap2_reopen')) {
     function imap2_reopen($imap, $mailbox, $flags = 0, $retries = 0)
     {
+        if (IMAP2_RETROFIT_MODE && is_resource($imap) && get_resource_type($imap) == 'imap') {
+            return imap_reopen($imap, $mailbox, $flags, $retries);
+        }
+
         return Connection::reopen($imap, $mailbox, $flags, $retries);
     }
 }

src/Connection.php

@@ -32,21 +32,27 @@ class Connection
      */
     public function __construct($mailbox, $user, $password, $flags = 0, $retries = 0, $options = [])
     {
-        $this->mailbox = $mailbox;
         $this->user = $user;
         $this->password = $password;
         $this->flags = $flags;
         $this->retries = $retries;
         $this->options = $options;
 
+        $this->openMailbox($mailbox);
+
+        $this->client = new ImapClient();
+    }
+
+    public function openMailbox($mailbox)
+    {
+        $this->mailbox = $mailbox;
+
         $mailboxParts = Functions::parseMailboxString($mailbox);
 
         $this->host = Functions::getHostFromMailbox($mailboxParts);
         $this->port = $mailboxParts['port'];
         $this->sslMode = Functions::getSslModeFromMailbox($mailboxParts);
         $this->currentMailbox = $mailboxParts['mailbox'];
-
-        $this->client = new ImapClient();
     }
 
     /**
@@ -70,13 +76,15 @@ public static function open($mailbox, $user, $password, $flags = 0, $retries = 0
 
     public static function reopen($imap, $mailbox, $flags = 0, $retries = 0)
     {
-        if (is_a($imap, Connection::class)) {
-            $client = $imap->getClient();
-
-            return true;
+        if (!is_a($imap, Connection::class)) {
+            return Errors::invalidImapConnection(debug_backtrace(), 1, null);
         }
 
-        return imap_reopen($imap, $mailbox, $flags, $retries);
+        $imap->openMailbox($mailbox);
+
+        $success = $imap->connect();
+
+        return boolval($success);
     }
 
     public static function ping($imap)
@@ -157,7 +165,7 @@ public function getHost()
     /**
      *
      */
-    public function openMailbox()
+    public function selectMailbox()
     {
         $this->client->select($this->currentMailbox);
     }

src/Mailbox.php

@@ -16,7 +16,7 @@ class Mailbox
     public static function check($imap)
     {
         if (is_a($imap, Connection::class)) {
-            $imap->openMailbox();
+            $imap->selectMailbox();
 
             $client = $imap->getClient();
             $status = $client->status($imap->getMailboxName(), ['MESSAGES', 'RECENT']);
@@ -44,7 +44,7 @@ public static function numMsg($imap)
             return Errors::invalidImapConnection(debug_backtrace(), 1, false);
         }
 
-        $imap->openMailbox();
+        $imap->selectMailbox();
         $client = $imap->getClient();
 
         $status = $client->status($imap->getMailboxName(), ['MESSAGES']);
@@ -56,7 +56,7 @@ public static function numRecent($imap)
     {
         if (is_a($imap, Connection::class)) {
             $client = $imap->getClient();
-            $imap->openMailbox();
+            $imap->selectMailbox();
 
             return (object) [
                 'Driver' => 'imap',