diff --git a/src/Illuminate/Database/DatabaseManager.php b/src/Illuminate/Database/DatabaseManager.php
index 47e17a86e881..05d8cf0d4545 100755
--- a/src/Illuminate/Database/DatabaseManager.php
+++ b/src/Illuminate/Database/DatabaseManager.php
@@ -151,9 +151,8 @@ protected function configuration($name)
             throw new InvalidArgumentException("Database [{$name}] not configured.");
         }
 
-        $urlParser = new UrlParser;
-
-        return $urlParser->parseDatabaseConfigWithUrl($config);
+        return (new ConfigurationUrlParser)
+                    ->parseConfiguration($config);
     }
 
     /**
diff --git a/src/Illuminate/Database/UrlParser.php b/src/Illuminate/Database/UrlParser.php
deleted file mode 100644
index 9a1f15a9f391..000000000000
--- a/src/Illuminate/Database/UrlParser.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-namespace Illuminate\Database;
-
-use function array_map;
-use function parse_str;
-use function parse_url;
-use function array_merge;
-use function preg_replace;
-use Illuminate\Support\Arr;
-use InvalidArgumentException;
-
-class UrlParser
-{
-    /**
-     * The drivers aliases map.
-     *
-     * @var array
-     */
-    protected static $driverAliases = [
-        'mssql' => 'sqlsrv',
-        'mysql2' => 'mysql', // Amazon RDS, for some weird reason
-        'postgres' => 'pgsql',
-        'postgresql' => 'pgsql',
-        'sqlite3' => 'sqlite',
-    ];
-
-    /**
-     * The different components of parsed url.
-     *
-     * @var array
-     */
-    protected $parsedUrl;
-
-    /**
-     * Get all of the current drivers aliases.
-     *
-     * @return array
-     */
-    public static function getDriverAliases(): array
-    {
-        return static::$driverAliases;
-    }
-
-    /**
-     * Add the driver alias to the driver aliases array.
-     *
-     * @param  string  $alias
-     * @param  string  $driver
-     * @return void
-     */
-    public static function addDriverAlias($alias, $driver)
-    {
-        static::$driverAliases[$alias] = $driver;
-    }
-
-    /**
-     * Transform the url string or config array with url key to a parsed classic config array.
-     *
-     * @param  array|string  $config
-     * @return array
-     */
-    public function parseDatabaseConfigWithUrl($config): array
-    {
-        if (is_string($config)) {
-            $config = ['url' => $config];
-        }
-
-        $url = $config['url'] ?? null;
-        $config = Arr::except($config, 'url');
-
-        if (! $url) {
-            return $config;
-        }
-
-        $this->parsedUrl = $this->parseUrl($url);
-
-        return array_merge(
-            $config,
-            $this->getMainAttributes(),
-            $this->getOtherOptions()
-        );
-    }
-
-    /**
-     * Decode the string url, to an array of all of its components.
-     *
-     * @param  string  $url
-     * @return array
-     */
-    protected function parseUrl($url): array
-    {
-        // sqlite3?:///... => sqlite3?://null/... or else the URL will be invalid
-        $url = preg_replace('#^(sqlite3?):///#', '$1://null/', $url);
-
-        $parsedUrl = parse_url($url);
-
-        if ($parsedUrl === false) {
-            throw new InvalidArgumentException('Malformed parameter "url".');
-        }
-
-        return $this->parseStringsToNativeTypes(array_map('rawurldecode', $parsedUrl));
-    }
-
-    /**
-     * Convert string casted values to there native types.
-     * Ex: 'false' => false, '42' => 42, 'foo' => 'foo'
-     *
-     * @param  string  $url
-     * @return mixed
-     */
-    protected function parseStringsToNativeTypes($value)
-    {
-        if (is_array($value)) {
-            return array_map([$this, 'parseStringsToNativeTypes'], $value);
-        }
-
-        if (! is_string($value)) {
-            return $value;
-        }
-
-        $parsedValue = json_decode($value, true);
-
-        if (json_last_error() === JSON_ERROR_NONE) {
-            return $parsedValue;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the main attributes of the database connection config from url.
-     *
-     * @return array
-     */
-    protected function getMainAttributes(): array
-    {
-        return array_filter([
-            'driver' => $this->getDriver(),
-            'database' => $this->getDatabase(),
-            'host' => $this->getInUrl('host'),
-            'port' => $this->getInUrl('port'),
-            'username' => $this->getInUrl('user'),
-            'password' => $this->getInUrl('pass'),
-        ], function ($value) {
-            return $value !== null;
-        });
-    }
-
-    /**
-     * Find connection driver from url.
-     *
-     * @return string|null
-     */
-    protected function getDriver()
-    {
-        $alias = $this->getInUrl('scheme');
-
-        if (! $alias) {
-            return null;
-        }
-
-        return static::$driverAliases[$alias] ?? $alias;
-    }
-
-    /**
-     * Get a component of the parsed url.
-     *
-     * @param  string  $key
-     * @return string|null
-     */
-    protected function getInUrl($key)
-    {
-        return $this->parsedUrl[$key] ?? null;
-    }
-
-    /**
-     * Find connection database from url.
-     *
-     * @return string|null
-     */
-    protected function getDatabase()
-    {
-        $path = $this->getInUrl('path');
-
-        if (! $path) {
-            return null;
-        }
-
-        return substr($path, 1);
-    }
-
-    /**
-     * Return all the options added to the url with query params.
-     *
-     * @return array
-     */
-    protected function getOtherOptions(): array
-    {
-        $queryString = $this->getInUrl('query');
-
-        if (! $queryString) {
-            return [];
-        }
-
-        $query = [];
-
-        parse_str($queryString, $query);
-
-        return $this->parseStringsToNativeTypes($query);
-    }
-}
diff --git a/tests/Database/DatabaseUrlParserTest.php b/tests/Database/DatabaseUrlParserTest.php
index 27245af801b3..55e1c26eece9 100644
--- a/tests/Database/DatabaseUrlParserTest.php
+++ b/tests/Database/DatabaseUrlParserTest.php
@@ -3,7 +3,7 @@
 namespace Illuminate\Tests\Database;
 
 use PHPUnit\Framework\TestCase;
-use Illuminate\Database\UrlParser;
+use Illuminate\Database\ConfigurationUrlParser;
 
 class DatabaseUrlParserTest extends TestCase
 {
@@ -12,7 +12,7 @@ class DatabaseUrlParserTest extends TestCase
      */
     public function testDatabaseUrlsAreParsed($config, $expectedOutput)
     {
-        $this->assertEquals($expectedOutput, (new UrlParser)->parseDatabaseConfigWithUrl($config));
+        $this->assertEquals($expectedOutput, (new ConfigurationUrlParser)->parseConfiguration($config));
     }
 
     public function testDriversAliases()
@@ -23,9 +23,9 @@ public function testDriversAliases()
             'postgres' => 'pgsql',
             'postgresql' => 'pgsql',
             'sqlite3' => 'sqlite',
-        ], UrlParser::getDriverAliases());
+        ], ConfigurationUrlParser::getDriverAliases());
 
-        UrlParser::addDriverAlias('some-particular-alias', 'mysql');
+        ConfigurationUrlParser::addDriverAlias('some-particular-alias', 'mysql');
 
         $this->assertEquals([
             'mssql' => 'sqlsrv',
@@ -34,11 +34,11 @@ public function testDriversAliases()
             'postgresql' => 'pgsql',
             'sqlite3' => 'sqlite',
             'some-particular-alias' => 'mysql',
-        ], UrlParser::getDriverAliases());
+        ], ConfigurationUrlParser::getDriverAliases());
 
         $this->assertEquals([
             'driver' => 'mysql',
-        ], (new UrlParser)->parseDatabaseConfigWithUrl('some-particular-alias://null'));
+        ], (new ConfigurationUrlParser)->parseConfiguration('some-particular-alias://null'));
     }
 
     public function databaseUrls()