wip

Author: xiCO2k

src/Illuminate/Database/Console/DbCommand.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\ConfigurationUrlParser;
+use Illuminate\Support\Uri;
 use PDO;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -289,34 +290,17 @@ protected function buildDatabaseUrl(array $connection)
             return $connection['database'];
         }
 
-        $url = "{$driver}://";
-
-        if (! empty($connection['username'])) {
-            $url .= urlencode($connection['username']);
-
-            if (! empty($connection['password'])) {
-                $url .= ':'.urlencode($connection['password']);
-            }
-
-            $url .= '@';
-        }
-
-        $url .= $connection['host'];
-
-        if (! empty($connection['port'])) {
-            $url .= ":{$connection['port']}";
-        }
-
-        if (! empty($connection['database'])) {
-            $url .= '/'.urlencode($connection['database']);
-        }
-
-        $queryParams = $this->getQueryParameters($connection);
-        if (! empty($queryParams)) {
-            $url .= '?'.http_build_query($queryParams);
-        }
-
-        return $url;
+        return (new Uri)
+            ->withScheme($driver)
+            ->withHost($connection['host'])
+            ->withUser(
+                $connection['username'] ?? null,
+                ! empty($connection['password']) ? $connection['password'] : null,
+            )
+            ->when(! empty($connection['port']), fn (Uri $uri) => $uri->withPort((int) $connection['port']))
+            ->when(! empty($connection['database']), fn (Uri $uri) => $uri->withPath($connection['database']))
+            ->when(! empty($this->getQueryParameters($connection)), fn (Uri $uri) => $uri->withQuery($this->getQueryParameters($connection)))
+            ->value();
     }
 
     /**

tests/Database/DbCommandTest.php

@@ -81,7 +81,7 @@ public function testBuildDatabaseUrlForSqlServer()
 
         $url = $command->buildDatabaseUrl($connection);
 
-        $this->assertSame('sqlserver://sa:Password123%21@localhost:1433/master', $url);
+        $this->assertSame('sqlserver://sa:Password123!@localhost:1433/master', $url);
     }
 
     public function testBuildDatabaseUrlWithSpecialCharactersInPassword()
@@ -99,7 +99,7 @@ public function testBuildDatabaseUrlWithSpecialCharactersInPassword()
 
         $url = $command->buildDatabaseUrl($connection);
 
-        $this->assertSame('mysql://root:p%40ss%3Aword%21%23%24@localhost:3306/forge', $url);
+        $this->assertSame('mysql://root:p%40ss:word!%23$@localhost:3306/forge', $url);
     }
 
     public function testBuildDatabaseUrlWithoutPassword()