Merge pull request #105 from samsonasik/hotfix/99

Fixes #99 : Header value 0 gets discarded in Zend\Mail
zendframework · Feb 14, 2017 · 4406f0d · 4406f0d
2 parents 756fe45 + 7399e06
commit 4406f0d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/Header/GenericHeader.php b/src/Header/GenericHeader.php
@@ -79,7 +79,7 @@ public function __construct($fieldName = null, $fieldValue = null)
             $this->setFieldName($fieldName);
         }
 
-        if ($fieldValue) {
+        if ($fieldValue !== null) {
             $this->setFieldValue($fieldValue);
         }
     }

diff --git a/test/Header/GenericHeaderTest.php b/test/Header/GenericHeaderTest.php
@@ -141,4 +141,11 @@ public function testCastingToStringHandlesContinuationsProperly()
         $this->assertEquals($encoded, $header->getFieldValue(GenericHeader::FORMAT_ENCODED));
         $this->assertEquals('Foo: ' . $encoded, $header->toString());
     }
+
+    public function testAllowZeroInHeaderValueInConstructor()
+    {
+        $header = new GenericHeader('Foo', 0);
+        $this->assertEquals(0, $header->getFieldValue());
+        $this->assertEquals('Foo: 0', $header->toString());
+    }
 }
diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -838,4 +838,19 @@ public function testCanParseMultipartReport()
         $contentType = $headers->get('Content-Type');
         $this->assertEquals('multipart/report', $contentType->getType());
     }
+
+    public function testMailHeaderContainsZeroValue()
+    {
+        $message =
+            "From: someone@example.com\r\n"
+            ."To: someone@example.com\r\n"
+            ."Subject: plain text email example\r\n"
+            ."X-Spam-Score: 0\r\n"
+            ."X-Some-Value: 1\r\n"
+            ."\r\n"
+            ."I am a test message\r\n";
+
+        $msg = Message::fromString($message);
+        $this->assertContains('X-Spam-Score: 0', $msg->toString());
+    }
 }