Allow line breaks in date headers #258

Author: zbateson

src/Header/Consumer/DateConsumerService.php

@@ -26,7 +26,7 @@ class DateConsumerService extends GenericConsumerService
      */
     protected function getPartForToken(string $token, bool $isLiteral) : ?IHeaderPart
     {
-        return $this->partFactory->newToken($token, true);
+        return $this->partFactory->newToken($token, false);
     }
 
     /**

tests/MailMimeParser/Header/Consumer/DateConsumerServiceTest.php

@@ -57,6 +57,19 @@ public function testConsumeDates() : void
         $this->assertEquals($date, $ret[0]->getDateTime()->format(DateTime::RFC2822));
     }
 
+    public function testConsumeMultilineDate() : void
+    {
+        $date = "Wed,\r\n  17 May\r 2000\n 19:08:29 -0400";
+        $dateSl = 'Wed, 17 May 2000 19:08:29 -0400';
+        $ret = $this->dateConsumer->__invoke($date);
+        $this->assertNotEmpty($ret);
+        $this->assertCount(1, $ret);
+        $this->assertInstanceOf('\\' . \ZBateson\MailMimeParser\Header\Part\DatePart::class, $ret[0]);
+        $this->assertFalse($ret[0]->hasErrors(), join(', ', array_map(fn ($e) => $e->getMessage(), $ret[0]->getAllErrors())));
+        $this->assertEquals($dateSl, $ret[0]->getValue());
+        $this->assertEquals($dateSl, $ret[0]->getDateTime()->format(DateTime::RFC2822));
+    }
+
     public function testConsumeDateWithComment() : void
     {
         $dateTest = 'Wed, 17 May 2000 19:08:29 -0400 (some comment)';

tests/MailMimeParser/Header/DateHeaderTest.php

@@ -64,6 +64,17 @@ public function testSimpleDate() : void
         $this->assertEquals('Wed, 17 May 2000 19:08:29 -0400', $dt->format(\DateTime::RFC2822));
     }
 
+    public function testDateWithNewLine() : void
+    {
+        $date = 'Wed, 17 May 2000 19:08:29 -0400';
+        $header = $this->newDateHeader('Date', "Wed,\r\n  17 May 2000 19:08:29 -0400");
+        $this->assertEquals($date, $header->getValue());
+        $this->assertFalse($header->hasErrors(), join(', ', array_map(fn ($e) => $e->getMessage(), $header->getAllErrors())));
+        $dt = $header->getDateTime();
+        $this->assertNotNull($dt);
+        $this->assertEquals($date, $dt->format(\DateTime::RFC2822));
+    }
+
     public function testInvalidDate() : void
     {
         $header = $this->newDateHeader('DATE', 'This is not a date');