Refactor code and added tests

Author: marickvantuil

src/EmailComposer.php

@@ -218,14 +218,16 @@ public function mailable(Mailable $mailable)
      */
     public function attach($file, $options = [])
     {
-        $attachments = null;
+        $validFileName = (is_string($file) && strlen($file) > 0);
 
-        if (! empty($file) || ! is_null($file)) {
-            $attachments = $this->hasData('attachments') ? $this->getData('attachments') : [];
-
-            $attachments[] = compact('file', 'options');
+        if (!$validFileName) {
+            return $this;
         }
 
+        $attachments = $this->hasData('attachments') ? $this->getData('attachments') : [];
+
+        $attachments[] = compact('file', 'options');
+
         return $this->setData('attachments', $attachments);
     }
 
@@ -239,14 +241,16 @@ public function attach($file, $options = [])
      */
     public function attachData($data, $name, array $options = [])
     {
-        $attachments = null;
+        $validData = (is_string($data) && strlen($data) > 0);
 
-        if (! empty($data) || ! is_null($data)) {
-            $attachments = $this->hasData('rawAttachments') ? $this->getData('rawAttachments') : [];
-
-            $attachments[] = compact('data', 'name', 'options');
+        if (!$validData) {
+            return $this;
         }
 
+        $attachments = $this->hasData('rawAttachments') ? $this->getData('rawAttachments') : [];
+
+        $attachments[] = compact('data', 'name', 'options');
+
         return $this->setData('rawAttachments', $attachments);
     }
 

tests/SenderTest.php

@@ -167,6 +167,28 @@ public function attachments_are_added_to_the_email()
         $this->assertEquals('application/pdf', $attachment->getContentType());
     }
 
+    /** @test */
+    public function attachments_are_not_added_if_the_data_is_not_valid()
+    {
+        $this->sent = [];
+        $this->composeEmail()->attach(null)->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+
+        $this->sent = [];
+        $this->composeEmail()->attach(false)->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+
+        $this->sent = [];
+        $this->composeEmail()->attach('')->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+    }
+
     /** @test */
     public function raw_attachments_are_added_to_the_email()
     {
@@ -189,4 +211,26 @@ public function raw_attachments_are_added_to_the_email()
         $this->assertEquals('application/pdf', $attachment->getContentType());
         $this->assertContains('Hello CI!', $attachment->getBody());
     }
+
+    /** @test */
+    public function raw_attachments_are_not_added_if_the_data_is_not_valid()
+    {
+        $this->sent = [];
+        $this->composeEmail()->attachData(null, 'test.png')->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+
+        $this->sent = [];
+        $this->composeEmail()->attachData(false, 'test.png')->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+
+        $this->sent = [];
+        $this->composeEmail()->attachData('', 'test.png')->send();
+        $this->artisan('email:send');
+        $attachments = reset($this->sent)->getMessage()->getChildren();
+        $this->assertCount(0, $attachments);
+    }
 }