From 9cd44aad3d787cd8b3ae734442be596885644bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Thu, 3 Mar 2022 17:25:47 +0800
Subject: [PATCH] modify plugin name

---
 kiri-engine/Abstracts/BaseApplication.php |  3 ++-
 kiri-engine/Abstracts/Component.php       |  3 ---
 kiri-engine/Application.php               |  2 +-
 kiri-engine/Pool/Connection.php           | 15 +++++----------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/kiri-engine/Abstracts/BaseApplication.php b/kiri-engine/Abstracts/BaseApplication.php
index 39d2cc42..420b7d0f 100644
--- a/kiri-engine/Abstracts/BaseApplication.php
+++ b/kiri-engine/Abstracts/BaseApplication.php
@@ -15,6 +15,7 @@ use Kiri;
 use Kiri\Di\LocalService;
 use Kiri\Error\{ErrorHandler, StdoutLogger, StdoutLoggerInterface};
 use Kiri\Exception\{InitException};
+use Psr\Container\ContainerInterface;
 use Kiri\Server\{Server};
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -41,7 +42,7 @@ abstract class BaseApplication extends Component
 	 *
 	 * @throws
 	 */
-	public function __construct()
+	public function __construct(public ContainerInterface $container)
 	{
 		Kiri::init($this);
 		$config = sweep(APP_PATH . '/config');
diff --git a/kiri-engine/Abstracts/Component.php b/kiri-engine/Abstracts/Component.php
index 4cdd4fe0..a331667f 100644
--- a/kiri-engine/Abstracts/Component.php
+++ b/kiri-engine/Abstracts/Component.php
@@ -24,9 +24,6 @@ use Psr\Container\NotFoundExceptionInterface;
 /**
  * Class Component
  * @package Kiri\Base
- * @property EventDispatch $eventDispatch
- * @property EventProvider $eventProvider
- * @property Container $container
  */
 class Component implements Configure
 {
diff --git a/kiri-engine/Application.php b/kiri-engine/Application.php
index 355d85b3..cab743f4 100644
--- a/kiri-engine/Application.php
+++ b/kiri-engine/Application.php
@@ -236,7 +236,7 @@ class Application extends BaseApplication
 	{
 		fire(new OnBeforeCommandExecute());
 
-		$this->getContainer()->setBindings(OutputInterface::class, $output);
+		$this->container->setBindings(OutputInterface::class, $output);
 
 		if (!($class instanceof HotReload)) {
 			scan_directory(MODEL_PATH, 'app\Model');
diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php
index eeffcb75..24bd7026 100644
--- a/kiri-engine/Pool/Connection.php
+++ b/kiri-engine/Pool/Connection.php
@@ -11,8 +11,6 @@ use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Context;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Error;
 use Throwable;
 
@@ -24,17 +22,14 @@ class Connection extends Component
 {
 
 
-	private Pool $pool;
-
-
 	/**
-	 * @return void
-	 * @throws ContainerExceptionInterface
-	 * @throws NotFoundExceptionInterface
+	 * @param Pool $pool
+	 * @param array $config
+	 * @throws Exception
 	 */
-	public function init()
+	public function __construct(public Pool $pool, array $config = [])
 	{
-		$this->pool = $this->getContainer()->get(Pool::class);
+		parent::__construct($config);
 	}