添加一个db的组件，databases配置文件添加一个port配置

composer.json

@@ -131,6 +131,7 @@
             "Hyperf\\Consul\\": "src/consul/src/",
             "Hyperf\\Contract\\": "src/contract/src/",
             "Hyperf\\Crontab\\": "src/crontab/src/",
+            "Hyperf\\DB\\": "src/db/src/",
             "Hyperf\\Database\\": "src/database/src/",
             "Hyperf\\DbConnection\\": "src/db-connection/src/",
             "Hyperf\\Devtool\\": "src/devtool/src/",
@@ -197,6 +198,7 @@
             "HyperfTest\\Constants\\": "src/constants/tests/",
             "HyperfTest\\Consul\\": "src/consul/tests/",
             "HyperfTest\\Crontab\\": "src/crontab/tests/",
+            "HyperfTest\\DB\\": "src/db/tests/",
             "HyperfTest\\Database\\": "src/database/tests/",
             "HyperfTest\\DbConnection\\": "src/db-connection/tests/",
             "HyperfTest\\Di\\": "src/di/tests/",
@@ -252,6 +254,7 @@
                 "Hyperf\\Constants\\ConfigProvider",
                 "Hyperf\\Consul\\ConfigProvider",
                 "Hyperf\\Crontab\\ConfigProvider",
+                "Hyperf\\DB\\ConfigProvider",
                 "Hyperf\\DbConnection\\ConfigProvider",
                 "Hyperf\\Devtool\\ConfigProvider",
                 "Hyperf\\Di\\ConfigProvider",

src/db-connection/publish/databases.php

