diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php index 868f06270a44..49fee04e9182 100644 --- a/src/Illuminate/Mail/Mailable.php +++ b/src/Illuminate/Mail/Mailable.php @@ -143,7 +143,6 @@ class Mailable implements MailableContract, Renderable */ public $embeds = []; - /** * The raw embedded attachments for the message. * @@ -151,7 +150,6 @@ class Mailable implements MailableContract, Renderable */ public $rawEmbeds = []; - /** * The tags for the message. * diff --git a/src/Illuminate/Notifications/Messages/MailMessage.php b/src/Illuminate/Notifications/Messages/MailMessage.php index 58ad595fe58d..3367a127d16b 100644 --- a/src/Illuminate/Notifications/Messages/MailMessage.php +++ b/src/Illuminate/Notifications/Messages/MailMessage.php @@ -91,7 +91,6 @@ class MailMessage extends SimpleMessage implements Renderable */ public $embeds = []; - /** * The raw embedded attachments for the message. * diff --git a/tests/Mail/MailMailableTest.php b/tests/Mail/MailMailableTest.php index c9b143baab1d..980d24f8b54e 100644 --- a/tests/Mail/MailMailableTest.php +++ b/tests/Mail/MailMailableTest.php @@ -578,7 +578,7 @@ public function toMailAttachment() } }); - $this->assertSame(__DIR__.'/foo.jpg' , $mailable->embeds[0]); + $this->assertSame(__DIR__.'/foo.jpg', $mailable->embeds[0]); } } diff --git a/tests/Mail/MailMessageTest.php b/tests/Mail/MailMessageTest.php index 86e79ef6849f..056f5537c1d9 100755 --- a/tests/Mail/MailMessageTest.php +++ b/tests/Mail/MailMessageTest.php @@ -96,9 +96,9 @@ public function testBasicAttachment() $attachment = $this->message->getSymfonyMessage()->getAttachments()[0]; $headers = $attachment->getPreparedHeaders()->toArray(); $this->assertSame('expected attachment body', $attachment->getBody()); - $this->assertSame("Content-Type: image/png; name=bar.jpg", $headers[0]); + $this->assertSame('Content-Type: image/png; name=bar.jpg', $headers[0]); $this->assertSame('Content-Transfer-Encoding: base64', $headers[1]); - $this->assertSame("Content-Disposition: attachment; name=bar.jpg; filename=bar.jpg", $headers[2]); + $this->assertSame('Content-Disposition: attachment; name=bar.jpg; filename=bar.jpg', $headers[2]); unlink($path); } @@ -110,9 +110,9 @@ public function testDataAttachment() $attachment = $this->message->getSymfonyMessage()->getAttachments()[0]; $headers = $attachment->getPreparedHeaders()->toArray(); $this->assertSame('expected attachment body', $attachment->getBody()); - $this->assertSame("Content-Type: image/png; name=foo.jpg", $headers[0]); + $this->assertSame('Content-Type: image/png; name=foo.jpg', $headers[0]); $this->assertSame('Content-Transfer-Encoding: base64', $headers[1]); - $this->assertSame("Content-Disposition: attachment; name=foo.jpg; filename=foo.jpg", $headers[2]); + $this->assertSame('Content-Disposition: attachment; name=foo.jpg; filename=foo.jpg', $headers[2]); } public function testItAttachesFilesViaAttachableContractFromPath() @@ -132,9 +132,9 @@ public function toMailAttachment() $attachment = $this->message->getSymfonyMessage()->getAttachments()[0]; $headers = $attachment->getPreparedHeaders()->toArray(); $this->assertSame('expected attachment body', $attachment->getBody()); - $this->assertSame("Content-Type: image/png; name=bar.jpg", $headers[0]); + $this->assertSame('Content-Type: image/png; name=bar.jpg', $headers[0]); $this->assertSame('Content-Transfer-Encoding: base64', $headers[1]); - $this->assertSame("Content-Disposition: attachment; name=bar.jpg; filename=bar.jpg", $headers[2]); + $this->assertSame('Content-Disposition: attachment; name=bar.jpg; filename=bar.jpg', $headers[2]); unlink($path); } @@ -153,9 +153,9 @@ public function toMailAttachment() $attachment = $this->message->getSymfonyMessage()->getAttachments()[0]; $headers = $attachment->getPreparedHeaders()->toArray(); $this->assertSame('expected attachment body', $attachment->getBody()); - $this->assertSame("Content-Type: image/png; name=foo.jpg", $headers[0]); + $this->assertSame('Content-Type: image/png; name=foo.jpg', $headers[0]); $this->assertSame('Content-Transfer-Encoding: base64', $headers[1]); - $this->assertSame("Content-Disposition: attachment; name=foo.jpg; filename=foo.jpg", $headers[2]); + $this->assertSame('Content-Disposition: attachment; name=foo.jpg; filename=foo.jpg', $headers[2]); } public function testBasicEmbed() @@ -182,9 +182,9 @@ public function testDataEmbed() $attachment = $this->message->getSymfonyMessage()->getAttachments()[0]; $headers = $attachment->getPreparedHeaders()->toArray(); $this->assertSame('expected attachment body', $attachment->getBody()); - $this->assertSame("Content-Type: image/png; name=foo.jpg", $headers[0]); + $this->assertSame('Content-Type: image/png; name=foo.jpg', $headers[0]); $this->assertSame('Content-Transfer-Encoding: base64', $headers[1]); - $this->assertSame("Content-Disposition: inline; name=foo.jpg; filename=foo.jpg", $headers[2]); + $this->assertSame('Content-Disposition: inline; name=foo.jpg; filename=foo.jpg', $headers[2]); } public function testItEmbedsFilesViaAttachableContractFromPath() diff --git a/tests/Notifications/NotificationMailMessageTest.php b/tests/Notifications/NotificationMailMessageTest.php index 589eb98eda64..aeb7ef0da079 100644 --- a/tests/Notifications/NotificationMailMessageTest.php +++ b/tests/Notifications/NotificationMailMessageTest.php @@ -353,6 +353,6 @@ public function toMailAttachment() } }); - $this->assertSame(__DIR__.'/foo.jpg' , $mailMessage->embeds[0]); + $this->assertSame(__DIR__.'/foo.jpg', $mailMessage->embeds[0]); } }