initial work for DBAL 4 compatibility

ConnectionFactory.php

@@ -6,17 +6,18 @@
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\DriverException;
-use Doctrine\DBAL\Exception\MalformedDsnException;
+use Doctrine\DBAL\Exception\InvalidWrapperClass;
 use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Tools\DsnParser;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\Deprecations\Deprecation;
+use RuntimeException;
 
 use function array_merge;
+use function class_exists;
 use function is_subclass_of;
 use function trigger_deprecation;
 
@@ -92,6 +93,10 @@ public function createConnection(array $params, ?Configuration $config = null, ?
 
             if (isset($params['wrapperClass'])) {
                 if (! is_subclass_of($params['wrapperClass'], Connection::class)) {
+                    if (class_exists(InvalidWrapperClass::class)) {
+                        throw InvalidWrapperClass::new($params['wrapperClass']);
+                    }
+
                     throw DBALException::invalidWrapperClass($params['wrapperClass']);
                 }
 
@@ -102,7 +107,7 @@ public function createConnection(array $params, ?Configuration $config = null, ?
             $connection = DriverManager::getConnection($params, $config, $eventManager);
             $params     = $this->addDatabaseSuffix(array_merge($connection->getParams(), $overriddenOptions));
             $driver     = $connection->getDriver();
-            $platform   = $driver->getDatabasePlatform();
+            $platform   = $driver->getDatabasePlatform(new Connection\StaticServerVersionProvider(''));
 
             if (! isset($params['charset'])) {
                 if ($platform instanceof AbstractMySQLPlatform) {
@@ -162,7 +167,10 @@ private function getDatabasePlatform(Connection $connection): AbstractPlatform
         try {
             return $connection->getDatabasePlatform();
         } catch (DriverException $driverException) {
-            throw new DBALException(
+            //TODO: what more specific exception class should we throw with DBAL 4?
+            $class = class_exists(DBALException::class) ? DBALException::class : RuntimeException::class;
+
+            throw new $class(
                 'An exception occurred while establishing a connection to figure out your platform version.' . PHP_EOL .
                 "You can circumvent this by setting a 'server_version' configuration value" . PHP_EOL . PHP_EOL .
                 'For further information have a look at:' . PHP_EOL .
@@ -226,19 +234,15 @@ private function addDatabaseSuffix(array $params): array
      *                 URL extracted into individual parameter parts.
      * @psalm-return Params
      *
-     * @throws Exception
+     * @throws DBALException
      */
     private function parseDatabaseUrl(array $params): array
     {
         if (! isset($params['url'])) {
             return $params;
         }
 
-        try {
-            $parsedParams = $this->dsnParser->parse($params['url']);
-        } catch (MalformedDsnException $e) {
-            throw new Exception('Malformed parameter "url".', 0, $e);
-        }
+        $parsedParams = $this->dsnParser->parse($params['url']);
 
         if (isset($parsedParams['driver'])) {
             // The requested driver from the URL scheme takes precedence
@@ -248,10 +252,10 @@ private function parseDatabaseUrl(array $params): array
 
         $params = array_merge($params, $parsedParams);
 
-        // If a schemeless connection URL is given, we require a default driver or default custom driver
+        // If a schemaless connection URL is given, we require a default driver or default custom driver
         // as connection parameter.
         if (! isset($params['driverClass']) && ! isset($params['driver'])) {
-            throw Exception::driverRequired($params['url']);
+            throw DBALException\DriverRequired::new($params['url']);
         }
 
         unset($params['url']);

Tests/Dbal/Logging/BacktraceLoggerTest.php

@@ -3,15 +3,21 @@
 namespace Doctrine\Bundle\DoctrineBundle\Tests\Dbal\Logging;
 
 use Doctrine\Bundle\DoctrineBundle\Dbal\Logging\BacktraceLogger;
+use Doctrine\DBAL\Logging\DebugStack;
 use PHPUnit\Framework\TestCase;
 
+use function class_exists;
 use function current;
 
 /** @group legacy */
 class BacktraceLoggerTest extends TestCase
 {
     public function testBacktraceLogged(): void
     {
+        if (! class_exists(DebugStack::class)) {
+            self::markTestSkipped('Needs DBAL < 4');
+        }
+
         $logger = new BacktraceLogger();
         $logger->startQuery('SELECT column FROM table');
         $currentQuery = current($logger->queries);