@@ -111,10 +111,12 @@ class Client
111
111
*/
112
112
public function __construct (array $ user_config )
113
113
{
114
+ $ user_config = array_filter ($ user_config , static fn ($ value ) => !is_null ($ value ));
115
+
114
116
$ this ->http_client = (new Factory ())->withOptions ([
115
- 'connect_timeout ' => Arr::get ($ user_config , 'timeout ' , 0 ) ?? 0 ,
117
+ 'connect_timeout ' => Arr::get ($ user_config , 'timeout ' , 0 ),
116
118
'proxy ' => Arr::get ($ user_config , 'http_proxy ' ),
117
- 'verify ' => ( Arr::get ($ user_config , 'verify ' , true ) ?? true ) ?: ( Arr::get ($ user_config , 'cert_path ' , false ) ?? false )
119
+ 'verify ' => Arr::get ($ user_config , 'verify ' , true ) ?: Arr::get ($ user_config , 'cert_path ' , false )
118
120
]);
119
121
120
122
// Auto discovery
@@ -125,6 +127,7 @@ public function __construct(array $user_config)
125
127
"$ provider_url/.well-known/openid-configuration " ,
126
128
Arr::get ($ user_config , 'well_known_request_params ' )
127
129
);
130
+
128
131
if ($ response ->ok ()) {
129
132
$ config = $ response ->collect ()->merge ($ user_config );
130
133
}
@@ -158,7 +161,7 @@ public function __construct(array $user_config)
158
161
'jwt_plain_key ' => false
159
162
];
160
163
foreach ($ props as $ prop => $ default ) {
161
- $ this ->{$ prop } = $ config ->get ($ prop , $ default ) ?? $ default ;
164
+ $ this ->{$ prop } = $ config ->get ($ prop , $ default );
162
165
}
163
166
164
167
if (empty ($ this ->code_challenge_method )) {
0 commit comments