formatting

laravel · Apr 30, 2019 · 4560d28 · 4560d28
1 parent 00f1776
commit 4560d28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 221 deletions.
diff --git 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
diff --git 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()