[ContentType] Fix parameters with encoded values

src/Header/ContentType.php

@@ -10,14 +10,22 @@
 namespace Zend\Mail\Header;
 
 use Zend\Mail\Headers;
+use Zend\Mime\Mime;
 
-class ContentType implements HeaderInterface
+class ContentType implements UnstructuredInterface
 {
     /**
      * @var string
      */
     protected $type;
 
+    /**
+     * Header encoding
+     *
+     * @var string
+     */
+    protected $encoding = 'ASCII';
+
     /**
      * @var array
      */
@@ -66,6 +74,13 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
         $values = [$prepared];
         foreach ($this->parameters as $attribute => $value) {
+            if (HeaderInterface::FORMAT_ENCODED === $format &&
+                !Mime::isPrintable($value)) {
+                $this->encoding = 'UTF-8';
+                $value = HeaderWrap::wrap($value, $this);
+                $this->encoding = 'ASCII';
+            }
+
             $values[] = sprintf('%s="%s"', $attribute, $value);
         }
 
@@ -74,18 +89,18 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
     public function setEncoding($encoding)
     {
-        // This header must be always in US-ASCII
+        $this->encoding = $encoding;
         return $this;
     }
 
     public function getEncoding()
     {
-        return 'ASCII';
+        return $this->encoding;
     }
 
     public function toString()
     {
-        return 'Content-Type: ' . $this->getFieldValue();
+        return 'Content-Type: ' . $this->getFieldValue(HeaderInterface::FORMAT_ENCODED);
     }
 
     /**
@@ -135,8 +150,10 @@ public function addParameter($name, $value)
         if (! HeaderValue::isValid($name)) {
             throw new Exception\InvalidArgumentException('Invalid content-type parameter name detected');
         }
-        if (! HeaderValue::isValid($value)) {
-            throw new Exception\InvalidArgumentException('Invalid content-type parameter value detected');
+        if (! HeaderWrap::canBeEncoded($value)) {
+            throw new Exception\InvalidArgumentException(
+                'Parameter value must be composed of printable US-ASCII or UTF-8 characters.'
+            );
         }
 
         $this->parameters[$name] = $value;

test/Header/ContentTypeTest.php

@@ -12,6 +12,7 @@
 use Zend\Mail\Header\ContentType;
 use Zend\Mail\Header\Exception\InvalidArgumentException;
 use Zend\Mail\Header\HeaderInterface;
+use Zend\Mail\Header\UnstructuredInterface;
 
 /**
  * @group      Zend_Mail
@@ -22,6 +23,7 @@ public function testImplementsHeaderInterface()
     {
         $header = new ContentType();
 
+        $this->assertInstanceOf(UnstructuredInterface::class, $header);
         $this->assertInstanceOf(HeaderInterface::class, $header);
     }
 
@@ -139,7 +141,6 @@ public function invalidParametersProvider()
 
             // @group ZF2015-04
             'invalid name' => ["b\r\na\rr\n", 'baz', $invalidArgumentException, 'parameter name'],
-            'invalid value' => ['foo', "\nbar\r\nbaz\r", $invalidArgumentException, 'parameter value'],
         ];
         // @codingStandardsIgnoreEnd
     }