diff --git a/src/helper.php b/src/helper.php index dfeb099c09..198680f491 100644 --- a/src/helper.php +++ b/src/helper.php @@ -208,8 +208,8 @@ function dump(...$vars) /** * 获取环境变量值 * @access public - * @param string $name 环境变量名(支持二级 .号分割) - * @param string $default 默认值 + * @param ?string $name 环境变量名(支持二级 .号分割) + * @param mixed $default 默认值 * @return mixed */ function env(?string $name = null, $default = null) diff --git a/src/think/Env.php b/src/think/Env.php index 91e54a531e..5b53036208 100644 --- a/src/think/Env.php +++ b/src/think/Env.php @@ -57,11 +57,11 @@ public function load(string $file): void /** * 获取环境变量值 * @access public - * @param string $name 环境变量名 - * @param mixed $default 默认值 + * @param ?string $name 环境变量名 + * @param mixed $default 默认值 * @return mixed */ - public function get(?string $name = null, $default = null) + public function get(?string $name = null, mixed $default = null) { if (is_null($name)) { return $this->data;