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

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,50 @@
+{
+    "name": "hyperf/db",
+    "type": "library",
+    "license": "MIT",
+    "keywords": [
+        "php",
+        "hyperf"
+    ],
+    "description": "",
+    "autoload": {
+        "psr-4": {
+            "Hyperf\\DB\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "HyperfTest\\": "tests"
+        }
+    },
+    "require": {
+        "php": ">=7.2",
+        "ext-swoole": ">=4.4",
+        "hyperf/config": "^1.1",
+        "hyperf/di": "1.1.*",
+        "hyperf/framework": "1.1.*",
+        "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/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/DB.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Hyperf\DB;
+
+
+use Hyperf\DB\Pool\AbstractPool;
+use Hyperf\DB\Pool\PoolFactory;
+use Hyperf\DB\Pool\SwooleMySqlPool;
+use Hyperf\Pool\Connection;
+use Hyperf\Utils\Context;
+use Swoole\Coroutine\MySQL;
+
+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);
+
+        $result = $connection->{$name}(...$arguments);
+
+        return $result;
+    }
+
+
+    /**
+     * Get a connection from coroutine context, or from redis connectio pool.
+     * @param mixed $hasContextConnection
+     */
+    private function getConnection($hasContextConnection): Connection
+    {
+        $connection = null;
+        if ($hasContextConnection) {
+            $connection = Context::get($this->getContextKey());
+        }
+        if (!$connection instanceof Connection) {
+            $pool = $this->factory->getPool($this->poolName);
+            $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);
+    }
+}

src/db/src/Exception/QueryException.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Hyperf\DB\Exception;
+
+
+use Throwable;
+
+class QueryException extends \PDOException
+{
+    public function __construct(string $message = "", int $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}

src/db/src/Frequency.php

@@ -0,0 +1,19 @@
+<?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\Pool\Frequency as DefaultFrequency;
+
+class Frequency extends DefaultFrequency
+{
+}

src/db/src/PDOConnection.php

@@ -0,0 +1,108 @@
+<?php
+declare(strict_types=1);
+
+namespace Hyperf\DB;
+
+use Hyperf\Contract\ConnectionInterface;
+use Hyperf\Pool\Connection as BaseConnection;
+use Hyperf\Pool\Exception\ConnectionException;
+use Hyperf\Pool\Pool;
+use PDO;
+use Psr\Container\ContainerInterface;
+
+class PDOConnection extends BaseConnection implements ConnectionInterface
+{
+
+    /**
+     * @var PDO
+     */
+    protected $connection;
+
+    /**
+     * @var array
+     */
+    protected $config = [
+        'driver' => 'mysql',
+        'host' => 'localhost',
+        'database' => 'test',
+        'username' => 'root',
+        'password' => 'root',
+        'charset' => 'utf8',
+        'collation' => 'utf8_unicode_ci',
+        'prefix' => '',
+        'pool' => [
+            'min_connections' => 1,
+            'max_connections' => 10,
+            'connect_timeout' => 10.0,
+            'wait_timeout' => 3.0,
+            'heartbeat' => -1,
+            'max_idle_time' => '60',
+        ],
+    ];
+
+    /**
+     * Current redis database.
+     * @var null|int
+     */
+    protected $database;
+
+    public function __construct(ContainerInterface $container, Pool $pool, array $config)
+    {
+        parent::__construct($container, $pool);
+        $this->config = array_replace($this->config, $config);
+
+        $this->reconnect();
+    }
+
+    public function __call($name, $arguments)
+    {
+        return $this->connection->{$name}(...$arguments);
+    }
+
+    public function getActiveConnection()
+    {
+        if ($this->check()) {
+            return $this;
+        }
+
+        if (!$this->reconnect()) {
+            throw new ConnectionException('Connection reconnect failed.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Reconnect the connection.
+     */
+    public function reconnect(): bool
+    {
+        $dbms = $this->config['driver'];
+        $host = $this->config['host'];
+        $dbName = $this->config['database'];
+        $username = $this->config['username'];
+        $password = $this->config['password'];
+        $dsn = "$dbms:host=$host;dbname=$dbName";
+        try {
+            $pdo = new \PDO($dsn, $username, $password, [PDO::ATTR_PERSISTENT => true]);
+            $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        } catch (\PDOException $e) {
+            throw new ConnectionException('Connection reconnect failed.:' . $e->getMessage());
+        }
+
+        $this->connection = $pdo;
+        $this->lastUseTime = microtime(true);
+
+        return true;
+    }
+
+    /**
+     * Close the connection.
+     */
+    public function close(): bool
+    {
+        unset($this->connection);
+
+        return true;
+    }
+}

src/db/src/Pool/AbstractPool.php

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Hyperf\DB\Pool;
+
+
+use Hyperf\Pool\Pool;
+
+abstract class AbstractPool extends Pool
+{
+
+}