Small adjustments

Author: stevebauman

src/HasMessageAccessors.php

@@ -31,11 +31,6 @@ abstract public function addresses(string $header): array;
      */
     abstract public function header(string $name, int $offset = 0): ?IHeader;
 
-    /**
-     * Determine if the attachment should be treated as an embedded forwarded message.
-     */
-    abstract protected function isForwardedMessage(IMessagePart $part): bool;
-
     /**
      * Get the message date and time.
      */
@@ -105,9 +100,7 @@ public function inReplyTo(): array
     {
         $parts = $this->header(HeaderConsts::IN_REPLY_TO)?->getParts() ?? [];
 
-        $values = array_map(function (IHeaderPart $part) {
-            return $part->getValue();
-        }, $parts);
+        $values = array_map(fn (IHeaderPart $part) => $part->getValue(), $parts);
 
         return array_values(array_filter($values));
     }
@@ -199,4 +192,14 @@ public function attachmentCount(): int
     {
         return $this->parse()->getAttachmentCount();
     }
+
+    /**
+     * Determine if the attachment should be treated as an embedded forwarded message.
+     */
+    protected function isForwardedMessage(IMessagePart $part): bool
+    {
+        return empty($part->getFilename())
+            && strtolower((string) $part->getContentType()) === 'message/rfc822'
+            && strtolower((string) $part->getContentDisposition()) !== 'attachment';
+    }
 }

src/HasParsedMessage.php

@@ -9,7 +9,6 @@
 use ZBateson\MailMimeParser\Header\Part\ContainerPart;
 use ZBateson\MailMimeParser\Header\Part\NameValuePart;
 use ZBateson\MailMimeParser\IMessage;
-use ZBateson\MailMimeParser\Message\IMessagePart;
 
 trait HasParsedMessage
 {
@@ -53,16 +52,6 @@ public function addresses(string $header): array
         return array_filter($addresses);
     }
 
-    /**
-     * Determine if the attachment should be treated as an embedded forwarded message.
-     */
-    protected function isForwardedMessage(IMessagePart $part): bool
-    {
-        return empty($part->getFilename())
-            && strtolower((string) $part->getContentType()) === 'message/rfc822'
-            && strtolower((string) $part->getContentDisposition()) !== 'attachment';
-    }
-
     /**
      * Parse the message into a MailMimeMessage instance.
      */

src/Message.php

@@ -19,6 +19,7 @@
 use ZBateson\MailMimeParser\Header\Part\AddressPart;
 use ZBateson\MailMimeParser\Header\Part\ContainerPart;
 use ZBateson\MailMimeParser\Header\Part\NameValuePart;
+use ZBateson\MailMimeParser\Message\IMessagePart;
 
 class Message implements Arrayable, JsonSerializable, MessageInterface
 {
@@ -452,6 +453,25 @@ public function attachments(bool $lazy = false): array
         return $this->getParsedAttachments();
     }
 
+    /**
+     * Get attachments using lazy loading from body structure.
+     *
+     * @return Attachment[]
+     */
+    protected function getLazyAttachments(): array
+    {
+        return array_map(
+            fn (BodyStructurePart $part) => new Attachment(
+                $part->filename(),
+                $part->id(),
+                $part->contentType(),
+                $part->disposition()?->type()?->value,
+                new Support\LazyBodyPartStream($this, $part),
+            ),
+            $this->bodyStructure(lazy: true)?->attachments() ?? []
+        );
+    }
+
     /**
      * Get attachments from the parsed message.
      *
@@ -499,22 +519,13 @@ public function attachmentCount(): int
     }
 
     /**
-     * Get attachments using lazy loading from body structure.
-     *
-     * @return Attachment[]
+     * Determine if the attachment should be treated as an embedded forwarded message.
      */
-    protected function getLazyAttachments(): array
+    protected function isForwardedMessage(IMessagePart $part): bool
     {
-        return array_map(
-            fn (BodyStructurePart $part) => new Attachment(
-                $part->filename(),
-                $part->id(),
-                $part->contentType(),
-                $part->disposition()?->type()?->value,
-                new Support\LazyBodyPartStream($this, $part),
-            ),
-            $this->bodyStructure(lazy: true)?->attachments() ?? []
-        );
+        return empty($part->getFilename())
+            && strtolower((string) $part->getContentType()) === 'message/rfc822'
+            && strtolower((string) $part->getContentDisposition()) !== 'attachment';
     }
 
     /**