doctrine · morozov · Aug 20, 2020 · Aug 7, 2020 · Aug 10, 2020 · Aug 17, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -132,6 +132,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

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -343,6 +343,10 @@ Please use other database client applications for import, e.g.:
 
 # Upgrade to 2.11
 
+## Deprecated `Synchronizer` package
+
+The `Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer` interface and all its implementations are deprecated.
+
 ## Deprecated usage of wrapper-level components as implementations of driver-level interfaces
 
 The usage of the wrapper `Connection` and `Statement` classes as implementations of the `Driver\Connection` and `Driver\Statement` interfaces is deprecated.

diff --git a/ci/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/docker-run-mysql-or-mariadb.sh b/ci/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
diff --git a/ci/travis/ibm_db2.travis.xml b/ci/travis/ibm_db2.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/mariadb.docker.travis.xml b/ci/travis/mariadb.docker.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/mariadb.mysqli.docker.travis.xml b/ci/travis/mariadb.mysqli.docker.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/mysql.docker.travis.xml b/ci/travis/mysql.docker.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/mysqli-tls.docker.travis.xml b/ci/travis/mysqli-tls.docker.travis.xml
@@ -0,0 +1,37 @@
+<?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>../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory suffix=".php">../../src</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/ci/travis/mysqli.docker.travis.xml b/ci/travis/mysqli.docker.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/pdo_sqlsrv.travis.xml b/ci/travis/pdo_sqlsrv.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/pgsql.travis.xml b/ci/travis/pgsql.travis.xml
@@ -27,11 +27,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/sqlite.travis.xml b/ci/travis/sqlite.travis.xml
@@ -22,11 +22,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/travis/sqlsrv.travis.xml b/ci/travis/sqlsrv.travis.xml
@@ -28,11 +28,4 @@
             <directory suffix=".php">../../src</directory>
         </include>
     </coverage>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-            <group>locking_functional</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/docs/en/reference/transactions.rst b/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
 -------------------

diff --git a/src/Driver/IBMDB2/Driver.php b/src/Driver/IBMDB2/Driver.php
@@ -16,7 +16,7 @@ public function connect(array $params)
             isset($params['persistent']) && $params['persistent'] === true,
             $params['user'] ?? '',
             $params['password'] ?? '',
-            $params['driver_options'] ?? []
+            $params['driverOptions'] ?? []
         );
     }
 }
diff --git a/src/Driver/Mysqli/Driver.php b/src/Driver/Mysqli/Driver.php
@@ -31,8 +31,8 @@ public function connect(array $params)
 
         $preInitializers = $postInitializers = [];
 
