Merge branch '2.11.x' into 3.0.x

doctrine · Aug 19, 2020 · 430114e · 430114e
2 parents c70832a + 53b101b
commit 430114e
Show file tree

Hide file tree

Showing 23 changed files with 84 additions and 98 deletions.
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/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/Functional/Driver/PDO/SQLSrv/DriverTest.php b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
@@ -42,12 +42,15 @@ protected static function getDatabaseNameForConnectionWithoutDatabaseNameParamet
      */
     private function getConnection(array $driverOptions): Connection
     {
-        return $this->connection->getDriver()->connect(
-            array_merge(
-                TestUtil::getConnectionParams(),
-                ['driver_options' => $driverOptions]
-            )
-        );
+        $params = TestUtil::getConnectionParams();
+
+        if (isset($params['driverOptions'])) {
+            $driverOptions = array_merge($params['driverOptions'], $driverOptions);
+        }
+
+        $params['driverOptions'] = $driverOptions;
+
+        return $this->connection->getDriver()->connect($params);
     }
 
     public function testConnectionOptions(): void

diff --git a/tests/TestUtil.php b/tests/TestUtil.php
@@ -15,6 +15,9 @@
 use function extension_loaded;
 use function implode;
 use function is_string;
+use function strlen;
+use function strpos;
+use function substr;
 use function unlink;
 
 /**
@@ -187,6 +190,11 @@ private static function mapConnectionParameters(array $configuration, string $pr
                 'dbname',
                 'port',
                 'server',
+                'ssl_key',
+                'ssl_cert',
+                'ssl_ca',
+                'ssl_capath',
+                'ssl_cipher',
                 'unix_socket',
             ] as $parameter
         ) {
@@ -197,6 +205,14 @@ private static function mapConnectionParameters(array $configuration, string $pr
             $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;
     }
-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 @@