diff --git a/src/helper.php b/src/helper.php index dfeb099c09..67244a53ac 100644 --- a/src/helper.php +++ b/src/helper.php @@ -209,10 +209,10 @@ function dump(...$vars) * 获取环境变量值 * @access public * @param string $name 环境变量名(支持二级 .号分割) - * @param string $default 默认值 + * @param mixed $default 默认值 * @return mixed */ - function env(?string $name = null, $default = null) + function env(?string $name = null, mixed $default = null) { return Env::get($name, $default); } diff --git a/src/think/Env.php b/src/think/Env.php index 91e54a531e..47695f9d6e 100644 --- a/src/think/Env.php +++ b/src/think/Env.php @@ -61,7 +61,7 @@ public function load(string $file): void * @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; @@ -81,7 +81,7 @@ public function get(?string $name = null, $default = null) return $this->getEnv($name, $default); } - protected function getEnv(string $name, $default = null) + protected function getEnv(string $name, mixed $default = null) { $result = getenv('PHP_' . $name);