Merge branch '2.10.x' into 2.11.x

.travis.yml

@@ -148,6 +148,9 @@ jobs:
     - stage: Test
       php: 7.4
       env: DB=mysqli.docker IMAGE=mysql:8.0
+    - stage: Test
+      php: 7.4
+      env: DB=mysqli-tls.docker IMAGE=mysql:8.0 TLS=yes
     - stage: Test
       php: 7.4
       env: DB=mariadb.docker IMAGE=mariadb:10.3

docs/en/reference/transactions.rst

@@ -50,7 +50,7 @@ constants:
 
 The default transaction isolation level of a
 ``Doctrine\DBAL\Connection`` is chosen by the underlying platform
-but it is always at least READ\_COMMITTED.
+but it is always at least ``READ_COMMITTED``.
 
 Transaction Nesting
 -------------------

tests/Doctrine/Tests/DBAL/Functional/Driver/AbstractDriverTest.php

@@ -28,10 +28,11 @@ abstract class AbstractDriverTest extends DbalFunctionalTestCase
         $params = $this->connection->getParams();
         unset($params['dbname']);
 
-        $user     = $params['user'] ?? null;
-        $password = $params['password'] ?? null;
+        $user          = $params['user'] ?? null;
+        $password      = $params['password'] ?? null;
+        $driverOptions = $params['driverOptions'] ?? [];
 
-        $connection = $this->driver->connect($params, $user, $password);
+        $connection = $this->driver->connect($params, $user, $password, $driverOptions);
 
         self::assertInstanceOf(DriverConnection::class, $connection);
     }

tests/Doctrine/Tests/DBAL/Functional/Driver/Mysqli/ConnectionTest.php

@@ -8,6 +8,8 @@ use Doctrine\DBAL\Driver\Mysqli\MysqliException;
 use Doctrine\Tests\DbalFunctionalTestCase;
 use Doctrine\Tests\TestUtil;
 
+use function array_merge;
+
 use const MYSQLI_OPT_CONNECT_TIMEOUT;
 
 /**
@@ -54,6 +56,10 @@ class ConnectionTest extends DbalFunctionalTestCase
     {
         $params = TestUtil::getConnectionParams();
 
+        if (isset($params['driverOptions'])) {
+            $driverOptions = array_merge($params['driverOptions'], $driverOptions);
+        }
+
         return new Connection(
             $params,
             $params['user'] ?? '',

tests/Doctrine/Tests/DBAL/Functional/Driver/PDOSqlsrv/DriverTest.php

@@ -9,6 +9,8 @@ use Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest;
 use Doctrine\Tests\TestUtil;
 use PDO;
 
+use function array_merge;
+
 /**
  * @requires extension pdo_sqlsrv
  */
@@ -42,6 +44,10 @@ class DriverTest extends AbstractDriverTest
     {
         $params = TestUtil::getConnectionParams();
 
+        if (isset($params['driverOptions'])) {
+            $driverOptions = array_merge($params['driverOptions'], $driverOptions);
+        }
+
         return $this->connection->getDriver()->connect(
             $params,
             $params['user'] ?? '',

tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -114,10 +114,11 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
             $params['dbname'] = 'test_drop_database';
         }
 
-        $user     = $params['user'] ?? null;
-        $password = $params['password'] ?? null;
+        $user          = $params['user'] ?? null;
+        $password      = $params['password'] ?? null;
+        $driverOptions = $params['driverOptions'] ?? [];
 
-        $connection = $this->connection->getDriver()->connect($params, $user, $password);
+        $connection = $this->connection->getDriver()->connect($params, $user, $password, $driverOptions);
 
         self::assertInstanceOf(Connection::class, $connection);
 

tests/Doctrine/Tests/DBAL/Functional/Schema/SqliteSchemaManagerTest.php

@@ -43,10 +43,11 @@ class SqliteSchemaManagerTest extends SchemaManagerFunctionalTestCase
         $params           = $this->connection->getParams();
         $params['dbname'] = 'test_drop_database';
 
-        $user     = $params['user'] ?? null;
-        $password = $params['password'] ?? null;
+        $user          = $params['user'] ?? null;
+        $password      = $params['password'] ?? null;
+        $driverOptions = $params['driverOptions'] ?? [];
 
-        $connection = $this->connection->getDriver()->connect($params, $user, $password);
+        $connection = $this->connection->getDriver()->connect($params, $user, $password, $driverOptions);
 
         self::assertInstanceOf(Connection::class, $connection);
 

tests/Doctrine/Tests/TestUtil.php

@@ -14,6 +14,9 @@ use function explode;
 use function extension_loaded;
 use function implode;
 use function is_string;
+use function strlen;
+use function strpos;
+use function substr;
 use function unlink;
 
 /**
@@ -181,6 +184,11 @@ class TestUtil
                 'dbname',
                 'port',
                 'server',
+                'ssl_key',
+                'ssl_cert',
+                'ssl_ca',
+                'ssl_capath',
+                'ssl_cipher',
                 'unix_socket',
             ] as $parameter
         ) {
@@ -191,6 +199,14 @@ class TestUtil
             $parameters[$parameter] = $configuration[$prefix . $parameter];
         }
 
+        foreach ($configuration as $param => $value) {
+            if (strpos($param, $prefix . 'driver_option_') !== 0) {
+                continue;
+            }
+
+            $parameters['driverOptions'][substr($param, strlen($prefix . 'driver_option_'))] = $value;
+        }
+
         return $parameters;
     }
 

tests/travis/docker-run-mysql-or-mariadb.sh

@@ -40,3 +40,11 @@ while true; do
       ;;
   esac
 done
+
+if [[ "$TLS" == "yes" ]]
+then
+  for file in "ca.pem" "client-cert.pem" "client-key.pem"
+  do
+    docker cp "rdbms:/var/lib/mysql/$file" .
+  done
+fi

tests/travis/mysqli-tls.docker.travis.xml

+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/schema/9.3.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <var name="db_driver" value="mysqli"/>
+        <var name="db_host" value="127.0.0.1"/>
+        <var name="db_port" value="33306"/>
+        <var name="db_ssl_ca" value="ca.pem"/>
+        <var name="db_ssl_cert" value="client-cert.pem"/>
+        <var name="db_ssl_key" value="client-key.pem"/>
+
+        <!-- Use MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT since there's no way to generate a certificate
+        with a proper common name (CN) on Travis. This flag must be not used in production settings. -->
+        <var name="db_driver_option_flags" value="64"/>
+
+        <var name="db_user" value="root"/>
+        <var name="db_dbname" value="doctrine_tests"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../Doctrine/Tests/DBAL</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory suffix=".php">../../lib/Doctrine</directory>
+        </include>
+    </coverage>
+
+    <groups>
+        <exclude>
+            <group>performance</group>
+            <group>locking_functional</group>
+        </exclude>
+    </groups>
+</phpunit>