making architecture more reasonable

Author: jkuchar

MailLibrary/Mail.php

@@ -193,6 +193,15 @@ public function getAttachments()
 		return $this->structure->getAttachments();
 	}
 
+	/**
+	 * @return \greeny\MailLibrary\MimePart[]
+	 */
+	public function getMimeParts()
+	{
+		$this->structure !== NULL || $this->initializeStructure();
+		return $this->structure->getMimeParts();
+	}
+
 	/**
 	 * @return array
 	 */
@@ -257,8 +266,11 @@ protected function initializeStructure()
 		$this->structure = $this->connection->getDriver()->getStructure($this->id, $this->mailbox);
 	}
 
-	/** @internal */
-	public function getStructure(): IStructure {
+	/**
+	 * @internal
+	 * @return IStructure
+	 */
+	public function getStructure() {
 		$this->structure !== NULL || $this->initializeStructure();
 		return $this->structure;
 	}

MailLibrary/Structures/IStructure.php

@@ -29,6 +29,8 @@ function getTextBody();
 	 */
 	function getAttachments();
 
-	/** @return MimePart[] */
-	public function getParts(): array;
-}
+	/**
+	 * @return MimePart[]
+	 */
+	function getMimeParts();
+}

MailLibrary/Structures/ImapStructure.php

@@ -93,6 +93,7 @@ public function __construct(ImapDriver $driver, $structure, $mailId, Mailbox $ma
 
 	/**
 	 * @return array
+	 * @internal use only with caution, format can change without warning
 	 */
 	public function getRawStructure()
 	{
@@ -115,9 +116,9 @@ public function getHtmlBody()
 		if($this->htmlBody === NULL) {
 			$this->driver->switchMailbox($this->mailbox->getName());
 			return $this->htmlBody = $this->driver->getBody($this->id, $this->htmlBodyIds);
-		} else {
-			return $this->htmlBody;
 		}
+
+		return $this->htmlBody;
 	}
 
 	/**
@@ -128,9 +129,9 @@ public function getTextBody()
 		if($this->textBody === NULL) {
 			$this->driver->switchMailbox($this->mailbox->getName());
 			return $this->textBody = $this->driver->getBody($this->id, $this->textBodyIds);
-		} else {
-			return $this->textBody;
 		}
+
+		return $this->textBody;
 	}
 
 	/**
@@ -148,13 +149,21 @@ public function getAttachments()
 		return $this->attachments;
 	}
 
-	/** @return MimePart[] */
-	public function getParts(): array
+	/**
+	 * @return MimePart[]
+	 */
+	public function getMimeParts()
 	{
 		$this->driver->switchMailbox($this->mailbox->getName());
 		return $this->messageParts;
 	}
 
+	/** @deprecated use getMimeParts() instead */
+	public function getParts() {
+		\trigger_error(\E_USER_DEPRECATED, 'use getMimeParts() instead');
+		return $this->getMimeParts();
+	}
+
 	protected function addStructurePart($structure, $partId)
 	{
 		$type = $structure->type;
@@ -173,12 +182,15 @@ protected function addStructurePart($structure, $partId)
 			}
 		}
 
+		/** @noinspection NestedTernaryOperatorInspection Yep, will fix this when we switch to PHP7 level; see ?? operator */
 		$this->messageParts[] = new MimePart(
 			$this->driver,
 			$this->id,
 			$partId,
 			self::$typeTable[$type]. '/' . $subtype,
-			$parameters['filename'] ?? $parameters['name'] ?? '',
+			(empty($parameters['filename']) ? $parameters['filename'] :  (
+				empty($parameters['name']) ? $parameters['name'] : ''
+			)),
 			$encoding
 		);