symfony
diff --git a/‎src/Symfony/Component/Mailer/Envelope.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Envelope.php
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/Mailer/Envelope.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Envelope.php
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mime/Address.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Address.php
+23Lines changed: 23 additions & 0 deletions b/‎src/Symfony/Component/Mime/Address.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Address.php
+23Lines changed: 23 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mime/Tests/AddressTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/AddressTest.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/Mime/Tests/AddressTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/AddressTest.php
+7Lines changed: 7 additions & 0 deletions
@@ -85,4 +85,17 @@ public function getRecipients(): array
     {
         return $this->recipients;
     }
+
+    /**
+      * @return bool
+      */
+    public function anyAddressHasUnicodeLocalpart(): bool
+    {
+        if($this->sender->hasUnicodeLocalpart())
+            return true;
+        foreach($this->recipients as $r)
+            if($r->hasUnicodeLocalpart())
+                return true;
+        return false;
+    }
 }
@@ -127,6 +127,19 @@ public function testRecipientsFromHeaders()
         $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
     }
 
+    public function testUnicodeLocalparts()
+    {
+        /* dømi means example and is reserved by the .fo registry */
+        $i = new Address('info@dømi.fo');
+        $d = new Address('dømi@dømi.fo');
+        $e = new Envelope($i, [$i]);
+        $this->assertFalse($e->anyAddressHasUnicodeLocalpart());
+        $e = new Envelope($i, [$d]);
+        $this->assertTrue($e->anyAddressHasUnicodeLocalpart());
+        $e = new Envelope($i, [$i, $d]);
+        $this->assertTrue($e->anyAddressHasUnicodeLocalpart());
+    }
+
     public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
 
@@ -117,4 +117,27 @@ public static function createArray(array $addresses): array
 
         return $addrs;
     }
+
+    /**
+
+      * Returns true if this address' localpart contains at least one
+      * non-ASCII character, and false if it is only ASCII (or empty).
+      *
+      * This is a helper for Envelope, which has to decide whether to
+      * the SMTPUTF8 extensions (RFC 6530 and following) for any given
+      * message.
+      *
+      * The SMTPUTF8 extension is strictly required if any address
+      * contains a non-ASCII character in its localpart. If non-ASCII
+      * is only used in domains (e.g. horst@freiherr-von-mühlhausen.de)
+      * then it is possible to to send the message using IDN encoding
+      * instead of SMTPUTF8. The most common software will display the
+      * message as intended.
+      *
+      * @return bool
+      */
+    public function hasUnicodeLocalpart(): bool
+    {
+        return (bool) preg_match( '/[\x80-\xFF].*@/', $this->address);
+    }
 }
@@ -81,6 +81,13 @@ public function testCreateArray()
         $this->assertEquals([$fabien], Address::createArray(['fabien@symfony.com']));
     }
 
+    public function testUnicodeLocalpart()
+    {
+        /* dømi means example and is reserved by the .fo registry */
+        $this->assertFalse((new Address('info@dømi.fo'))->hasUnicodeLocalpart());
+        $this->assertTrue((new Address('info@dømi.fo'))->hasUnicodeLocalpart());
+    }
+
     public function testCreateArrayWrongArg()
     {
         $this->expectException(\TypeError::class);
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,17 @@ public function getRecipients(): array`
`85`	`85`	`{`
`86`	`86`	`return $this->recipients;`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ /**`
	`90`	`+ * @return bool`
	`91`	`+ */`
	`92`	`+ public function anyAddressHasUnicodeLocalpart(): bool`
	`93`	`+ {`
	`94`	`+ if($this->sender->hasUnicodeLocalpart())`
	`95`	`+ return true;`
	`96`	`+ foreach($this->recipients as $r)`
	`97`	`+ if($r->hasUnicodeLocalpart())`
	`98`	`+ return true;`
	`99`	`+ return false;`
	`100`	`+ }`
`88`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,13 @@ public function testCreateArray()`
`81`	`81`	`$this->assertEquals([$fabien], Address::createArray(['fabien@symfony.com']));`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ public function testUnicodeLocalpart()`
	`85`	`+ {`
	`86`	`+ /* dømi means example and is reserved by the .fo registry */`
	`87`	`+ $this->assertFalse((new Address('info@dømi.fo'))->hasUnicodeLocalpart());`
	`88`	`+ $this->assertTrue((new Address('info@dømi.fo'))->hasUnicodeLocalpart());`
	`89`	`+ }`
	`90`	`+`
`84`	`91`	`public function testCreateArrayWrongArg()`
`85`	`92`	`{`
`86`	`93`	`$this->expectException(\TypeError::class);`