Merge remote-tracking branch 'upstream/develop' into 4.7

Author: paulbalandan

app/Config/Filters.php

@@ -65,7 +65,10 @@ class Filters extends BaseFilters
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     * @var array{
+     *     before: array<string, array{except: list<string>|string}>|list<string>,
+     *     after: array<string, array{except: list<string>|string}>|list<string>
+     * }
      */
     public array $globals = [
         'before' => [

preload.php

@@ -57,6 +57,7 @@ class preload
                 '/system/Config/Routes.php',
                 '/system/Language/',
                 '/system/bootstrap.php',
+                '/system/util_bootstrap.php',
                 '/system/rewrite.php',
                 '/Views/',
                 // Errors occur.

system/Config/Filters.php

@@ -78,7 +78,10 @@ class Filters extends BaseConfig
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     * @var array{
+     *    before: array<string, array{except: list<string>|string}>|list<string>,
+     *    after: array<string, array{except: list<string>|string}>|list<string>
+     * }
      */
     public array $globals = [
         'before' => [

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;
 
@@ -1313,7 +1313,7 @@ protected function appendAttachments(&$body, $boundary, $multipart = null)
                 . 'Content-Type: ' . $attachment['type'] . '; name="' . $name . '"' . $this->newline
                 . 'Content-Disposition: ' . $attachment['disposition'] . ';' . $this->newline
                 . 'Content-Transfer-Encoding: base64' . $this->newline
-                . ($attachment['cid'] === '' ? '' : 'Content-ID: <' . $attachment['cid'] . '>' . $this->newline)
+                . (isset($attachment['cid']) && $attachment['cid'] !== '' ? 'Content-ID: <' . $attachment['cid'] . '>' . $this->newline : '')
                 . $this->newline
                 . $attachment['content'] . $this->newline;
         }
@@ -1891,7 +1891,7 @@ protected function SMTPEnd()
      */
     protected function SMTPConnect()
     {
-        if (is_resource($this->SMTPConnect)) {
+        if ($this->isSMTPConnected()) {
             return true;
         }
 
@@ -1915,7 +1915,7 @@ protected function SMTPConnect()
             $this->SMTPTimeout,
         );
 
-        if (! is_resource($this->SMTPConnect)) {
+        if (! $this->isSMTPConnected()) {
             $this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
 
             return false;
@@ -2259,7 +2259,7 @@ protected function mimeTypes($ext = '')
 
     public function __destruct()
     {
-        if ($this->SMTPConnect !== null) {
+        if ($this->isSMTPConnected()) {
             try {
                 $this->sendCommand('quit');
             } catch (ErrorException $e) {
@@ -2316,4 +2316,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 = [];

tests/system/Email/EmailTest.php

@@ -21,6 +21,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use ReflectionException;
+use ReflectionMethod;
 
 /**
  * @internal
@@ -220,6 +221,41 @@ public function testSetAttachmentCIDBufferString(): void
         );
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/9644
+     *
+     * @throws ReflectionException
+     */
+    public function testAppendAttachmentsWithoutCID(): void
+    {
+        $email = $this->createMockEmail();
+
+        // Manually inject an attachment without 'cid'
+        $this->setPrivateProperty($email, 'attachments', [
+            [
+                'multipart'   => 'mixed',
+                'content'     => 'VGhpcyBpcyBhIHRlc3QgZmlsZSBjb250ZW50Lg==', // base64 for "This is a test file content."
+                'filename'    => '',
+                'type'        => 'application/pdf',
+                'name'        => ['testfile.pdf'],
+                'disposition' => 'attachment',
+            ],
+        ]);
+
+        $body     = '';
+        $boundary = 'test-boundary';
+
+        // Use ReflectionMethod to call protected method with pass-by-reference
+        $refMethod = new ReflectionMethod($email, 'appendAttachments');
+        $refMethod->invokeArgs($email, [&$body, $boundary, 'mixed']);
+
+        // Assertion: Should not include a Content-ID header
+        $this->assertStringContainsString('Content-Type: application/pdf; name="testfile.pdf"', $body);
+        $this->assertStringContainsString('Content-Disposition: attachment;', $body);
+        $this->assertStringNotContainsString('Content-ID:', $body);
+        $this->assertStringContainsString('--' . $boundary . '--', $body);
+    }
+
     /**
      * @throws ReflectionException
      */

user_guide_src/source/changelogs/index.rst

@@ -13,6 +13,7 @@ See all the changes.
     :titlesonly:
 
     v4.7.0
+    v4.6.3
     v4.6.2
     v4.6.1
     v4.6.0

user_guide_src/source/changelogs/v4.6.3.rst

@@ -0,0 +1,38 @@
+#############
+Version 4.6.3
+#############
+
+Release Date: Unreleased
+
+**4.6.3 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 3
+
+********
+BREAKING
+********
+
+***************
+Message Changes
+***************
+
+*******
+Changes
+*******
+
+************
+Deprecations
+************
+
+**********
+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>`_
+for a complete list of bugs fixed.