Build mailable before extracting data from it

Author: marickvantuil

src/MailableReader.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use function call_user_func_array;
+use Illuminate\Container\Container;
 
 class MailableReader
 {
@@ -14,6 +15,8 @@ class MailableReader
      */
     public function read(EmailComposer $composer)
     {
+        Container::getInstance()->call([$composer->getData('mailable'), 'build']);
+
         $this->readRecipient($composer);
 
         $this->readFrom($composer);
@@ -123,7 +126,9 @@ private function readBody(EmailComposer $composer)
 
         $composer->setData('view', '');
 
-        $composer->setData('body', $composer->getData('mailable')->render());
+        $mailable = $composer->getData('mailable');
+
+        $composer->setData('body', view($mailable->view, $mailable->buildViewData()));
     }
 
     /**

tests/MailableReaderTest.php

@@ -20,7 +20,9 @@ public function it_extracts_the_recipient()
                 (new TestMailable())->to(['[email protected]'])
             );
 
-        $this->assertEquals(['[email protected]', '[email protected]'], $composer->getData('recipient'));
+        $this->assertCount(2, $composer->getData('recipient'));
+        $this->assertContains('[email protected]', $composer->getData('recipient'));
+        $this->assertContains('[email protected]', $composer->getData('recipient'));
     }
 
     /** @test */
@@ -107,29 +109,20 @@ public function it_extracts_the_from_address_and_or_name()
 class TestMailable extends Mailable
 {
     /**
-     * Create a new message instance.
+     * Build the message.
      *
-     * @return void
+     * @return $this
      */
-    public function __construct()
+    public function build()
     {
-        $this->to('[email protected]')
+        return $this->to('[email protected]')
             ->cc(['[email protected]', '[email protected]'])
             ->bcc(['[email protected]', '[email protected]'])
             ->subject('Your order has shipped!')
             ->attach(__DIR__ . '/files/pdf-sample.pdf', [
                 'mime' => 'application/pdf',
             ])
-            ->attachData('<p>Thanks for your oder</p>', 'order.html');
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this->view('tests::dummy', ['name' => 'John Doe']);
+            ->attachData('<p>Thanks for your oder</p>', 'order.html')
+            ->view('tests::dummy', ['name' => 'John Doe']);
     }
 }