Fix #41 error imap_expunge(): supplied resource is not a valid imap resource (#42)

Author: parshikov

CHANGELOG.md

@@ -6,7 +6,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [UNRELEASED]
 ### Fixed
-- NaN
+- #41 imap_expunge(): supplied resource is not a valid imap resource
 
 ### Added
 - NaN

src/IMAP/Client.php

@@ -86,6 +86,12 @@ class Client {
      */
     protected $activeFolder = false;
 
+    /**
+     * Connected parameter
+     * @var bool
+     */
+    protected $connected = false;
+
     /**
      * Client constructor.
      *
@@ -148,7 +154,7 @@ public function setReadOnly($readOnly = true) {
      * @return bool
      */
     public function isConnected() {
-        return ($this->connection) ? true : false;
+        return $this->connected;
     }
 
     /**
@@ -191,6 +197,7 @@ public function connect($attempts = 3) {
                 $attempts,
                 config('imap.options.open')
             );
+            $this->connected = !! $this->connection;
         } catch (\ErrorException $e) {
             $errors = imap_errors();
             $message = $e->getMessage().'. '.implode("; ", (is_array($errors) ? $errors : array()));
@@ -208,8 +215,7 @@ public function connect($attempts = 3) {
      */
     public function disconnect() {
         if ($this->isConnected()) {
-            $this->expunge();
-            imap_close($this->connection);
+            $this->connected = ! imap_close($this->connection, CL_EXPUNGE);
         }
 
         return $this;
@@ -462,4 +468,4 @@ public function expunge(){
     public function checkCurrentMailbox(){
         return imap_check($this->connection);
     }
-}
+}