Add support for getting the html and text body after the Mailtrap API changes.

Author: polevaultweb

src/Mailtrap.php

@@ -121,9 +121,9 @@ public function fetchMessages()
 
  $messages = json_decode($messages, true);
 
-  foreach ($messages as $key => $message) {
-  $messages[$key] = new MailtrapMessage($messages);
-  }
+ foreach ( $messages as $key => $message ) {
+ $messages[ $key ] = new MailtrapMessage( $message, $this->client );
+ }
 
  return $messages;
  }

src/MailtrapMessage.php

@@ -2,39 +2,102 @@
 
 namespace Codeception\Module;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Stream;
+
 /**
  * Represents a message in the MailTrap inbox
  *
  */
-class MailtrapMessage
-{
-
- /**
- * @var array Message payload
- */
- protected $data;
-
- /**
- * MailtrapMessage constructor.
- *
- * @param array $data
- */
- public function __construct($data = [])
- {
- $this->data = $data;
- }
-
- /**
- * @param string $name
- *
- * @return mixed|null
- */
- public function __get($name)
- {
- if (isset($this->data[$name])) {
- return $this->data[$name];
- }
-
- return null;
- }
+class MailtrapMessage {
+
+/**
+ * @var array Message payload
+ */
+protected $data;
+
+/**
+ * @var Client
+ */
+protected $client;
+
+/**
+ * @var string HTML body of the message
+ */
+protected $html_body;
+
+/**
+ * @var string Text body of the message
+ */
+protected $text_body;
+
+/**
+ * MailtrapMessage constructor.
+ *
+ * @param array $data
+ * @param Client $client
+ */
+public function __construct( $data = [], Client $client ) {
+$this->data = $data;
+$this->client = $client;
+}
+
+/**
+ * @param string $name
+ *
+ * @return mixed|null
+ */
+public function __get( $name ) {
+if ( in_array( $name, array( 'html_body', 'text_body' ) ) ) {
+return $this->getMessageData( $name );
+}
+
+if ( isset( $this->data[ $name ] ) ) {
+return $this->data[ $name ];
+}
+
+return null;
+}
+
+/**
+ * Get the body data for a message
+ *
+ * @param $key
+ *
+ * @return bool|mixed|null|string
+ */
+public function getMessageData( $key ) {
+if ( $this->{$key} ) {
+return $this->{$key};
+}
+
+$data_key = str_replace( 'body', 'path', $key );
+
+$data = $this->retrieveMessageData( $data_key );
+
+if ( ! $data ) {
+return '';
+}
+
+$this->{$key} = $data;
+
+return $data;
+}
+
+/**
+ * Retrieve the body data from the MailTrap API
+ *
+ * @param $key
+ *
+ * @return bool|string
+ */
+protected function retrieveMessageData( $key ) {
+$data = $this->client->get( $this->data[ $key ] )->getBody();
+
+if ( $data instanceof Stream ) {
+return $data->getContents();
+}
+
+return false;
+}
 }