From c95753523f44f05ebafce37ea38893157db40314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 5 Aug 2021 17:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- System/Di/Container.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/System/Di/Container.php b/System/Di/Container.php index ed964dd0..fc6e8452 100644 --- a/System/Di/Container.php +++ b/System/Di/Container.php @@ -135,12 +135,11 @@ class Container extends BaseObject if ($construct->getNumberOfParameters() < 1) { return $reflect->newInstance(); } - if (empty($dependencies)) { - return $reflect->newInstanceWithoutConstructor(); + if (!empty($dependencies)) { + $parameters = $this->mergeParam($this->resolveMethodParameters($construct), $dependencies); + return $reflect->newInstanceArgs($parameters); } - $parameters = $this->resolveMethodParameters($construct); - $parameters = $this->mergeParam($parameters, $dependencies); - return $reflect->newInstanceArgs($parameters); + return $reflect->newInstanceWithoutConstructor(); }