coverage

Author: francescobianco

Makefile

@@ -14,6 +14,9 @@ dump-autoload:
 imap2-coverage:
 	@docker-compose run --rm imap2 ./vendor/bin/phpunit tests --coverage-html docs/coverage
 
+imap2-test:
+	@docker-compose run --rm imap2 ./vendor/bin/phpunit tests --stop-on-failure
+
 coverage:
 	@docker-compose run --rm phpunit tests --coverage-html docs/coverage
 

bootstrap.php

@@ -183,6 +183,10 @@ function imap_open($mailbox, $user, $password, $flags = 0, $retries = 0, $option
 if (!function_exists('imap2_open')) {
     function imap2_open($mailbox, $user, $password, $flags = 0, $retries = 0, $options = [])
     {
+        if (IMAP2_RETROFIT_MODE && !($flags & OP_XOAUTH2)) {
+            return imap_open($mailbox, $user, $password, $flags, $retries, $options);
+        }
+
         return Connection::open($mailbox, $user, $password, $flags, $retries, $options);
     }
 }

src/Connection.php

@@ -50,21 +50,22 @@ public function __construct($mailbox, $user, $password, $flags = 0, $retries = 0
     }
 
     /**
-     * Extract input value using input name from the context otherwise get back a default value.
+     * Open an IMAP stream to a mailbox.
+     *
+     * @param $mailbox
+     * @param $user
+     * @param $password
+     * @param int $flags
+     * @param int $retries
+     * @param array $options
      *
-     * @param $inputName
-     * @param $defaultValue
      * @return void
      */
     public static function open($mailbox, $user, $password, $flags = 0, $retries = 0, $options = [])
     {
-        if ($flags & OP_XOAUTH2 || !function_exists('imap_open')) {
-            $connection = new Connection($mailbox, $user, $password, $flags, $retries, $options);
-
-            return $connection->connect();
-        }
+        $connection = new Connection($mailbox, $user, $password, $flags, $retries, $options);
 
-        return imap_open($mailbox, $user, $password, $flags, $retries, $options);
+        return $connection->connect();
     }
 
     public static function reopen($imap, $mailbox, $flags = 0, $retries = 0)

tests/CompatibilityTest.php

@@ -21,7 +21,11 @@ public function testOpenAndClose()
         $imap1 = imap_open($this->mailbox, $this->username, $this->password);
         $imap2 = imap2_open($this->mailbox, $this->username, $this->accessToken, OP_XOAUTH2);
 
-        $this->assertTrue(is_resource($imap1));
+        if (IMAP2_RETROFIT_MODE) {
+            $this->assertTrue(is_resource($imap1));
+        } else {
+            $this->assertInstanceOf(Connection::class, $imap1);
+        }
         $this->assertInstanceOf(Connection::class, $imap2);
 
         $close1 = imap_close($imap1);