修复

imiphp · Dec 14, 2023 · f492bb5 · f492bb5
1 parent 32ddd1c
commit f492bb5
Show file tree

Hide file tree

Showing 34 changed files with 41 additions and 649 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -529,7 +529,7 @@ jobs:
           composer update --prefer-dist --no-progress
           Write-Output "::endgroup::"
           Write-Output "::group::Table Init"
-          php src\Cli\bin\imi-cli generate/table --app-namespace "Imi\Test\Component"
+          php src\Cli\bin\imi-cli generate/table --app-namespace "Imi\Model\Test"
           Write-Output "::endgroup::"
 
       - name: Install RoadRunner

diff --git a/phpstan-components.neon b/phpstan-components.neon
@@ -35,6 +35,9 @@ parameters:
         -
             message: '#^Call to an undefined method Swoole\\Coroutine\\#'
             reportUnmatched: false
+        -
+            message: '#should return .*static\(.+\).+but returns .+#'
+            reportUnmatched: false
 
 services:
 includes:

diff --git a/src/Cli/Tools/Imi/Imi.php b/src/Cli/Tools/Imi/Imi.php
@@ -11,7 +11,6 @@
 use Imi\Cli\Contract\BaseCommand;
 use Imi\Core\Runtime\Runtime;
 use Imi\Log\Log;
-use Imi\Pool\Annotation\PoolClean;
 use Imi\Util\File;
 use Imi\Util\Imi as ImiUtil;
 use Imi\Util\Text;
@@ -56,7 +55,6 @@ public function clearImiRuntime(?string $runtimeMode = null): void
     /**
      * 构建项目预加载缓存.
      */
-    #[PoolClean]
     #[CommandAction(name: 'buildRuntime', description: '构建项目预加载缓存')]
     #[Option(name: 'changedFilesFile', type: \Imi\Cli\ArgType::STRING, comments: '保存改变的文件列表的文件，一行一个')]
     #[Option(name: 'confirm', type: \Imi\Cli\ArgType::BOOLEAN, default: false, comments: '是否等待输入y后再构建')]

diff --git a/src/Components/database/src/Db.php b/src/Components/database/src/Db.php
@@ -18,11 +18,6 @@ class Db
 {
     use \Imi\Util\Traits\TStaticClass;
 
-    /**
-     * 连接配置.
-     */
-    private static ?array $connections = null;
-
     /**
      * 获取新的数据库连接实例.
      *

diff --git a/src/Components/database/src/Listener/WorkerStart.php b/src/Components/database/src/Listener/WorkerStart.php
@@ -7,9 +7,7 @@
 use Imi\App;
 use Imi\Bean\Annotation\Listener;
 use Imi\Core\CoreEvents;
-use Imi\Event\Event;
 use Imi\Event\IEventListener;
-use Imi\Util\ImiPriority;
 
 #[Listener(eventName: CoreEvents::APP_RUN, priority: \Imi\Util\ImiPriority::IMI_MAX, one: true)]
 class WorkerStart implements IEventListener

diff --git a/src/Components/model/src/Cli/Model/Event/Param/TGenerateModel.php b/src/Components/model/src/Cli/Model/Event/Param/TGenerateModel.php
@@ -132,6 +132,13 @@ public function __construct(
          * 是否检查字段长度.
          */
         public bool $lengthCheck = false,
+
+        /**
+         * 类注解代码
+         *
+         * @var string
+         */
+        public string $classAttributeCode = '',
     ) {
         parent::__construct(static::class);
     }

