URL-decode URL-style DSN

doctrine · Jan 15, 2017 · 2dc4196 · 2dc4196
1 parent 7963f13
commit 2dc4196
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php
@@ -259,6 +259,8 @@ private static function parseDatabaseUrl(array $params)
             throw new DBALException('Malformed parameter "url".');
         }
 
+        $url = array_map('rawurldecode', $url);
+
         // If we have a connection URL, we have to unset the default PDO instance connection parameter (if any)
         // as we cannot merge connection details from the URL into the PDO instance (URL takes precedence).
         unset($params['pdo']);

diff --git a/tests/Doctrine/Tests/DBAL/DriverManagerTest.php b/tests/Doctrine/Tests/DBAL/DriverManagerTest.php
@@ -199,6 +199,10 @@ public function databaseUrls()
                 'drizzle-pdo-mysql://foo:bar@localhost/baz',
                 array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver'),
             ),
+            'simple URL with percent encoding' => array(
+                'mysql://foo%3A:bar%2F@localhost/baz+baz%40',
+                array('user' => 'foo:', 'password' => 'bar/', 'host' => 'localhost', 'dbname' => 'baz+baz@', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'),
+            ),
 
             // DBAL-1234
             'URL without scheme and without any driver information' => array(