Added keep-alive strategy

src/Connection.php

@@ -33,31 +33,35 @@ interface Connection
     /**
      * Create new connection.
      *
-     * @param Driver           $driver
-     * @param Credentials      $credentials
-     * @param AbstractPlatform $platform
+     * @param Driver                 $driver
+     * @param Credentials            $credentials
+     * @param AbstractPlatform       $platform
+     * @param ConnectionOptions|null $options
      *
      * @return Connection
      */
     public static function create(
         Driver $driver,
         Credentials $credentials,
-        AbstractPlatform $platform
+        AbstractPlatform $platform,
+        ?ConnectionOptions $options = null
     ): Connection;
 
     /**
      * Create new connection.
      *
-     * @param Driver           $driver
-     * @param Credentials      $credentials
-     * @param AbstractPlatform $platform
+     * @param Driver                 $driver
+     * @param Credentials            $credentials
+     * @param AbstractPlatform       $platform
+     * @param ConnectionOptions|null $options
      *
      * @return Connection
      */
     public static function createConnected(
         Driver $driver,
         Credentials $credentials,
-        AbstractPlatform $platform
+        AbstractPlatform $platform,
+        ?ConnectionOptions $options = null
     ): Connection;
 
     /**
@@ -67,8 +71,10 @@ public function getDriverNamespace(): string;
 
     /**
      * Connect.
+     *
+     * @param ConnectionOptions|null $options
      */
-    public function connect();
+    public function connect(?ConnectionOptions $options = null);
 
     /**
      * Close.

src/ConnectionOptions.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drift\DBAL;
+
+class ConnectionOptions
+{
+    public const DEFAULT_KEEP_ALIVE_INTERVAL_SEC = 0; // 0 means disabled
+
+    private int $keepAliveIntervalSec;
+
+    /**
+     * @param int $keepAliveIntervalSec
+     */
+    public function __construct(int $keepAliveIntervalSec = self::DEFAULT_KEEP_ALIVE_INTERVAL_SEC)
+    {
+        $this->keepAliveIntervalSec = $keepAliveIntervalSec;
+    }
+
+    /**
+     * @return int
+     */
+    public function getKeepAliveIntervalSec(): int
+    {
+        return $this->keepAliveIntervalSec;
+    }
+
+    /**
+     * @param int $keepAliveIntervalSec
+     */
+    public function setKeepAliveIntervalSec(int $keepAliveIntervalSec): void
+    {
+        $this->keepAliveIntervalSec = $keepAliveIntervalSec;
+    }
+}

src/ConnectionPool.php

@@ -45,23 +45,31 @@ private function __construct(array $connections)
     /**
      * Create new connection.
      *
-     * @param Driver           $driver
-     * @param Credentials      $credentials
-     * @param AbstractPlatform $platform
+     * @param Driver                 $driver
+     * @param Credentials            $credentials
+     * @param AbstractPlatform       $platform
+     * @param ConnectionOptions|null $options
      *
      * @return Connection
      */
     public static function create(
         Driver $driver,
         Credentials $credentials,
-        AbstractPlatform $platform
+        AbstractPlatform $platform,
+        ?ConnectionOptions $options = null
     ): Connection {
-        $numberOfConnections = $credentials->getConnections();
+        $numberOfConnections = $credentials->getConnections() ??
+            ConnectionPoolOptions::DEFAULT_NUMBER_OF_CONNECTIONS;
+        if ($options instanceof ConnectionPoolOptions) {
+            $numberOfConnections = $options->getNumberOfConnections();
+        }
+
         if ($numberOfConnections <= 1) {
             return SingleConnection::create(
                 $driver,
                 $credentials,
-                $platform
+                $platform,
+                $options
             );
         }
 
@@ -71,7 +79,8 @@ public static function create(
                 SingleConnection::create(
                     clone $driver,
                     $credentials,
-                    $platform
+                    $platform,
+                    $options
                 ), $i
             );
         }
