File tree 3 files changed +28
-4
lines changed
3 files changed +28
-4
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ public static function getUserHomeDir(bool $refresh = false): string
54
54
return self ::$ homeDir ;
55
55
}
56
56
57
- if (!$ home = self ::getEnvVal ('HOME ' )) {
57
+ if (!$ home = self ::getEnvStrVal ('HOME ' )) {
58
58
$ isWin = self ::isWindows ();
59
59
60
60
// home on windows
@@ -235,15 +235,26 @@ public static function getTempDir(): string
235
235
return $ tmp ;
236
236
}
237
237
238
+ /**
239
+ * @param string $key
240
+ * @param string|mixed $default
241
+ *
242
+ * @return mixed
243
+ */
244
+ public static function getEnvVal (string $ key , string $ default = '' )
245
+ {
246
+ return getenv ($ key ) ?: ($ _SERVER [$ key ] ?? $ default );
247
+ }
248
+
238
249
/**
239
250
* @param string $key
240
251
* @param string $default
241
252
*
242
253
* @return string
243
254
*/
244
- public static function getEnvVal (string $ key , string $ default = '' ): string
255
+ public static function getEnvStrVal (string $ key , string $ default = '' ): string
245
256
{
246
- return getenv ( $ key ) ?: ( string )( $ _SERVER [ $ key] ?? $ default );
257
+ return ( string ) self :: getEnvVal ( $ key, $ default );
247
258
}
248
259
249
260
/**
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ class PhpDotEnv
56
56
*
57
57
* @return static
58
58
*/
59
- public static function load (string $ fileDir , string $ fileName = '.env ' )
59
+ public static function load (string $ fileDir , string $ fileName = '.env ' ): self
60
60
{
61
61
return new self ($ fileDir , $ fileName );
62
62
}
Original file line number Diff line number Diff line change @@ -113,3 +113,16 @@ function eprints(...$vars): void
113
113
echo Toolkit \Stdlib \Php::exportVar (...$ vars ), PHP_EOL ;
114
114
}
115
115
}
116
+
117
+ if (!function_exists ('env ' )) {
118
+ /**
119
+ * @param string $key
120
+ * @param string $default
121
+ *
122
+ * @return string
123
+ */
124
+ function env (string $ key , string $ default = '' ): string
125
+ {
126
+ return Toolkit \Stdlib \OS ::getEnvStrVal ($ key , $ default );
127
+ }
128
+ }
You can’t perform that action at this time.
0 commit comments