fix: Email SMTP may throw Uncaught ErrorException

codeigniter4 · Jun 24, 2022 · c4022bb · c4022bb
1 parent 346fb6d
commit c4022bb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/system/Email/Email.php b/system/Email/Email.php
@@ -2144,7 +2144,13 @@ protected function mimeTypes($ext = '')
     public function __destruct()
     {
         if (is_resource($this->SMTPConnect)) {
-            $this->sendCommand('quit');
+            try {
+                $this->sendCommand('quit');
+            } catch (ErrorException $e) {
+                $protocol = $this->getProtocol();
+                $method   = 'sendWith' . ucfirst($protocol);
+                log_message('error', 'Email: ' . $method . ' throwed ' . $e);
+            }
         }
     }
 

diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockEmail;
+use ErrorException;
 
 /**
  * @internal
@@ -136,6 +137,24 @@ public function testFailureDoesNotTriggerEvent()
         $this->assertNull($result);
     }
 
+    public function testDestructDoesNotThrowException()
+    {
+        $email = $this->getMockBuilder(Email::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['sendCommand'])
+            ->getMock();
+        $email->method('sendCommand')
+            ->willThrowException(new ErrorException('SMTP Error.'));
+
+        // Force resource to be injected into the property
+        $SMTPConnect = fopen(__FILE__, 'rb');
+        $this->setPrivateProperty($email, 'SMTPConnect', $SMTPConnect);
+
+        $email->__destruct();
+
+        $this->assertTrue(true);
+    }
+
     private function createMockEmail(): MockEmail
     {
         $config           = config('Email');