Add email config for transferEncoding #11485

src/Mailer/Email.php

@@ -241,6 +241,14 @@ class Email implements JsonSerializable, Serializable
      */
     public $headerCharset;
 
+    /**
+     * The email transfer encoding used.
+     * If null, the $charset property is used for determined the transfer encoding.
+     *
+     * @var string|null
+     */
+    public $transferEncoding;
+
     /**
      * The application wide charset, used to encode headers and body
      *
@@ -827,6 +835,29 @@ public function headerCharset($charset = null)
         return $this->headerCharset;
     }
 
+    /**
+     * TransferEncoding setter.
+     *
+     * @param string|null $encoding Encoding set.
+     * @return $this
+     */
+    public function setTransferEncoding($encoding)
+    {
+        $this->transferEncoding = $encoding;
+
+        return $this;
+    }
+
+    /**
+     * TransferEncoding getter.
+     *
+     * @return string|null Encoding
+     */
+    public function getTransferEncoding()
+    {
+        return $this->transferEncoding;
+    }
+
     /**
      * EmailPattern setter/getter
      *
@@ -2224,6 +2255,7 @@ public function reset()
         $this->_priority = null;
         $this->charset = 'utf-8';
         $this->headerCharset = null;
+        $this->transferEncoding = null;
         $this->_attachments = [];
         $this->_profile = [];
         $this->_emailPattern = self::EMAIL_PATTERN;
@@ -2655,12 +2687,17 @@ protected function _renderTemplates($content)
     }
 
     /**
-     * Return the Content-Transfer Encoding value based on the set charset
+     * Return the Content-Transfer Encoding value based
+     * on the set transferEncoding or set charset.
      *
      * @return string
      */
     protected function _getContentTransferEncoding()
     {
+        if ($this->transferEncoding) {
+            return $this->transferEncoding;
+        }
+
         $charset = strtoupper($this->charset);
         if (in_array($charset, $this->_charset8bit)) {
             return '8bit';

tests/TestCase/Mailer/EmailTest.php

@@ -90,6 +90,17 @@ public function render($content)
     {
         return $this->_render($content);
     }
+
+    /**
+     * GetContentTransferEncoding to protected method
+     *
+     * @return string
+     */
+    public function getContentTransferEncoding()
+    {
+        return $this->_getContentTransferEncoding();
+    }
+
 }
 
 /**
@@ -2487,6 +2498,24 @@ public function testHeaderCharset()
         $this->assertSame($charset, 'Shift_JIS');
     }
 
+    /**
+     * Test transferEncoding
+     *
+     * @return void
+     */
+    public function testTransferEncoding()
+    {
+        // Test new transfer encoding
+        $this->Email->setTransferEncoding('quoted-printable');
+        $this->assertSame($this->Email->getTransferEncoding(), 'quoted-printable');
+        $this->assertSame($this->Email->getContentTransferEncoding(), 'quoted-printable');
+
+        // Test default charset/encoding : utf8/8bit
+        $this->Email->reset();
+        $this->assertNull($this->Email->getTransferEncoding());
+        $this->assertSame($this->Email->getContentTransferEncoding(), '8bit');
+    }
+
     /**
      * Tests for compatible check.
      *          charset property and       charset() method.