Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] Duplicated mailable in-memory data attachments with different names #32392

Merged
merged 3 commits into from
Apr 15, 2020
Merged

[6.x] Duplicated mailable in-memory data attachments with different names #32392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96e3291
Filter duplicated attachments from in-memory data by both content and…
mnabialek Apr 15, 2020
5f7b00d
Add test for ignoring duplicated attachments from in-memory data
mnabialek Apr 15, 2020
3203c81
Update Mailable.php
taylorotwell Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Illuminate/Mail/Mailable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,9 @@ public function attachData($data, $name, array $options = [])
{
$this->rawAttachments = collect($this->rawAttachments)
->push(compact('data', 'name', 'options'))
->unique('data')
->all();
->unique(function ($file) {
return $file['name'].$file['data'];
})->all();

return $this;
}
Expand Down
42 changes: 42 additions & 0 deletions tests/Mail/MailMailableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,48 @@ public function testMailableSetsReplyToCorrectly()
$this->assertTrue($mailable->hasReplyTo('[email protected]'));
}

public function testItIgnoresDuplicatedRawAttachments()
{
$mailable = new WelcomeMailableStub;

$mailable->attachData('content1', 'report-1.txt');
$this->assertCount(1, $mailable->rawAttachments);

$mailable->attachData('content2', 'report-2.txt');
$this->assertCount(2, $mailable->rawAttachments);

$mailable->attachData('content1', 'report-1.txt');
$mailable->attachData('content2', 'report-2.txt');
$this->assertCount(2, $mailable->rawAttachments);

$mailable->attachData('content1', 'report-3.txt');
$mailable->attachData('content2', 'report-4.txt');
$this->assertCount(4, $mailable->rawAttachments);

$this->assertSame([
[
'data' => 'content1',
'name' => 'report-1.txt',
'options' => [],
],
[
'data' => 'content2',
'name' => 'report-2.txt',
'options' => [],
],
[
'data' => 'content1',
'name' => 'report-3.txt',
'options' => [],
],
[
'data' => 'content2',
'name' => 'report-4.txt',
'options' => [],
],
], $mailable->rawAttachments);
}

public function testMailableBuildsViewData()
{
$mailable = new WelcomeMailableStub;
Expand Down