Message Part: expose $partNumber (#244)

Close #229

src/Message/AbstractPart.php

@@ -19,14 +19,14 @@ abstract class AbstractPart implements PartInterface
     protected $resource;
 
     /**
-     * @var null|string
+     * @var array
      */
-    protected $partNumber;
+    protected $parts = [];
 
     /**
-     * @var array
+     * @var string
      */
-    protected $parts = [];
+    private $partNumber;
 
     /**
      * @var int
@@ -259,6 +259,16 @@ protected function getContentPartNumber(): string
         return $this->partNumber;
     }
 
+    /**
+     * Get part number.
+     *
+     * @return string
+     */
+    final public function getPartNumber(): string
+    {
+        return $this->partNumber;
+    }
+
     /**
      * Get decoded part content.
      *

src/Message/Attachment.php

@@ -54,11 +54,11 @@ public function getEmbeddedMessage(): EmbeddedMessageInterface
         if (!$this->isEmbeddedMessage()) {
             throw new NotEmbeddedMessageException(\sprintf(
                 'Attachment "%s" in message "%s" is not embedded message',
-                $this->partNumber,
+                $this->getPartNumber(),
                 $this->getNumber()
             ));
         }
 
-        return new EmbeddedMessage($this->resource, $this->getNumber(), $this->partNumber, $this->getStructure()->parts[0]);
+        return new EmbeddedMessage($this->resource, $this->getNumber(), $this->getPartNumber(), $this->getStructure()->parts[0]);
     }
 }

src/Message/EmbeddedMessage.php

@@ -58,7 +58,7 @@ public function getRawHeaders(): string
     public function getRawMessage(): string
     {
         if (null === $this->rawMessage) {
-            $this->rawMessage = $this->doGetContent($this->partNumber);
+            $this->rawMessage = $this->doGetContent($this->getPartNumber());
         }
 
         return $this->rawMessage;
@@ -71,7 +71,7 @@ public function getRawMessage(): string
      */
     protected function getContentPartNumber(): string
     {
-        $partNumber = $this->partNumber;
+        $partNumber = $this->getPartNumber();
         if (0 === \count($this->parts)) {
             $partNumber .= '.1';
         }

src/Message/PartInterface.php

@@ -113,6 +113,13 @@ public function getDecodedContent(): string;
      */
     public function getStructure(): \stdClass;
 
+    /**
+     * Get part number.
+     *
+     * @return string
+     */
+    public function getPartNumber(): string;
+
     /**
      * Get an array of all parts for this message.
      *