fixed encoder in Mime

fabpot · fabpot · commit af28965c2487 · 2019-03-20T21:49:31.000+01:00
diff --git a/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php
@@ -40,10 +40,6 @@ public function __construct(string $address)
             self::$validator = new EmailValidator();
         }
 
-        if (null === self::$encoder) {
-            self::$encoder = new IdnAddressEncoder();
-        }
-
         if (!self::$validator->isValid($address, new RFCValidation())) {
             throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));
         }
@@ -58,6 +54,10 @@ public function getAddress(): string
 
     public function getEncodedAddress(): string
     {
+        if (null === self::$encoder) {
+            self::$encoder = new IdnAddressEncoder();
+        }
+
         return self::$encoder->encodeString($this->address);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,6 @@ public function __construct(string $address)`
`40`	`40`	`self::$validator = new EmailValidator();`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (null === self::$encoder) {`
`44`		`- self::$encoder = new IdnAddressEncoder();`
`45`		`- }`
`46`		`-`
`47`	`43`	`if (!self::$validator->isValid($address, new RFCValidation())) {`
`48`	`44`	`throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));`
`49`	`45`	`}`
`@@ -58,6 +54,10 @@ public function getAddress(): string`
`58`	`54`
`59`	`55`	`public function getEncodedAddress(): string`
`60`	`56`	`{`
	`57`	`+ if (null === self::$encoder) {`
	`58`	`+ self::$encoder = new IdnAddressEncoder();`
	`59`	`+ }`
	`60`	`+`
`61`	`61`	`return self::$encoder->encodeString($this->address);`
`62`	`62`	`}`
`63`	`63`