Merge pull request #9648 from michalsn/fix/email-destruct

fix: SMTP connection resource validation in `Email` class destructor

Author: samsonasik

system/Debug/Toolbar/Collectors/Routes.php

@@ -51,7 +51,7 @@ class Routes extends BaseCollector
      * Returns the data of this collector to be formatted in the toolbar
      *
      * @return array{
-     *      matchedRoute: array<array{
+     *      matchedRoute: list<array{
      *          directory: string,
      *          controller: string,
      *          method: string,

system/Email/Email.php

@@ -263,7 +263,7 @@ class Email
     /**
      * SMTP Connection socket placeholder
      *
-     * @var resource|null
+     * @var false|resource|null
      */
     protected $SMTPConnect;
 
@@ -1886,7 +1886,7 @@ protected function SMTPEnd()
      */
     protected function SMTPConnect()
     {
-        if (is_resource($this->SMTPConnect)) {
+        if ($this->isSMTPConnected()) {
             return true;
         }
 
@@ -1910,7 +1910,7 @@ protected function SMTPConnect()
             $this->SMTPTimeout,
         );
 
-        if (! is_resource($this->SMTPConnect)) {
+        if (! $this->isSMTPConnected()) {
             $this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
 
             return false;
@@ -2227,7 +2227,7 @@ protected function mimeTypes($ext = '')
 
     public function __destruct()
     {
-        if ($this->SMTPConnect !== null) {
+        if ($this->isSMTPConnected()) {
             try {
                 $this->sendCommand('quit');
             } catch (ErrorException $e) {
@@ -2284,4 +2284,16 @@ protected function setArchiveValues(): array
 
         return $this->archive;
     }
+
+    /**
+     * Checks if there is an active SMTP connection.
+     *
+     * @return bool True if SMTP connection is established and open, false otherwise
+     */
+    protected function isSMTPConnected(): bool
+    {
+        return $this->SMTPConnect !== null
+            && $this->SMTPConnect !== false
+            && get_debug_type($this->SMTPConnect) !== 'resource (closed)';
+    }
 }

system/Router/RouteCollection.php

@@ -1724,7 +1724,7 @@ public function resetRoutes()
      * @return array<
      *     string,
      *     array{
-     *         filter?: string|list<string>, namespace?: string, hostname?: string,
+     *         filter?: list<string>|string, namespace?: string, hostname?: string,
      *         subdomain?: string, offset?: int, priority?: int, as?: string,
      *         redirect?: int
      *     }

system/Test/Mock/MockConnection.php

@@ -27,8 +27,8 @@ class MockConnection extends BaseConnection
 {
     /**
      * @var array{
-     *   connect?: object|resource|false|list<object|resource|false>,
-     *   execute?: object|resource|false,
+     *   connect?: false|list<false|object|resource>|object|resource,
+     *   execute?: false|object|resource,
      * }
      */
     protected $returnValues = [];

user_guide_src/source/changelogs/v4.6.3.rst

@@ -31,6 +31,7 @@ Bugs Fixed
 **********
 
 - **Email:** Fixed a bug with CID check when building email attachments.
+- **Email:** Fixed a bug with SMTP connection resource validation in the class destructor.
 
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_