some improvements

opcodesio · Aug 25, 2023 · f9d2239 · f9d2239
1 parent 25acddc
commit f9d2239
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 10 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -2,7 +2,7 @@
 
 namespace Opcodes\MailParser;
 
-class Message
+class Message implements \JsonSerializable
 {
     protected string $message;
 
@@ -130,13 +130,13 @@ protected function parse()
 
         foreach ($lines as $line) {
             if ($headerInProgress) {
-                $this->headers[$headerInProgress] .= "\n" . $line;
+                $this->headers[$headerInProgress] .= "\n" . rtrim($line);
                 $headerInProgress = str_ends_with($line, ';');
                 continue;
             }
 
             if ($currentBodyHeaderInProgress) {
-                $currentBodyHeaders[$currentBodyHeaderInProgress] .= "\n" . $line;
+                $currentBodyHeaders[$currentBodyHeaderInProgress] .= "\n" . rtrim($line);
                 $currentBodyHeaderInProgress = str_ends_with($line, ';');
                 continue;
             }
@@ -160,18 +160,18 @@ protected function parse()
             }
 
             if ($collectingBody && preg_match('/^(?<key>[A-Za-z\-0-9]+): (?<value>.*)$/', $line, $matches)) {
-                $currentBodyHeaders[$matches['key']] = $matches['value'];
+                $currentBodyHeaders[$matches['key']] = rtrim($matches['value']);
 
                 // if the last character is a semicolon, then the header is continued on the next line
-                if (str_ends_with($matches['value'], ';')) {
+                if (str_ends_with($currentBodyHeaders[$matches['key']], ';')) {
                     $currentBodyHeaderInProgress = $matches['key'];
                 }
 
                 continue;
             }
 
             if ($collectingBody) {
-                $currentBody .= $line."\n";
+                $currentBody .= rtrim($line)."\n";
                 continue;
             }
 
@@ -182,11 +182,11 @@ protected function parse()
             }
 
             if (preg_match('/^(?<key>[A-Za-z\-0-9]+): (?<value>.*)$/', $line, $matches)) {
-                $this->headers[$matches['key']] = $matches['value'];
+                $this->headers[$matches['key']] = rtrim($matches['value']);
 
                 // if the last character is a semicolon, then the header is continued on the next line
-                if (str_ends_with($matches['value'], ';')) {
-                    $headerInProgress = $matches['key'];
+                if (str_ends_with($this->headers[$matches['key']], ';')) {
+                    $headerInProgress = rtrim($matches['key']);
                 }
 
                 continue;
@@ -198,4 +198,23 @@ protected function addPart(string $currentBody, array $currentBodyHeaders): void
     {
         $this->parts[] = new MessagePart(trim($currentBody), $currentBodyHeaders);
     }
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->getId(),
+            'subject' => $this->getSubject(),
+            'from' => $this->getFrom(),
+            'to' => $this->getTo(),
+            'reply_to' => $this->getReplyTo(),
+            'date' => $this->getDate() ? $this->getDate()->format('c') : null,
+            'headers' => $this->getHeaders(),
+            'parts' => array_map(fn ($part) => $part->toArray(), $this->getParts()),
+        ];
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->toArray();
+    }
 }
diff --git a/src/MessagePart.php b/src/MessagePart.php
@@ -55,7 +55,7 @@ public function isImage(): bool
 
     public function isAttachment(): bool
     {
-        return str_starts_with($this->getHeader('Content-Disposition'), 'attachment');
+        return str_starts_with($this->getHeader('Content-Disposition', ''), 'attachment');
     }
 
     public function getFilename(): string
@@ -70,4 +70,13 @@ public function getFilename(): string
 
         return '';
     }
+
+    public function toArray(): array
+    {
+        return [
+            'headers' => $this->getHeaders(),
+            'content' => $this->getContent(),
+            'filename' => $this->getFilename(),
+        ];
+    }
 }
diff --git a/tests/Unit/MessageTest.php b/tests/Unit/MessageTest.php
@@ -148,4 +148,7 @@
     expect($attachmentPart->getContent())->toBe('This is a test string')
         ->and($attachmentPart->isAttachment())->toBe(true)
         ->and($attachmentPart->getFilename())->toBe('test.txt');
+
+    $attachments = $message->getAttachments();
+    expect($attachments)->toHaveCount(1);
 });