@@ -37,24 +37,24 @@ public function __construct(string $scheme, string $host, string $user = null, s
37
37
38
38
public static function fromString (string $ dsn ): self
39
39
{
40
- if (false === $ parsedDsn = parse_url ($ dsn )) {
40
+ if (false === $ params = parse_url ($ dsn )) {
41
41
throw new InvalidArgumentException ('The mailer DSN is invalid. ' );
42
42
}
43
43
44
- if (!isset ($ parsedDsn ['scheme ' ])) {
44
+ if (!isset ($ params ['scheme ' ])) {
45
45
throw new InvalidArgumentException ('The mailer DSN must contain a scheme. ' );
46
46
}
47
47
48
- if (!isset ($ parsedDsn ['host ' ])) {
48
+ if (!isset ($ params ['host ' ])) {
49
49
throw new InvalidArgumentException ('The mailer DSN must contain a host (use "default" by default). ' );
50
50
}
51
51
52
- $ user = '' !== ($ parsedDsn ['user ' ] ?? '' ) ? urldecode ( $ parsedDsn ['user ' ]) : null ;
53
- $ password = '' !== ($ parsedDsn ['pass ' ] ?? '' ) ? urldecode ( $ parsedDsn ['pass ' ]) : null ;
54
- $ port = $ parsedDsn ['port ' ] ?? null ;
55
- parse_str ($ parsedDsn ['query ' ] ?? '' , $ query );
52
+ $ user = '' !== ($ params ['user ' ] ?? '' ) ? rawurldecode ( $ params ['user ' ]) : null ;
53
+ $ password = '' !== ($ params ['pass ' ] ?? '' ) ? rawurldecode ( $ params ['pass ' ]) : null ;
54
+ $ port = $ params ['port ' ] ?? null ;
55
+ parse_str ($ params ['query ' ] ?? '' , $ query );
56
56
57
- return new self ($ parsedDsn ['scheme ' ], $ parsedDsn ['host ' ], $ user , $ password , $ port , $ query );
57
+ return new self ($ params ['scheme ' ], $ params ['host ' ], $ user , $ password , $ port , $ query );
58
58
}
59
59
60
60
public function getScheme (): string
0 commit comments