-        if (isset($params['driver_options'])) {
-            $driverOptions = $params['driver_options'];
+        if (isset($params['driverOptions'])) {
+            $driverOptions = $params['driverOptions'];
 
             if (isset($driverOptions[Connection::OPTION_FLAGS])) {
                 $flags = $driverOptions[Connection::OPTION_FLAGS];
@@ -89,11 +89,11 @@ private function withSecure(array $initializers, array $params): array
             isset($params['ssl_cipher'])
         ) {
             $initializers[] = new Secure(
-                $params['ssl_key']    ?? null,
-                $params['ssl_cert']   ?? null,
-                $params['ssl_ca']     ?? null,
-                $params['ssl_capath'] ?? null,
-                $params['ssl_cipher'] ?? null
+                $params['ssl_key']    ?? '',
+                $params['ssl_cert']   ?? '',
+                $params['ssl_ca']     ?? '',
+                $params['ssl_capath'] ?? '',
+                $params['ssl_cipher'] ?? ''
             );
         }
 

diff --git a/src/Driver/Mysqli/Initializer/Secure.php b/src/Driver/Mysqli/Initializer/Secure.php
@@ -9,22 +9,22 @@
 
 final class Secure implements Initializer
 {
-    /** @var string|null */
+    /** @var string */
     private $key;
 
-    /** @var string|null */
+    /** @var string */
     private $cert;
 
-    /** @var string|null */
+    /** @var string */
     private $ca;
 
-    /** @var string|null */
+    /** @var string */
     private $capath;
 
-    /** @var string|null */
+    /** @var string */
     private $cipher;
 
-    public function __construct(?string $key, ?string $cert, ?string $ca, ?string $capath, ?string $cipher)
+    public function __construct(string $key, string $cert, string $ca, string $capath, string $cipher)
     {
         $this->key    = $key;
         $this->cert   = $cert;

diff --git a/src/Driver/PDO/MySQL/Driver.php b/src/Driver/PDO/MySQL/Driver.php
@@ -13,7 +13,7 @@ final class Driver extends AbstractMySQLDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/OCI/Driver.php b/src/Driver/PDO/OCI/Driver.php
@@ -13,7 +13,7 @@ final class Driver extends AbstractOracleDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/PgSQL/Driver.php b/src/Driver/PDO/PgSQL/Driver.php
@@ -15,7 +15,7 @@ final class Driver extends AbstractPostgreSQLDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/SQLSrv/Driver.php b/src/Driver/PDO/SQLSrv/Driver.php
@@ -20,8 +20,8 @@ public function connect(array $params)
     {
         $pdoOptions = $dsnOptions = [];
 
-        if (isset($params['driver_options'])) {
-            foreach ($params['driver_options'] as $option => $value) {
+        if (isset($params['driverOptions'])) {
+            foreach ($params['driverOptions'] as $option => $value) {
                 if (is_int($option)) {
                     $pdoOptions[$option] = $value;
                 } else {

diff --git a/src/Driver/PDO/SQLite/Driver.php b/src/Driver/PDO/SQLite/Driver.php
@@ -22,7 +22,7 @@ final class Driver extends AbstractSQLiteDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (isset($driverOptions['userDefinedFunctions'])) {
             $this->_userDefinedFunctions = array_merge(

diff --git a/src/Driver/SQLSrv/Driver.php b/src/Driver/SQLSrv/Driver.php
@@ -27,7 +27,7 @@ public function connect(array $params)
             throw PortWithoutHost::new();
         }
 
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (isset($params['dbname'])) {
             $driverOptions['Database'] = $params['dbname'];

diff --git a/src/Schema/Synchronizer/AbstractSchemaSynchronizer.php b/src/Schema/Synchronizer/AbstractSchemaSynchronizer.php
@@ -8,6 +8,8 @@
 
 /**
  * Abstract schema synchronizer with methods for executing batches of SQL.
+ *
+ * @deprecated
  */
 abstract class AbstractSchemaSynchronizer implements SchemaSynchronizer
 {

diff --git a/src/Schema/Synchronizer/SchemaSynchronizer.php b/src/Schema/Synchronizer/SchemaSynchronizer.php
@@ -7,6 +7,8 @@
 /**
  * The synchronizer knows how to synchronize a schema with the configured
  * database.
+ *
+ * @deprecated
  */
 interface SchemaSynchronizer
 {

diff --git a/src/Schema/Synchronizer/SingleDatabaseSynchronizer.php b/src/Schema/Synchronizer/SingleDatabaseSynchronizer.php
@@ -12,6 +12,8 @@
 
 /**
  * Schema Synchronizer for Default DBAL Connection.
+ *
+ * @deprecated
  */
 class SingleDatabaseSynchronizer extends AbstractSchemaSynchronizer
 {

diff --git a/tests/Driver/PDO/PgSQL/DriverTest.php b/tests/Driver/PDO/PgSQL/DriverTest.php
@@ -71,7 +71,7 @@ private function connect(array $driverOptions): Connection
         return $this->createDriver()->connect(
             array_merge(
                 TestUtil::getConnectionParams(),
-                ['driver_options' => $driverOptions]
+                ['driverOptions' => $driverOptions]
             )
         );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ @@
     /**
      * Abstract schema synchronizer with methods for executing batches of SQL.
+     *
+     * @deprecated
      */
     abstract class AbstractSchemaSynchronizer implements SchemaSynchronizer
     {
@@ Expand Down @@