@@ -82,19 +91,21 @@ public static function create(
     /**
      * Create new connection.
      *
-     * @param Driver           $driver
-     * @param Credentials      $credentials
-     * @param AbstractPlatform $platform
+     * @param Driver                 $driver
+     * @param Credentials            $credentials
+     * @param AbstractPlatform       $platform
+     * @param ConnectionOptions|null $options
      *
      * @return Connection
      */
     public static function createConnected(
         Driver $driver,
         Credentials $credentials,
-        AbstractPlatform $platform
+        AbstractPlatform $platform,
+        ?ConnectionOptions $options = null
     ): Connection {
-        $connection = self::create($driver, $credentials, $platform);
-        $connection->connect();
+        $connection = self::create($driver, $credentials, $platform, $options);
+        $connection->connect($options);
 
         return $connection;
     }
@@ -161,10 +172,10 @@ private function executeInBestConnection(callable $callable): PromiseInterface
     /**
      * Connect.
      */
-    public function connect()
+    public function connect(?ConnectionOptions $options = null)
     {
         foreach ($this->connections as $connection) {
-            $connection->getConnection()->connect();
+            $connection->getConnection()->connect($options);
         }
     }
 

src/ConnectionPoolOptions.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Drift\DBAL;
+
+class ConnectionPoolOptions extends ConnectionOptions
+{
+    public const DEFAULT_NUMBER_OF_CONNECTIONS = 1;
+
+    private int $numberOfConnections;
+
+    /**
+     * @param int $numberOfConnections
+     * @param int $keepAliveIntervalSec
+     */
+    public function __construct(
+        int $numberOfConnections = self::DEFAULT_NUMBER_OF_CONNECTIONS,
+        int $keepAliveIntervalSec = self::DEFAULT_KEEP_ALIVE_INTERVAL_SEC
+    ) {
+        $this->numberOfConnections = $numberOfConnections;
+        parent::__construct($keepAliveIntervalSec);
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumberOfConnections(): int
+    {
+        return $this->numberOfConnections;
+    }
+
+    /**
+     * @param int $numberOfConnections
+     */
+    public function setNumberOfConnections(int $numberOfConnections): void
+    {
+        $this->numberOfConnections = $numberOfConnections;
+    }
+}

src/Credentials.php

@@ -25,8 +25,18 @@ class Credentials
     private string $user;
     private string $password;
     private string $dbName;
+
+    /**
+     * @deprecated
+     * @var array options
+     */
     private array $options;
-    private int $connections;
+
+    /**
+     * @deprecated
+     * @var int|null $connections
+     */
+    private ?int $connections = null;
 
     /**
      * Credentials constructor.
@@ -36,25 +46,36 @@ class Credentials
      * @param string $user
      * @param string $password
      * @param string $dbName
-     * @param array  $options
-     * @param int    $connections
      */
     public function __construct(
         string $host,
         string $port,
         string $user,
         string $password,
-        string $dbName,
-        array $options = [],
-        int $connections = 1
+        string $dbName
     ) {
         $this->host = $host;
         $this->port = $port;
         $this->user = $user;
         $this->password = $password;
         $this->dbName = $dbName;
-        $this->options = $options;
-        $this->connections = $connections;
+
+        if (func_num_args() > 5) {
+            trigger_error(
+                '6th argument is deprecated, for options please use ' . ConnectionOptions::class  .
+                ' or and extend of this class instead, when creating a connection',
+                E_USER_DEPRECATED
+            );
+            $this->options = (array)func_get_arg(5);
+        }
+        if (func_num_args() > 6) {
+            trigger_error(
+                '7th argument is deprecated, please use ' . ConnectionPoolOptions::class  .
+                ' to set the number of connections, when creating a ' . ConnectionPool::class,
+                E_USER_DEPRECATED
+            );
+            $this->connections = (int)func_get_arg(6);
+        }
     }
 
     /**
@@ -98,6 +119,7 @@ public function getDbName(): string
     }
 
     /**
+     * @deprecated
      * @return array
      */
     public function getOptions(): array
@@ -106,9 +128,10 @@ public function getOptions(): array
     }
 
     /**
-     * @return int
+     * @deprecated
+     * @return int|null
      */
-    public function getConnections(): int
+    public function getConnections(): ?int
     {
         return $this->connections;
     }