Fix HeaderValue throwing an exception on legal characters

src/Header/HeaderValue.php

@@ -28,20 +28,18 @@ private function __construct()
     public static function filter($value)
     {
         $result = '';
-        $tot    = strlen($value);
+        $total  = strlen($value);
 
         // Filter for CR and LF characters, leaving CRLF + WSP sequences for
         // Long Header Fields (section 2.2.3 of RFC 2822)
-        for ($i = 0; $i < $tot; $i += 1) {
+        for ($i = 0; $i < $total; $i += 1) {
             $ord = ord($value[$i]);
-            if (($ord < 32 || $ord > 126)
-                && $ord !== 13
-            ) {
+            if ($ord === 10 || $ord > 126) {
                 continue;
             }
 
             if ($ord === 13) {
-                if ($i + 2 >= $tot) {
+                if ($i + 2 >= $total) {
                     continue;
                 }
 
@@ -72,17 +70,17 @@ public static function filter($value)
      */
     public static function isValid($value)
     {
-        $tot = strlen($value);
-        for ($i = 0; $i < $tot; $i += 1) {
+        $total = strlen($value);
+        for ($i = 0; $i < $total; $i += 1) {
             $ord = ord($value[$i]);
-            if (($ord < 32 || $ord > 126)
-                && $ord !== 13
-            ) {
+
+            // bare LF means we aren't valid
+            if ($ord === 10 || $ord > 126) {
                 return false;
             }
 
             if ($ord === 13) {
-                if ($i + 2 >= $tot) {
+                if ($i + 2 >= $total) {
                     return false;
                 }
 
@@ -93,6 +91,7 @@ public static function isValid($value)
                     return false;
                 }
 
+                // skip over the LF following this
                 $i += 2;
             }
         }

test/Header/HeaderValueTest.php

@@ -10,6 +10,7 @@
 namespace ZendTest\Mail\Header;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionClass;
 use Zend\Mail\Header\HeaderValue;
 
 class HeaderValueTest extends TestCase
@@ -30,7 +31,8 @@ public function getFilterValues()
             ["This is a\r\r test", "This is a test"],
             ["This is a \r\r\n test", "This is a \r\n test"],
             ["This is a \r\n\r\ntest", "This is a test"],
-            ["This is a \r\n\n\r\n test", "This is a \r\n test"]
+            ["This is a \r\n\n\r\n test", "This is a \r\n test"],
+            ["This is a test\r\n", "This is a test"],
         ];
     }
 
@@ -56,7 +58,11 @@ public function validateValues()
             ["This is a\r\r test", 'assertFalse'],
             ["This is a \r\r\n test", 'assertFalse'],
             ["This is a \r\n\r\ntest", 'assertFalse'],
-            ["This is a \r\n\n\r\n test", 'assertFalse']
+            ["This is a \r\n\n\r\n test", 'assertFalse'],
+            ["This\tis\ta test", 'assertTrue'],
+            ["This is\ta \r\n test", 'assertTrue'],
+            ["This\tis\ta\ntest", 'assertFalse'],
+            ["This is a \r\t\n \r\n test", 'assertFalse'],
         ];
     }
 
@@ -81,7 +87,7 @@ public function assertValues()
             ["This is a\r\r test"],
             ["This is a \r\r\n test"],
             ["This is a \r\n\r\ntest"],
-            ["This is a \r\n\n\r\n test"]
+            ["This is a \r\n\n\r\n test"],
         ];
     }
 
@@ -94,4 +100,10 @@ public function testAssertValidRaisesExceptionForInvalidValues($value)
         $this->setExpectedException('Zend\Mail\Header\Exception\RuntimeException', 'Invalid');
         HeaderValue::assertValid($value);
     }
+
+    public function testCannotBeConstructed()
+    {
+        $class = new ReflectionClass('Zend\Mail\Header\HeaderValue');
+        $this->assertFalse($class->isInstantiable());
+    }
 }