fix: switch to DSN class, add tests

Author: cawolf

pkg/dbal/DbalConnectionFactory.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
+use Enqueue\Dsn\Dsn;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
 
@@ -93,20 +94,7 @@ private function establishConnection(): Connection
 
     private function parseDsn(string $dsn, array $config = null): array
     {
-        if (false === strpos($dsn, ':')) {
-            throw new \LogicException(sprintf('The DSN is invalid. It does not have scheme separator ":".'));
-        }
-
-        list($scheme) = explode(':', $dsn, 2);
-        $scheme = strtolower($scheme);
-
-        if (false === strpos($scheme, 'sqlite') && false === parse_url($dsn)) {
-            throw new \LogicException(sprintf('Failed to parse DSN "%s"', $dsn));
-        }
-
-        if (false == preg_match('/^[a-z\d+-.]*$/', $scheme)) {
-            throw new \LogicException('The DSN is invalid. Scheme contains illegal symbols.');
-        }
+        $parsedDsn = Dsn::parseFirst($dsn);
 
         $supported = [
             'db2' => 'db2',
@@ -124,13 +112,13 @@ private function parseDsn(string $dsn, array $config = null): array
             'sqlite+pdo' => 'pdo_sqlite',
         ];
 
-        if (false == isset($supported[$scheme])) {
-            throw new \LogicException(sprintf('The given DSN schema "%s" is not supported. There are supported schemes: "%s".', $scheme, implode('", "', array_keys($supported))));
+        if ($parsedDsn && false == isset($supported[$parsedDsn->getScheme()])) {
+            throw new \LogicException(sprintf('The given DSN schema "%s" is not supported. There are supported schemes: "%s".', $parsedDsn->getScheme(), implode('", "', array_keys($supported))));
         }
 
-        $doctrineScheme = $supported[$scheme];
-
-        if ($scheme.':' === $dsn && is_array($config) && array_key_exists('connection', $config)) {
+        $doctrineScheme = $supported[$parsedDsn->getScheme()];
+        $dsnHasProtocolOnly = $parsedDsn->getScheme().':' === $dsn;
+        if ($dsnHasProtocolOnly && is_array($config) && array_key_exists('connection', $config)) {
             $default = [
                 'driver' => $doctrineScheme,
                 'host' => 'localhost',
@@ -148,9 +136,9 @@ private function parseDsn(string $dsn, array $config = null): array
         return [
             'lazy' => true,
             'connection' => [
-                'url' => $scheme.':' === $dsn ?
+                'url' => $dsnHasProtocolOnly ?
                     $doctrineScheme.'://root@localhost' :
-                    str_replace($scheme, $doctrineScheme, $dsn),
+                    str_replace($parsedDsn->getScheme(), $doctrineScheme, $dsn),
             ],
         ];
     }

pkg/dbal/Tests/DbalConnectionFactoryTest.php

@@ -28,4 +28,32 @@ public function testShouldCreateLazyContext()
         $this->assertAttributeEquals(null, 'connection', $context);
         $this->assertAttributeInternalType('callable', 'connectionFactory', $context);
     }
+
+    public function testShouldParseGenericDSN()
+    {
+        $factory = new DbalConnectionFactory('pgsql+pdo://foo@bar');
+
+        $context = $factory->createContext();
+
+        $this->assertInstanceOf(DbalContext::class, $context);
+
+        $config = $context->getConfig();
+        $this->assertArrayHasKey('connection', $config);
+        $this->assertArrayHasKey('url', $config['connection']);
+        $this->assertEquals('pdo_pgsql://foo@bar', $config['connection']['url']);
+    }
+
+    public function testShouldParseSqliteAbsolutePathDSN()
+    {
+        $factory = new DbalConnectionFactory('sqlite+pdo:////tmp/some.sq3');
+
+        $context = $factory->createContext();
+
+        $this->assertInstanceOf(DbalContext::class, $context);
+
+        $config = $context->getConfig();
+        $this->assertArrayHasKey('connection', $config);
+        $this->assertArrayHasKey('url', $config['connection']);
+        $this->assertEquals('pdo_sqlite:////tmp/some.sq3', $config['connection']['url']);
+    }
 }