@@ -14,6 +14,7 @@
     'default' => [
         'driver' => env('DB_DRIVER', 'mysql'),
         'host' => env('DB_HOST', 'localhost'),
+        'port' => env('DB_PORT', '3306'),
         'database' => env('DB_DATABASE', 'hyperf'),
         'username' => env('DB_USERNAME', 'root'),
         'password' => env('DB_PASSWORD', ''),

src/db/.gitattributes

@@ -0,0 +1 @@
+/tests export-ignore

src/db/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Hyperf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/db/composer.json

@@ -0,0 +1,52 @@
+{
+    "name": "hyperf/db",
+    "type": "library",
+    "license": "MIT",
+    "keywords": [
+        "php",
+        "hyperf"
+    ],
+    "description": "",
+    "autoload": {
+        "psr-4": {
+            "Hyperf\\DB\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "HyperfTest\\DB\\": "tests/"
+        }
+    },
+    "require": {
+        "php": ">=7.2",
+        "ext-swoole": ">=4.4",
+        "hyperf/config": "~1.1.0",
+        "hyperf/contract": "~1.1.0",
+        "hyperf/database": "~1.1.0",
+        "hyperf/di": "~1.1.0",
+        "hyperf/framework": "~1.1.0",
+        "hyperf/pool": "~1.1.0",
+        "hyperf/utils": "~1.1.0",
+        "psr/container": "^1.0"
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.14",
+        "phpstan/phpstan": "^0.10.5",
+        "hyperf/testing": "1.1.*",
+        "mockery/mockery": "^1.0",
+        "swoft/swoole-ide-helper": "dev-master"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "scripts": {
+        "test": "co-phpunit -c phpunit.xml --colors=always",
+        "analyze": "phpstan analyse --memory-limit 300M -l 0 ./src",
+        "cs-fix": "php-cs-fixer fix $1"
+    },
+    "extra": {
+        "hyperf": {
+            "config": "Hyperf\\DB\\ConfigProvider"
+        }
+    }
+}

src/db/src/AbstractConnection.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB;
+
+use Hyperf\Database\DetectsDeadlocks;
+use Hyperf\Database\DetectsLostConnections;
+use Hyperf\Pool\Connection;
+
+abstract class AbstractConnection extends Connection implements ConnectionInterface
+{
+    use DetectsDeadlocks;
+    use DetectsLostConnections;
+
+    /**
+     * The number of active transactions.
+     *
+     * @var int
+     */
+    protected $transactions = 0;
+}

src/db/src/ConfigProvider.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB;
+
+class ConfigProvider
+{
+    public function __invoke(): array
+    {
+        return [
+            'dependencies' => [
+            ],
+            'commands' => [
+            ],
+            'annotations' => [
+                'scan' => [
+                    'paths' => [
+                        __DIR__,
+                    ],
+                ],
+            ],
+        ];
+    }
+}

src/db/src/ConnectionInterface.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB;
+
+interface ConnectionInterface
+{
+    /**
+     * Start a new database transaction.
+     */
+    public function beginTransaction(): void;
+
+    /**
+     * Commit the active database transaction.
+     */
+    public function commit(): void;
+
+    /**
+     * Rollback the active database transaction.
+     */
+    public function rollBack(): void;
+
+    /**
+     * Run an insert statement against the database.
+     *
+     * @return int|string last insert id
+     */
+    public function insert(string $query, array $bindings = []);
+
+    /**
+     * Run an execute statement against the database.
+     *
+     * @return int affected rows
+     */
+    public function execute(string $query, array $bindings = []): int;
+
+    /**
+     * Execute an SQL statement and return the number of affected rows.
+     *
+     * @return int affected rows
+     */
+    public function exec(string $sql): int;
+
+    /**
+     * Run a select statement against the database.
+     */
+    public function query(string $query, array $bindings = []): array;
+
+    /**
+     * Run a select statement and return a single result.
+     */
+    public function fetch(string $query, array $bindings = []): array;
+}

src/db/src/DB.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB;
+
+use Hyperf\DB\Pool\PoolFactory;
+use Hyperf\Utils\Context;
+
+/**
+ * Class DB.
+ * @method beginTransaction()
+ * @method commit()
+ * @method rollback()
+ * @method getErrorCode()
+ * @method getErrorInfo()
+ * @method getLastInsertId()
+ * @method prepare(string $sql, array $data = [], array $options = [])
+ * @method query(string $sql)
+ */
+class DB
+{
+    /**
+     * @var PoolFactory
+     */
+    protected $factory;
+
+    /**
+     * @var string
+     */
+    protected $poolName = 'default';
+
+    public function __construct(PoolFactory $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    public function __call($name, $arguments)
+    {
+        // Get a connection from coroutine context or connection pool.
+        $hasContextConnection = Context::has($this->getContextKey());
+        $connection = $this->getConnection($hasContextConnection);
+        switch ($name) {
+            case 'beginTransaction':
+                Context::set($this->getContextKey(), $connection);
+                $transctionManager = new TransactionManager();
+                $result = $transctionManager->beginTransaction();
+                break;
+            case 'commit':
+            case 'rollback':
+                $transctionManager = new TransactionManager();
+                $result = $transctionManager->{$name}();
+                break;
+            default:
+                $result = $connection->{$name}(...$arguments);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a connection from coroutine context, or from mysql connectio pool.
+     * @param mixed $hasContextConnection
+     */
+    private function getConnection($hasContextConnection): AbstractConnection
+    {
+        $connection = null;
+        if ($hasContextConnection) {
+            $connection = Context::get($this->getContextKey());
+        }
+        if (! $connection instanceof AbstractConnection) {
+            $pool = $this->factory->getPool($this->poolName);
+            Context::set('poolId', $pool->getCurrentConnections());
+            $connection = $pool->get()->getConnection();
+        }
+        return $connection;
+    }
+
+    /**
+     * The key to identify the connection object in coroutine context.
+     */
+    private function getContextKey(): string
+    {
+        return sprintf('database.%s', $this->poolName);
+    }
+
+    private function getPoolId()
+    {
+        return Context::get('poolId');
+    }
+}

src/db/src/Exception/DriverNotFoundException.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB\Exception;
+
+class DriverNotFoundException extends RuntimeException
+{
+}

src/db/src/Exception/QueryException.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB\Exception;
+
+class QueryException extends \PDOException
+{
+}

src/db/src/Exception/RuntimeException.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\DB\Exception;
+
+class RuntimeException extends \RuntimeException
+{
+}