@@ -55,18 +55,42 @@ public static function of(string $string): self
55
55
}
56
56
57
57
return new self (
58
- $ data ['scheme ' ] ? Scheme::of ($ data ['scheme ' ]) : Scheme::none (),
58
+ match ($ data ['scheme ' ]) {
59
+ null , '' => Scheme::none (),
60
+ default => Scheme::of ($ data ['scheme ' ]),
61
+ },
59
62
Authority::of (
60
63
UserInformation::of (
61
- $ data ['user ' ] ? User::of ($ data ['user ' ]) : User::none (),
62
- $ data ['pass ' ] ? Password::of ($ data ['pass ' ]) : Password::none (),
64
+ match ($ data ['user ' ]) {
65
+ null , '' => User::none (),
66
+ default => User::of ($ data ['user ' ]),
67
+ },
68
+ match ($ data ['pass ' ]) {
69
+ null , '' => Password::none (),
70
+ default => Password::of ($ data ['pass ' ]),
71
+ },
63
72
),
64
- $ data ['host ' ] ? Host::of ($ data ['host ' ]) : Host::none (),
65
- $ data ['port ' ] ? Port::of ((int ) $ data ['port ' ]) : Port::none (),
73
+ match ($ data ['host ' ]) {
74
+ null , '' => Host::none (),
75
+ default => Host::of ($ data ['host ' ]),
76
+ },
77
+ match ($ data ['port ' ]) {
78
+ null , '' => Port::none (),
79
+ default => Port::of ((int ) $ data ['port ' ]),
80
+ },
66
81
),
67
- $ data ['path ' ] && !empty ($ data ['path ' ]) ? Path::of ($ data ['path ' ]) : Path::none (),
68
- $ data ['query ' ] ? Query::of ($ data ['query ' ]) : Query::none (),
69
- $ data ['fragment ' ] ? Fragment::of ($ data ['fragment ' ]) : Fragment::none (),
82
+ match ($ data ['path ' ]) {
83
+ null , '' => Path::none (),
84
+ default => Path::of ($ data ['path ' ]),
85
+ },
86
+ match ($ data ['query ' ]) {
87
+ null , '' => Query::none (),
88
+ default => Query::of ($ data ['query ' ]),
89
+ },
90
+ match ($ data ['fragment ' ]) {
91
+ null , '' => Fragment::none (),
92
+ default => Fragment::of ($ data ['fragment ' ]),
93
+ },
70
94
);
71
95
}
72
96
0 commit comments