Merge branch 'hotfix/78' into develop

Forward port #78

CHANGELOG.md

@@ -43,6 +43,11 @@ All notable changes to this project will be documented in this file, in reverse
 - [#45](https://github.com/zendframework/zend-mail/pull/45) ensures that the
   message parser allows deserializing message bodies containing multiple EOL
   sequences.
+- [#78](https://github.com/zendframework/zend-mail/pull/78) fixes the logic of
+  `HeaderWrap::canBeEncoded()` to ensure it returns correctly for header lines
+  containing at least one multibyte character, and particularly when that
+  character falls at specific locations (per a
+  [reported bug at php.net](https://bugs.php.net/bug.php?id=53891)).
 
 ## 2.6.1 - 2016-02-24
 

src/Header/HeaderWrap.php

@@ -116,7 +116,21 @@ public static function mimeDecodeValue($value)
      */
     public static function canBeEncoded($value)
     {
-        $encoded = iconv_mime_encode('x-test', $value, ['scheme' => 'Q']);
+        // avoid any wrapping by specifying line length long enough
+        // "test" -> 4
+        // "x-test: =?ISO-8859-1?B?dGVzdA==?=" -> 33
+        //  8       +2          +3         +3  -> 16
+        $charset = 'UTF-8';
+        $lineLength = strlen($value) * 4 + strlen($charset) + 16;
+
+        $preferences = [
+            'scheme' => 'Q',
+            'input-charset' => $charset,
+            'output-charset' => $charset,
+            'line-length' => $lineLength,
+        ];
+
+        $encoded = iconv_mime_encode('x-test', $value, $preferences);
 
         return (false !== $encoded);
     }

test/Header/HeaderWrapTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use Zend\Mail\Header\GenericHeader;
 use Zend\Mail\Header\HeaderWrap;
 
 /**
@@ -71,4 +72,24 @@ public function testMimeDecoding()
 
         $this->assertEquals($expected, $decoded);
     }
+
+    /**
+     * Test that fails with HeaderWrap::canBeEncoded at lowest level:
+     *   iconv_mime_encode(): Unknown error (7)
+     *
+     * which can be triggered as:
+     *   $header = new GenericHeader($name, $value);
+     */
+    public function testCanBeEncoded()
+    {
+        $name = 'Subject';
+        $value = "[#77675] New Issue:xxxxxxxxx xxxxxxx xxxxxxxx xxxxxxxxxxxxx xxxxxxxxxx xxxxxxxx, tähtaeg xx.xx, xxxx";
+        $encoded = "Subject: =?UTF-8?Q?[#77675]=20New=20Issue:xxxxxxxxx=20xxxxxxx=20xxxxxxxx=20?=\r\n =?UTF-8?Q?xxxxxxxxxxxxx=20xxxxxxxxxx=20xxxxxxxx,=20t=C3=A4htaeg=20xx.xx,=20xxxx?=";
+        $res = HeaderWrap::canBeEncoded($value);
+        $this->assertTrue($res);
+
+        $header = new GenericHeader($name, $value);
+        $res = $header->toString();
+        $this->assertEquals($encoded, $res);
+    }
 }