Merge remote-tracking branch 'upstream/master'

src/Header/ContentType.php

@@ -19,13 +19,6 @@
  */
 class ContentType implements HeaderInterface
 {
-    /**
-     * Header encoding
-     * 
-     * @var string
-     */
-    protected $encoding = 'ASCII';
-
     /**
      * @var string
      */
@@ -56,7 +49,7 @@ public static function fromString($headerLine)
         if (count($values)) {
             foreach ($values as $keyValuePair) {
                 list($key, $value) = explode('=', $keyValuePair);
-                $value = trim($value, "\"\' \t\n\r\0\x0B");
+                $value = trim($value, "'\" \t\n\r\0\x0B");
                 $header->addParameter($key, $value);
             }
         }
@@ -86,18 +79,18 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
     public function setEncoding($encoding) 
     {
-        $this->encoding = $encoding;
+        // This header must be always in US-ASCII
         return $this;
     }
 
     public function getEncoding()
     {
-        return $this->encoding;
+        return 'ASCII';
     }
 
     public function toString()
     {
-        return 'Content-Type: ' . $this->getFieldValue(HeaderInterface::FORMAT_RAW);
+        return 'Content-Type: ' . $this->getFieldValue();
     }
 
     /**

src/Header/Date.php

@@ -23,13 +23,6 @@ class Date implements HeaderInterface
      */
     protected $value;
 
-    /**
-     * Header encoding
-     * 
-     * @var string
-     */
-    protected $encoding = 'ASCII';
-
     public static function fromString($headerLine)
     {
         list($name, $value) = explode(': ', $headerLine, 2);
@@ -57,17 +50,17 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
     public function setEncoding($encoding) 
     {
-        $this->encoding = $encoding;
+        // This header must be always in US-ASCII
         return $this;
     }
 
     public function getEncoding()
     {
-        return $this->encoding;
+        return 'ASCII';
     }
 
     public function toString()
     {
-        return 'Date: ' . $this->getFieldValue(HeaderInterface::FORMAT_RAW);
+        return 'Date: ' . $this->getFieldValue();
     }
 }

src/Header/MimeVersion.php

@@ -52,17 +52,18 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
     public function setEncoding($encoding)
     {
-        // irrelevant to this implementation
+        // This header must be always in US-ASCII
+        return $this;
     }
 
     public function getEncoding()
     {
-        // irrelevant to this implementation
+        return 'ASCII';
     }
 
     public function toString()
     {
-        return 'MIME-Version: ' . $this->getFieldValue(HeaderInterface::FORMAT_RAW);
+        return 'MIME-Version: ' . $this->getFieldValue();
     }
 
     /**

src/Header/Received.php

@@ -25,13 +25,6 @@ class Received implements HeaderInterface, MultipleHeadersInterface
      */
     protected $value;
 
-    /**
-     * Header encoding
-     * 
-     * @var string
-     */
-    protected $encoding = 'ASCII';
-
     public static function fromString($headerLine)
     {
         list($name, $value) = explode(': ', $headerLine, 2);
@@ -59,18 +52,18 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
 
     public function setEncoding($encoding) 
     {
-        $this->encoding = $encoding;
+        // This header must be always in US-ASCII
         return $this;
     }
 
     public function getEncoding()
     {
-        return $this->encoding;
+        return 'ASCII';
     }
 
     public function toString()
     {
-        return 'Received: ' . $this->getFieldValue(HeaderInterface::FORMAT_RAW);
+        return 'Received: ' . $this->getFieldValue();
     }
 
     /**

src/Protocol/AbstractProtocol.php

@@ -82,14 +82,6 @@ abstract class AbstractProtocol
     protected $_response;
 
 
-    /**
-     * String template for parsing server responses using sscanf (default: 3 digit code and response string)
-     * @var resource
-     * @deprecated Since 1.10.3
-     */
-    protected $_template = '%d%s';
-
-
     /**
      * Log of mail requests and server responses for a session
      * @var array