Accept DBAL driver connection in Connection::connect

.github/workflows/test-unit.yml

@@ -192,7 +192,7 @@ jobs:
 
       - name: "Run tests: MSSQL"
         env:
-          DB_DSN: "sqlsrv:Server=mssql;Database=master"
+          DB_DSN: "sqlsrv:host=mssql;dbname=master"
           DB_USER: sa
           DB_PASSWORD: atk4_pass
         run: |

docs/persistence/sql/connection.rst

@@ -24,7 +24,7 @@ connection in a global variable or global class::
     Determine which Connection class should be used for specified $dsn,
     establish connection to DB by creating new object of this connection class and return.
 
-    :param string $dsn: DSN, see http://php.net/manual/en/ref.pdo-mysql.connection.php
+    :param string $dsn: DSN, see https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html
     :param string $user: username
     :param string $password: password
     :param array  $args: Other default properties for connection class.
@@ -88,7 +88,7 @@ if you connect to vendor that does not use PDO.
 
 Developers can register custom classes to handle driver types using the `Connecion::registerConnectionClass` method::
 
-   Connection::registerConnectionClass(Custom\MySQL\Connection::class, 'mysql');
+   Connection::registerConnectionClass(Custom\MySQL\Connection::class, 'pdo_mysql');
 
 .. php:method:: connectDbalConnection(array $dsn)
 

docs/persistence/sql/quickstart.rst

@@ -152,8 +152,8 @@ automatically do some of the hard work to adopt query building for your
 database vendor.
 There are more ways to create connection, see `Advanced Connections`_ section.
 
-The format of the ``$dsn`` is the same as with
-`PDO class <http://php.net/manual/en/ref.pdo-mysql.connection.php>`_.
+The format of the ``$dsn`` is the same as with for
+`DBAL connection <https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html>`_.
 If you need to execute query that is not supported by DSQL, you should always
 use expressions::
 

phpstan.neon.dist

@@ -36,7 +36,7 @@ parameters:
             message: '~^(Call to an undefined method Doctrine\\DBAL\\Driver\\Connection::getWrappedConnection\(\)\.|Call to an undefined method Doctrine\\DBAL\\Connection::createSchemaManager\(\)\.|Call to an undefined static method Doctrine\\DBAL\\Exception::invalidPdoInstance\(\)\.|Call to method getCreateTableSQL\(\) of deprecated class Doctrine\\DBAL\\Platforms\\AbstractPlatform:\n.+|Anonymous class extends deprecated class Doctrine\\DBAL\\Platforms\\PostgreSQL94Platform:\n.+|Call to deprecated method fetch(|All)\(\) of class Doctrine\\DBAL\\Result:\n.+|Call to deprecated method getSchemaManager\(\) of class Doctrine\\DBAL\\Connection:\n.+|Access to an undefined property Doctrine\\DBAL\\Driver\\PDO\\Connection::\$connection\.|Parameter #1 \$dsn of class Doctrine\\DBAL\\Driver\\PDO\\SQLSrv\\Connection constructor expects string, Doctrine\\DBAL\\Driver\\PDO\\Connection given\.|Method Atk4\\Data\\Persistence\\Sql\\Expression::execute\(\) should return Doctrine\\DBAL\\Result\|PDOStatement but returns bool\.|PHPDoc tag @return contains generic type Doctrine\\DBAL\\Schema\\AbstractSchemaManager<Doctrine\\DBAL\\Platforms\\AbstractPlatform> but class Doctrine\\DBAL\\Schema\\AbstractSchemaManager is not generic\.|Class Doctrine\\DBAL\\Platforms\\(MySqlPlatform|PostgreSqlPlatform) referenced with incorrect case: Doctrine\\DBAL\\Platforms\\(MySQLPlatform|PostgreSQLPlatform)\.)$~'
             path: '*'
             # count for DBAL 3.x matched in "src/Persistence/GenericPlatform.php" file
-            count: 42
+            count: 39
 
         # TODO these rules are generated, this ignores should be fixed in the code
         # for src/Schema/TestCase.php

src/Persistence.php

@@ -42,20 +42,20 @@ abstract class Persistence
     public static function connect($dsn, string $user = null, string $password = null, array $args = []): self
     {
         // parse DSN string
-        $dsn = \Atk4\Data\Persistence\Sql\Connection::normalizeDsn($dsn, $user, $password);
+        $dsn = Persistence\Sql\Connection::normalizeDsn($dsn, $user, $password);
 
-        switch ($dsn['driverSchema']) {
-            case 'sqlite':
-            case 'mysql':
-            case 'pgsql':
-            case 'sqlsrv':
-            case 'oci':
-                $persistence = new Persistence\Sql($dsn['dsn'], $dsn['user'], $dsn['pass'], $args);
+        switch ($dsn['driver']) {
+            case 'pdo_sqlite':
+            case 'pdo_mysql':
+            case 'pdo_pgsql':
+            case 'pdo_sqlsrv':
+            case 'pdo_oci':
+                $persistence = new Persistence\Sql($dsn, $dsn['user'], $dsn['password'], $args);
 
                 return $persistence;
             default:
-                throw (new Exception('Unable to determine persistence driver type from DSN'))
-                    ->addMoreInfo('dsn', $dsn['dsn']);
+                throw (new Exception('Unable to determine persistence driver type'))
+                    ->addMoreInfo('dsn', $dsn);
         }
     }
 

src/Persistence/GenericPlatform.php

@@ -50,8 +50,6 @@ private function createNotSupportedException(): \Exception
                 $connection->getSchemaManager();
                 $connection->getSchemaManager();
                 $connection->getSchemaManager();
-                $connection->getSchemaManager();
-                $connection->getSchemaManager();
             }
         }
 

src/Persistence/Sql.php

@@ -14,6 +14,8 @@
 use Atk4\Data\Persistence\Sql\Expression;
 use Atk4\Data\Persistence\Sql\Expressionable;
 use Atk4\Data\Persistence\Sql\Query;
+use Doctrine\DBAL\Connection as DbalConnection;
+use Doctrine\DBAL\Driver\Connection as DbalDriverConnection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
@@ -81,20 +83,20 @@ class Sql extends Persistence
     /**
      * Constructor.
      *
-     * @param Connection|string $connection
-     * @param string            $user
-     * @param string            $password
-     * @param array             $args
+     * @param Connection|string|array|DbalConnection|DbalDriverConnection $connection
+     * @param string                                                      $user
+     * @param string                                                      $password
+     * @param array                                                       $args
      */
     public function __construct($connection, $user = null, $password = null, $args = [])
     {
-        if (is_object($connection)) {
-            $this->connection = Connection::assertInstanceOf($connection);
+        if ($connection instanceof Connection) {
+            $this->connection = $connection;
 
             return;
         }
 
-        // attempt to connect.
+        // attempt to connect
         $this->connection = Connection::connect(
             $connection,
             $user,