diff --git a/src/ZM/Container/Container.php b/src/ZM/Container/Container.php index d6c18433..a235aea0 100644 --- a/src/ZM/Container/Container.php +++ b/src/ZM/Container/Container.php @@ -44,10 +44,10 @@ class Container extends WorkerContainer * 获取一个绑定的实例 * * @template T - * @param string $abstract 类或接口名 + * @param class-string $abstract 类或接口名 * @param array $parameters 参数 * @throws EntryResolutionException - * @return T 实例 + * @return Closure|mixed|T 实例 */ public function make(string $abstract, array $parameters = []) { diff --git a/src/ZM/Container/ContainerInterface.php b/src/ZM/Container/ContainerInterface.php index 53372b1e..e667a547 100644 --- a/src/ZM/Container/ContainerInterface.php +++ b/src/ZM/Container/ContainerInterface.php @@ -92,9 +92,9 @@ interface ContainerInterface extends PsrContainerInterface * 获取一个绑定的实例 * * @template T - * @param string $abstract 类或接口名 - * @param array $parameters 参数 - * @return T 实例 + * @param class-string $abstract 类或接口名 + * @param array $parameters 参数 + * @return Closure|mixed|T 实例 */ public function make(string $abstract, array $parameters = []); diff --git a/src/ZM/Container/WorkerContainer.php b/src/ZM/Container/WorkerContainer.php index a5bd2ee2..41d0c634 100644 --- a/src/ZM/Container/WorkerContainer.php +++ b/src/ZM/Container/WorkerContainer.php @@ -211,10 +211,10 @@ class WorkerContainer implements ContainerInterface * 获取一个绑定的实例 * * @template T - * @param string $abstract 类或接口名 + * @param class-string $abstract 类或接口名 * @param array $parameters 参数 * @throws EntryResolutionException - * @return T 实例 + * @return Closure|mixed|T 实例 */ public function make(string $abstract, array $parameters = []) { diff --git a/src/ZM/global_functions.php b/src/ZM/global_functions.php index 13dd3c69..5bbe0d2b 100644 --- a/src/ZM/global_functions.php +++ b/src/ZM/global_functions.php @@ -656,8 +656,8 @@ function container(): ContainerInterface * 解析类实例(使用容器) * * @template T - * @param string $abstract - * @return T + * @param class-string $abstract + * @return Closure|mixed|T */ function resolve(string $abstract, array $parameters = []) { @@ -668,8 +668,8 @@ function resolve(string $abstract, array $parameters = []) * 获取容器实例 * * @template T - * @param null|string $abstract - * @return ContainerInterface|T + * @param null|class-string $abstract + * @return Closure|ContainerInterface|mixed|T */ function app(string $abstract = null, array $parameters = []) {