From d7fd23800b7be26a6cdeb24e3771a6980af6f1c4 Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Fri, 26 May 2023 09:20:31 +0800
Subject: [PATCH] qqq

---
 kiri-engine/Abstracts/BaseApplication.php |  5 ++---
 kiri-engine/Application.php               |  4 +---
 kiri-engine/Pool/Pool.php                 | 11 ++++++-----
 kiri-engine/Pool/PoolItem.php             |  8 ++++----
 kiri-engine/Redis/Redis.php               |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/kiri-engine/Abstracts/BaseApplication.php b/kiri-engine/Abstracts/BaseApplication.php
index ff8c5768..00d6300b 100644
--- a/kiri-engine/Abstracts/BaseApplication.php
+++ b/kiri-engine/Abstracts/BaseApplication.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace Kiri\Abstracts;
 
 
+use Database\DatabasesProviders;
 use Exception;
 use Kiri;
 use Kiri\Di\LocalService;
@@ -22,6 +23,7 @@ use Kiri\Events\EventProvider;
 /**
  * Class BaseApplication
  * @package Kiri\Base
+ * @property DatabasesProviders $connections
  */
 abstract class BaseApplication extends Component
 {
@@ -32,9 +34,6 @@ abstract class BaseApplication extends Component
      */
     public string $storage = APP_PATH . 'storage';
 
-    public string $envPath = APP_PATH . '.env';
-
-
     public LocalService $localService;
 
     /**
diff --git a/kiri-engine/Application.php b/kiri-engine/Application.php
index e28040a1..83bb2bba 100644
--- a/kiri-engine/Application.php
+++ b/kiri-engine/Application.php
@@ -12,7 +12,7 @@ namespace Kiri;
 
 use Exception;
 use Kiri;
-use Kiri\Abstracts\{BaseApplication, Config, Kernel};
+use Kiri\Abstracts\{BaseApplication, Kernel};
 use Kiri\Di\LocalService;
 use Kiri\Di\Scanner;
 use Kiri\Error\ErrorHandler;
@@ -31,8 +31,6 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
  * Class Init
  *
  * @package Kiri
- *
- * @property-read Config $config
  */
 class Application extends BaseApplication
 {
diff --git a/kiri-engine/Pool/Pool.php b/kiri-engine/Pool/Pool.php
index 2226587a..fb076969 100644
--- a/kiri-engine/Pool/Pool.php
+++ b/kiri-engine/Pool/Pool.php
@@ -90,7 +90,7 @@ class Pool extends Component
 	 * @param int $max
 	 * @param \Closure $closure
 	 */
-	public function initConnections($name, int $max, \Closure $closure): void
+	public function created($name, int $max, \Closure $closure): void
 	{
 		if (!isset($this->_connections[$name])) {
 			$this->_connections[$name] = new PoolItem($max, $closure);
@@ -113,12 +113,13 @@ class Pool extends Component
 	}
 
 
+    /**
+     * @param $name
+     * @return bool
+     */
 	public function hasChannel($name): bool
 	{
-		if (!isset($this->_connections[$name])) {
-			return false;
-		}
-		return true;
+		return isset($this->_connections[$name]) && $this->_connections[$name] instanceof PoolItem;
 	}
 
 
diff --git a/kiri-engine/Pool/PoolItem.php b/kiri-engine/Pool/PoolItem.php
index b875c1c1..62ddb55e 100644
--- a/kiri-engine/Pool/PoolItem.php
+++ b/kiri-engine/Pool/PoolItem.php
@@ -65,10 +65,10 @@ class PoolItem
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	public function size(): bool
+    /**
+     * @return int
+     */
+	public function size(): int
 	{
 		return $this->_items->length();
 	}
diff --git a/kiri-engine/Redis/Redis.php b/kiri-engine/Redis/Redis.php
index 2499b841..fef00cf2 100644
--- a/kiri-engine/Redis/Redis.php
+++ b/kiri-engine/Redis/Redis.php
@@ -68,7 +68,7 @@ class Redis extends Component
 
 		$length = \config('cache.redis.pool.max', 10);
 		on(OnWorkerExit::class, [$this, 'destroy']);
-		Kiri::getPool()->initConnections($config['host'], $length, static function () use ($config) {
+		Kiri::getPool()->created($config['host'], $length, static function () use ($config) {
 			$redis = new \Redis();
 			if (!$redis->connect($config['host'], $config['port'], $config['timeout'])) {
 				throw new RedisConnectException(sprintf('The Redis Connect %s::%d Fail.', $config['host'], $config['port']));