symfony
diff --git a/‎src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Mime/Address.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Address.php
+10-1Lines changed: 10 additions & 1 deletion b/‎src/Symfony/Component/Mime/Address.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Address.php
+10-1Lines changed: 10 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Mime/Tests/AddressTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/AddressTest.php
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Mime/Tests/AddressTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/AddressTest.php
+7-1Lines changed: 7 additions & 1 deletion
@@ -62,8 +62,8 @@ public function testSend()
             parse_str($options['body'], $content);
 
             $this->assertSame('Hello!', $content['Message_Subject_Data']);
-            $this->assertSame('Saif Eddin <saif.gmati@symfony.com>', $content['Destination_ToAddresses_member'][0]);
-            $this->assertSame('Fabien <fabpot@symfony.com>', $content['Source']);
+            $this->assertSame('"Saif Eddin" <saif.gmati@symfony.com>', $content['Destination_ToAddresses_member'][0]);
+            $this->assertSame('"Fabien" <fabpot@symfony.com>', $content['Source']);
             $this->assertSame('Hello There!', $content['Message_Body_Text_Data']);
 
             $xml = '<SendEmailResponse xmlns="https://email.amazonaws.com/doc/2010-03-31/">
 
@@ -82,8 +82,8 @@ public function testSend()
             }
 
             $this->assertStringContainsString('Hello!', $content);
-            $this->assertStringContainsString('Saif Eddin <saif.gmati@symfony.com>', $content);
-            $this->assertStringContainsString('Fabien <fabpot@symfony.com>', $content);
+            $this->assertStringContainsString('"Saif Eddin" <saif.gmati@symfony.com>', $content);
+            $this->assertStringContainsString('"Fabien" <fabpot@symfony.com>', $content);
             $this->assertStringContainsString('Hello There!', $content);
 
             return new MockResponse(json_encode(['id' => 'foobar']), [
 
@@ -74,8 +74,8 @@ public function testSend()
             $this->assertStringContainsStringIgnoringCase('X-Postmark-Server-Token: KEY', $options['headers'][1] ?? $options['request_headers'][1]);
 
             $body = json_decode($options['body'], true);
-            $this->assertSame('Fabien <fabpot@symfony.com>', $body['From']);
-            $this->assertSame('Saif Eddin <saif.gmati@symfony.com>', $body['To']);
+            $this->assertSame('"Fabien" <fabpot@symfony.com>', $body['From']);
+            $this->assertSame('"Saif Eddin" <saif.gmati@symfony.com>', $body['To']);
             $this->assertSame('Hello!', $body['Subject']);
             $this->assertSame('Hello There!', $body['TextBody']);
 
 
@@ -77,7 +77,16 @@ public function getEncodedAddress(): string
 
     public function toString(): string
     {
-        return ($n = $this->getName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress();
+        return ($n = $this->getEncodedName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress();
+    }
+
+    public function getEncodedName(): string
+    {
+        if ('' === $this->getName()) {
+            return '';
+        }
+
+        return sprintf('"%s"', preg_replace('/"/u', '\"', $this->getName()));
     }
 
     /**
 
@@ -27,7 +27,7 @@ public function testConstructor()
         $a = new Address('fabien@symfonï.com', 'Fabien');
         $this->assertEquals('Fabien', $a->getName());
         $this->assertEquals('fabien@symfonï.com', $a->getAddress());
-        $this->assertEquals('Fabien <fabien@xn--symfon-nwa.com>', $a->toString());
+        $this->assertEquals('"Fabien" <fabien@xn--symfon-nwa.com>', $a->toString());
         $this->assertEquals('fabien@xn--symfon-nwa.com', $a->getEncodedAddress());
     }
 
@@ -153,4 +153,10 @@ public function fromStringProvider()
             ],
         ];
     }
+
+    public function testEncodeNameIfNameContainsCommas()
+    {
+        $address = new Address('fabien@symfony.com', 'Fabien, "Potencier');
+        $this->assertSame('"Fabien, \"Potencier" <fabien@symfony.com>', $address->toString());
+    }
 }