coverage

Author: francescobianco

Makefile

@@ -77,6 +77,9 @@ test-num-msg:
 test-ping:
 	@docker-compose run --rm phpunit tests --filter CompatibilityTest::testPing
 
+test-get-mailboxes:
+	@docker-compose run --rm phpunit tests --filter CompatibilityTest::testGetMailboxes
+
 test-xoauth:
 	@docker-compose run --rm phpunit tests --filter XoauthTest
 

src/Connection.php

@@ -104,6 +104,7 @@ protected function connect()
             'ssl_mode' => $this->sslMode,
             'auth_type' => $this->flags & OP_XOAUTH2 ? 'XOAUTH2' : 'CHECK',
             'timeout' => -1,
+            'force_caps' => false,
         ]);
 
         if (empty($success)) {
@@ -137,7 +138,6 @@ public function getMailbox()
         return $this->mailbox;
     }
 
-
     /**
      *
      */
@@ -146,6 +146,14 @@ public function getMailboxName()
         return $this->currentMailbox;
     }
 
+    /**
+     *
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
     /**
      *
      */

src/Functions.php

@@ -108,4 +108,40 @@ public static function writeAddressFromEnvelope($addressList)
 
         return implode(', ', $sanitizedAddress);
     }
+
+    /**
+     *
+     */
+    public static function getListAttributesValue($attributes)
+    {
+        $attributesValue = 0;
+
+        foreach ($attributes as $attribute) {
+            switch ($attribute) {
+                case '\\NoInferiors':
+                    $attributesValue |= LATT_NOINFERIORS;
+                    break;
+                case '\\NoSelect':
+                    $attributesValue |= LATT_NOSELECT;
+                    break;
+                case '\\Marked':
+                    $attributesValue |= LATT_MARKED;
+                    break;
+                case '\\UnMarked':
+                    $attributesValue |= LATT_UNMARKED;
+                    break;
+                case '\\Referral':
+                    $attributesValue |= LATT_REFERRAL;
+                    break;
+                case '\\HasChildren':
+                    $attributesValue |= LATT_HASCHILDREN;
+                    break;
+                case '\\HasNoChildren':
+                    $attributesValue |= LATT_HASNOCHILDREN;
+                    break;
+            }
+        }
+
+        return $attributesValue;
+    }
 }

src/ImapClient.php

@@ -146,7 +146,7 @@ protected function putLineC($string, $endln=true, $anonymized=false)
         $res = 0;
         if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
             for ($i=0, $cnt=count($parts); $i<$cnt; $i++) {
-                if (preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
+                if (isset($parts[$i+1]) && preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
                     // LITERAL+ support
                     if ($this->prefs['literal+']) {
                         $parts[$i+1] = sprintf("{%d+}\r\n", $matches[1]);
@@ -1592,6 +1592,8 @@ protected function _listMailboxes($ref, $mailbox, $subscribed=false,
             if (!empty($opts)) {
                 $rets = array_merge($rets, $opts);
             }
+        } else {
+            $lstatus = false;
         }
 
         if (!empty($rets)) {

src/Mailbox.php

@@ -212,13 +212,20 @@ public static function getMailboxes($imap, $reference, $pattern)
 
         $referenceParts = explode('}', $reference);
         $client = $imap->getClient();
+        $client->setDebug(true);
         $return = [];
+        $delimiter = $client->getHierarchyDelimiter();
         $mailboxes = $client->listMailboxes($referenceParts[1], $pattern);
         foreach ($mailboxes as $mailbox) {
-            if (in_array('\\Noselect', $client->data['LIST'][$mailbox])) {
-                continue;
+            $attributesValue = Functions::getListAttributesValue($client->data['LIST'][$mailbox]);
+            if ($mailbox == '[Gmail]' && $imap->getHost() == 'imap.gmail.com') {
+                $attributesValue = 34;
             }
-            $return[] = $referenceParts[0].'}'.$mailbox;
+            $return[] = (object) [
+                'name' => $referenceParts[0].'}'.$mailbox,
+                'attributes' => $attributesValue,
+                'delimiter' => $delimiter,
+            ];
         }
 
         return $return;

tests/CompatibilityTest.php

@@ -177,6 +177,23 @@ public function testStatus()
         imap2_close($imap2);
     }
 
+    public function testGetMailboxes()
+    {
+        $imap1 = imap_open($this->mailbox, $this->username, $this->password);
+        $imap2 = imap2_open($this->mailbox, $this->username, $this->accessToken, OP_XOAUTH2);
+
+        $mailboxes1 = imap_getmailboxes($imap1, $this->mailbox, '*');
+        $mailboxes2 = imap2_getmailboxes($imap2, $this->mailbox, '*');
+
+        file_put_contents('l1.json', json_encode($mailboxes1, JSON_PRETTY_PRINT));
+        file_put_contents('l2.json', json_encode($mailboxes2, JSON_PRETTY_PRINT));
+
+        $this->assertEquals($mailboxes1, $mailboxes2);
+
+        imap_close($imap1);
+        imap2_close($imap2);
+    }
+
     public function testAlerts()
     {
         @imap_open('wrong-mailbox', $this->username, $this->password);