Merge pull request #32392 from mnabialek/6.x-mailable-raw-attachments

[6.x] Duplicated mailable attachments with different names
laravel · Apr 15, 2020 · 7c07cc5 · 7c07cc5
2 parents e78d24f + 3203c81
commit 7c07cc5
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
@@ -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;
     }

diff --git a/tests/Mail/MailMailableTest.php b/tests/Mail/MailMailableTest.php
@@ -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;