diff --git a/src/Components/model/src/Cli/Model/ModelGenerate.php b/src/Components/model/src/Cli/Model/ModelGenerate.php
@@ -53,7 +53,7 @@ public function generate(string $namespace, string $baseClass, ?string $database
     {
         Event::dispatch(eventName: BeforeGenerateModels::class);
         $db = Db::getInstance($poolName);
-        $tablePrefix = $db->getOption()['prefix'] ?? '';
+        $tablePrefix = $db->getConfig()->prefix;
         if ('' !== $tablePrefix && !\in_array($tablePrefix, $prefix))
         {
             $prefix[] = $tablePrefix;

diff --git a/src/Components/model/src/Cli/Table/TableGenerate.php b/src/Components/model/src/Cli/Table/TableGenerate.php
@@ -56,7 +56,7 @@ public function generate(?string $namespace, ?string $database, ?string $poolNam
             $query = Db::query($poolName ?? $meta->getDbPoolName());
             if ($meta->isUsePrefix())
             {
-                $table = ($query->getDb()->getOption()['prefix'] ?? '') . $table;
+                $table = $query->getDb()->getConfig()->prefix . $table;
             }
             if (\in_array($table, $tables))
             {

diff --git a/src/Components/model/tests/config/config.php b/src/Components/model/tests/config/config.php
@@ -5,6 +5,11 @@
 use function Imi\env;
 
 return [
+    // 组件命名空间
+    'components'        => [
+        'model' => 'Imi\Model',
+    ],
+
     // 日志配置
     'logger'            => [
         'channels' => [

diff --git a/src/Components/phar/tests/project/config/config.php b/src/Components/phar/tests/project/config/config.php
@@ -77,120 +77,6 @@
         ],
     ],
 
-    // 连接池配置
-    'pools'             => 'swoole' === $mode ? [
-        // 主数据库
-        'maindb'    => [
-            'pool'        => [
-                'class'        => \Imi\Swoole\Db\Pool\CoroutineDbPool::class,
-                'config'       => [
-                    'maxResources'    => 10,
-                    'minResources'    => 0,
-                ],
-            ],
-            'resource'    => [
-                'host'        => '127.0.0.1',
-                'port'        => 3306,
-                'username'    => 'root',
-                'password'    => 'root',
-                'database'    => 'mysql',
-                'charset'     => 'utf8mb4',
-            ],
-        ],
-        'redis'     => [
-            'pool'        => [
-                'class'        => \Imi\Swoole\Redis\Pool\CoroutineRedisPool::class,
-                'config'       => [
-                    'maxResources'    => 10,
-                    'minResources'    => 0,
-                ],
-            ],
-            'resource'    => [
-                'host'      => '127.0.0.1',
-                'port'      => 6379,
-                'password'  => null,
-            ],
-        ],
-    ] : [],
-
-    // 数据库配置
-    'db'                => [
-        // 数默认连接池名
-        'defaultPool'    => 'maindb',
-        // FPM、Workerman 下用
-        'connections'    => [
-            'maindb' => [
-                'host'        => '127.0.0.1',
-                'port'        => 3306,
-                'username'    => 'root',
-                'password'    => 'root',
-                'database'    => 'mysql',
-                'charset'     => 'utf8mb4',
-                // 'port'    => '3306',
-                // 'timeout' => '建立连接超时时间',
-                // 'charset' => '',
-                // 使用 hook pdo 驱动（缺省默认）
-                // 'dbClass' => \Imi\Db\Drivers\PdoMysql\Driver::class,
-                // 使用 hook mysqli 驱动
-                // 'dbClass' => \Imi\Db\Drivers\Mysqli\Driver::class,
-                // 使用 Swoole MySQL 驱动
-                // 'dbClass' => \Imi\Swoole\Db\Drivers\Swoole\Driver::class,
-                // 数据库连接后，执行初始化的 SQL
-                // 'sqls' => [
-                //     'select 1',
-                //     'select 2',
-                // ],
-            ],
-        ],
-    ],
-
-    // redis 配置
-    'redis'             => [
-        // 数默认连接池名
-        'defaultPool'   => 'redis',
-        // FPM、Workerman 下用
-        'connections'   => [
-            'redis' => [
-                'host'      => '127.0.0.1',
-                'port'      => 6379,
-                // 是否自动序列化变量
-                'serialize' => true,
-                // 密码
-                'password'  => null,
-                // 第几个库
-                'db'        => 0,
-            ],
-        ],
-    ],
-
-    // 内存表配置
-    'memoryTable'       => [
-        // 't1'    =>  [
-        //     'columns'   =>  [
-        //         ['name' => 'name', 'type' => \Swoole\Table::TYPE_STRING, 'size' => 16],
-        //         ['name' => 'quantity', 'type' => \Swoole\Table::TYPE_INT],
-        //     ],
-        //     'lockId'    =>  'atomic',
-        // ],
-    ],
-
-    // 锁
-    'lock'              => [
-        // 'list'  =>  [
-        //     'atomic' =>  [
-        //         'class' =>  'AtomicLock',
-        //         'options'   =>  [
-        //             'atomicName'    =>  'atomicLock',
-        //         ],
-        //     ],
-        // ],
-    ],
-
-    // atmoic 配置
-    'atomics'           => [
-        // 'atomicLock'   =>  1,
-    ],
-
     // 日志配置
     'logger'            => [
         'channels' => [

diff --git a/src/Components/snowflake/composer.json b/src/Components/snowflake/composer.json
@@ -17,7 +17,8 @@
             "Imi\\Snowflake\\Test\\": "tests/"
         },
         "files": [
-            "../../../vendor/autoload.php"
+            "../../../vendor/autoload.php",
+            "../database/vendor/autoload.php"
         ]
     },
     "scripts": {},

diff --git a/src/Components/snowflake/tests/config/config.php b/src/Components/snowflake/tests/config/config.php
@@ -13,33 +13,27 @@
     ],
     'ignoreNamespace'   => [
     ],
-    // 连接池配置
-    'pools'             => [
+    'connectionCenter' => [
         // 主数据库
-        'maindb'        => [
-            'pool'        => [
-                // 协程池类名
-                'class'         => \Imi\Db\Pool\SyncDbPool::class,
-                // 连接池配置
-                'config'        => [
-                    'maxResources'              => 10,
-                    'minResources'              => 1,
-                    'checkStateWhenGetResource' => false,
-                ],
-            ],
-            // 连接池资源配置
-            'resource'    => [
-                'host'        => env('MYSQL_SERVER_HOST', '127.0.0.1'),
-                'port'        => env('MYSQL_SERVER_PORT', 3306),
-                'username'    => env('MYSQL_SERVER_USERNAME', 'root'),
-                'password'    => env('MYSQL_SERVER_PASSWORD', 'root'),
-                'database'    => 'db_imi_test',
-                'charset'     => 'utf8mb4',
-                'initSqls'    => [
-                    'SET @__pool_name="maindb"',
+        'maindb' => [
+            'manager' => \Imi\ConnectionCenter\Handler\RequestContextSingleton\RequestContextSingletonConnectionManager::class,
+            'config'  => [
+                'driver'    => \Imi\Db\ConnectionCenter\DatabaseDriver::class,
+                'dbDriver'  => \Imi\Db\Mysql\Drivers\PdoMysql\Driver::class,
+                'resources' => [
+                    [
+                        'host'        => env('MYSQL_SERVER_HOST', '127.0.0.1'),
+                        'port'        => env('MYSQL_SERVER_PORT', 3306),
+                        'username'    => env('MYSQL_SERVER_USERNAME', 'root'),
+                        'password'    => env('MYSQL_SERVER_PASSWORD', 'root'),
+                        'database'    => 'db_imi_test',
+                    ],
                 ],
             ],
         ],
+    ],
+    // 连接池配置
+    'pools'             => [
         'redis_test'    => [
             'pool'        => [
                 'class'        => \Imi\Redis\SyncRedisPool::class,

diff --git a/src/Components/swoole-tracker/example/TCPServer/config/config.php b/src/Components/swoole-tracker/example/TCPServer/config/config.php
@@ -65,45 +65,6 @@
 
     // 连接池配置
     'pools'             => [
-        // 主数据库
-        // 'maindb'    =>    [
-        //     // 同步池子
-        //     'sync'    =>    [
-        //         'pool'    =>    [
-        //             'class'        =>    \Imi\Db\Pool\SyncDbPool::class,
-        //             'config'    =>    [
-        //                 'maxResources'    =>    10,
-        //                 'minResources'    =>    0,
-        //             ],
-        //         ],
-        //         'resource'    =>    [
-        //             'host'        => '127.0.0.1',
-        //             'port'        => 3306,
-        //             'username'    => 'root',
-        //             'password'    => 'root',
-        //             'database'    => 'database_name',
-        //             'charset'     => 'utf8mb4',
-        //         ],
-        //     ],
-        //     // 异步池子，worker进程使用
-        //     'async'    =>    [
-        //         'pool'    =>    [
-        //             'class'        =>    \Imi\Swoole\Db\Pool\CoroutineDbPool::class,
-        //             'config'    =>    [
-        //                 'maxResources'    =>    10,
-        //                 'minResources'    =>    0,
-        //             ],
-        //         ],
-        //         'resource'    =>    [
-        //             'host'        => '127.0.0.1',
-        //             'port'        => 3306,
-        //             'username'    => 'root',
-        //             'password'    => 'root',
-        //             'database'    => 'database_name',
-        //             'charset'     => 'utf8mb4',
-        //         ],
-        //     ]
-        // ],
         'redis'    => [
             'sync'     => [
                 'pool'        => [