further improvements, bug fixes

opcodesio · Aug 25, 2023 · 9cf221b · 9cf221b
1 parent 038866c
commit 9cf221b
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -117,6 +117,11 @@ public function getAttachments(): array
         return array_filter($this->parts, fn ($part) => $part->isAttachment());
     }
 
+    public function getSize(): int
+    {
+        return strlen($this->message);
+    }
+
     public function toArray(): array
     {
         return [
@@ -148,7 +153,7 @@ protected function parse()
         $currentBodyHeaderInProgress = null;
 
         foreach ($lines as $line) {
-            $line = rtrim($line, "\r\n");
+            $line = rtrim($line, "\r\n ");
 
             if ($headerInProgress) {
                 $this->headers[$headerInProgress] .= "\n" . $line;
@@ -192,7 +197,7 @@ protected function parse()
             }
 
             if ($collectingBody) {
-                $currentBody .= rtrim($line)."\n";
+                $currentBody .= $line."\n";
                 continue;
             }
 
@@ -212,6 +217,9 @@ protected function parse()
 
                 continue;
             }
+
+            // The line is not part of the email message. Let's remove it altogether.
+            $this->message = ltrim(substr($this->message, strlen($line)));
         }
     }
 

diff --git a/src/MessagePart.php b/src/MessagePart.php
@@ -71,12 +71,18 @@ public function getFilename(): string
         return '';
     }
 
+    public function getSize(): int
+    {
+        return strlen($this->getContent());
+    }
+
     public function toArray(): array
     {
         return [
             'headers' => $this->getHeaders(),
             'content' => $this->getContent(),
             'filename' => $this->getFilename(),
+            'size' => $this->getSize(),
         ];
     }
 

diff --git a/tests/Unit/MessageTest.php b/tests/Unit/MessageTest.php
@@ -152,3 +152,44 @@
     $attachments = $message->getAttachments();
     expect($attachments)->toHaveCount(1);
 });
+
+it('skips initial content that is not part of the message', function () {
+    $messageString = <<<EOF
+This is some initial content that is not part of the message.
+
+From: [email protected]
+To: [email protected]
+Subject: This is an email with common headers
+Date: Thu, 24 Aug 2023 21:15:01 PST
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----=_Part_1_1234567890"
+
+------=_Part_1_1234567890
+Content-Type: text/html; charset="utf-8"
+
+<html>
+<head>
+<title>This is an HTML email</title>
+</head>
+<body>
+<h1>This is the HTML version of the email</h1>
+</body>
+</html>
+
+------=_Part_1_1234567890-- 
+EOF;
+
+    $message = Message::fromString($messageString);
+
+    expect($message->getFrom())->toBe('[email protected]')
+        ->and($message->getHtmlPart()?->getContent())->toBe(<<<EOF
+<html>
+<head>
+<title>This is an HTML email</title>
+</head>
+<body>
+<h1>This is the HTML version of the email</h1>
+</body>
+</html>
+EOF);
+});