From e2f3be3eade8c14309255411d6439a9b1f9fc5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Mon, 25 Oct 2021 18:45:36 +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 --- kiri-engine/Kiri.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/kiri-engine/Kiri.php b/kiri-engine/Kiri.php index 55ab51d3..937cb0eb 100644 --- a/kiri-engine/Kiri.php +++ b/kiri-engine/Kiri.php @@ -6,17 +6,15 @@ namespace Kiri; use Annotation\Annotation; -use Database\ModelInterface; use Database\Collection; +use Database\ModelInterface; use Exception; use JetBrains\PhpStorm\Pure; use Kiri\Abstracts\Config; use Kiri\Core\Json; use Kiri\Di\Container; use Kiri\Di\ContainerInterface; -use Kiri\Exception\NotFindClassException; use ReflectionException; -use ReflectionProperty; use Server\ServerManager; use Swoole\Coroutine; use Swoole\Process; @@ -44,7 +42,7 @@ class Kiri { /** @var Container */ - public static Container $container; + private static Container $container; /** @var ?Application */ @@ -62,6 +60,16 @@ class Kiri } + /** + * @param Container $container + */ + public static function setContainer(Container $container) + { + $container->setBindings(ContainerInterface::class, $container); + static::$container = $container; + } + + /** * @param $alias * @param array $array @@ -613,5 +621,4 @@ class Kiri } //spl_autoload_register([Kiri::class, 'autoload'], true, true); -Kiri::$container = new Container(); -Kiri::$container->setBindings(ContainerInterface::class, Kiri::$container); +Kiri::setContainer(new Container());