Merge branch '4.3' into 4.4

fabpot · fabpot · commit 7aedfe707977 · 2019-08-21T10:50:18.000+02:00
* 4.3:
  [Mime] Trim and remove line breaks from NamedAddress name arg
diff --git a/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php
@@ -39,12 +39,12 @@ public function __construct(string $address, string $name = '')
             self::$validator = new EmailValidator();
         }
 
-        if (!self::$validator->isValid($address, new RFCValidation())) {
+        $this->address = trim($address);
+        $this->name = trim(str_replace(["\n", "\r"], '', $name));
+
+        if (!self::$validator->isValid($this->address, new RFCValidation())) {
             throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));
         }
-
-        $this->address = $address;
-        $this->name = $name;
     }
 
     public function getAddress(): string
diff --git a/src/Symfony/Component/Mime/Tests/AddressTest.php b/src/Symfony/Component/Mime/Tests/AddressTest.php
@@ -63,4 +63,18 @@ public function testCreateArrayWrongArg()
         $this->expectException(\InvalidArgumentException::class);
         Address::createArray([new \stdClass()]);
     }
+
+    /**
+     * @dataProvider nameEmptyDataProvider
+     */
+    public function testNameEmpty(string $name)
+    {
+        $mail = 'mail@example.org';
+        $this->assertSame($mail, (new Address($mail, $name))->toString());
+    }
+
+    public function nameEmptyDataProvider(): array
+    {
+        return [[''], [' '], [" \r\n "]];
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ public function __construct(string $address, string $name = '')`
`39`	`39`	`self::$validator = new EmailValidator();`
`40`	`40`	`}`
`41`	`41`
`42`		`- if (!self::$validator->isValid($address, new RFCValidation())) {`
	`42`	`+ $this->address = trim($address);`
	`43`	`+ $this->name = trim(str_replace(["\n", "\r"], '', $name));`
	`44`	`+`
	`45`	`+ if (!self::$validator->isValid($this->address, new RFCValidation())) {`
`43`	`46`	`throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));`
`44`	`47`	`}`
`45`		`-`
`46`		`- $this->address = $address;`
`47`		`- $this->name = $name;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function getAddress(): string`