[Mime] Escape commas in address names

YaFou · YaFou · commit c89ff2157e00 · 2021-01-18T20:27:44.000+01:00
diff --git a/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php
@@ -77,7 +77,12 @@ 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
+    {
+        return sprintf('"%s"', str_replace('/"/u', '\"', $this->getName()));
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Tests/AddressTest.php b/src/Symfony/Component/Mime/Tests/AddressTest.php
@@ -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());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,12 @@ public function getEncodedAddress(): string`
`77`	`77`
`78`	`78`	`public function toString(): string`
`79`	`79`	`{`
`80`		`- return ($n = $this->getName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress();`
	`80`	`+ return ($n = $this->getEncodedName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress();`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ public function getEncodedName(): string`
	`84`	`+ {`
	`85`	`+ return sprintf('"%s"', str_replace('/"/u', '\"', $this->getName()));`
`81`	`86`	`}`
`82`	`87`
`83`	`88`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,10 @@ public function fromStringProvider()`
`153`	`153`	`],`
`154`	`154`	`];`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ public function testEncodeNameIfNameContainsCommas()`
	`158`	`+ {`
	`159`	`+ $address = new Address('fabien@symfony.com', 'Fabien, "Potencier');`
	`160`	`+ $this->assertSame('"Fabien, \"Potencier" <fabien@symfony.com>', $address->toString());`
	`161`	`+ }`
`156`	`162`	`}`