fix(options): Correct host and port handling in DSN normalization

- Enable host and port configuration for DSN address
- Update normalization logic to derive addr from host and port only if addr is not set
- Ensure consistency in test snapshots to reflect changes in DSN format

Author: guanguans

src/Concerns/HasOptions.php

@@ -561,8 +561,8 @@ private function normalizeDsn(string $name, array $dsn): ?string
             // 'user' => '',
             // 'password' => '',
             // 'addr' => '127.0.0.1:3306',
-            // 'host' => '127.0.0.1',
-            // 'port' => 3306,
+            'host' => '127.0.0.1',
+            'port' => 3306,
             // 'schema' => 'dbname',
             'disable' => false,
         ];
@@ -571,7 +571,7 @@ private function normalizeDsn(string $name, array $dsn): ?string
             return null;
         }
 
-        if (!isset($dsn['addr']) && isset($dsn['host'], $dsn['port'])) {
+        if (!isset($dsn['addr'])) {
             $dsn['addr'] = "{$dsn['host']}:{$dsn['port']}";
         }
 

tests/Concerns/HasOptionsTest.php

@@ -86,33 +86,34 @@
 })->group(__DIR__, __FILE__)->throws(InvalidOptionException::class, 'object');
 
 it('can normalize options', function (): void {
-    $this->assertMatchesJsonSnapshot(
-        (fn (): array => $this->getNormalizedOptions())->call(Soar::make(
-            array_merge(require __DIR__.'/../../examples/soar-options.php', [
-                '-explain-format' => new class {
-                    public function __invoke(): string
-                    {
-                        return 'traditional';
-                    }
-                },
-                '-explain-type' => new class {
-                    public function __toString(): string
-                    {
-                        return 'extended';
-                    }
-                },
-                '-test-dsn' => [
-                    'user' => 'you_user',
-                    'password' => 'you_password',
-                    // 'addr' => '127.0.0.1:3306',
-                    'host' => 'you_host',
-                    'port' => 'you_port',
-                    'schema' => 'you_dbname',
-                    'disable' => false,
-                ],
-            ])
-        ))
-    );
+    $normalizedOptions = (fn (): array => $this->getNormalizedOptions())->call(Soar::make(
+        array_merge(require __DIR__.'/../../examples/soar-options.php', [
+            '-explain-format' => new class {
+                public function __invoke(): string
+                {
+                    return 'traditional';
+                }
+            },
+            '-explain-type' => new class {
+                public function __toString(): string
+                {
+                    return 'extended';
+                }
+            },
+            '-test-dsn' => [
+                'user' => 'you_user',
+                'password' => 'you_password',
+                // 'addr' => '127.0.0.1:3306',
+                'host' => 'you_host',
+                'port' => 'you_port',
+                'schema' => 'you_dbname',
+                'disable' => false,
+            ],
+        ])
+    ));
+
+    expect($normalizedOptions)->each->toBeString();
+    $this->assertMatchesJsonSnapshot($normalizedOptions);
 })->group(__DIR__, __FILE__);
 
 it('will throw InvalidOptionException when normalize invalid dsn', function (): void {

tests/Concerns/WithRunableTest.php

@@ -23,6 +23,7 @@
 namespace Guanguans\SoarPHPTests\Concerns;
 
 use Guanguans\SoarPHP\Soar;
+use Guanguans\SoarPHP\Support\OS;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 
@@ -45,7 +46,7 @@
     (new class extends Soar {
         protected function shouldApplySudoPassword(): bool
         {
-            return true;
+            return OS::isUnix();
         }
     })->setSudoPassword('foo')->help();
 })

tests/Pest.php

@@ -105,6 +105,11 @@ function fake(string $locale = Factory::DEFAULT_LOCALE): Generator
     return Factory::create($locale);
 }
 
+function running_in_github_action(): bool
+{
+    return getenv('GITHUB_ACTIONS') === 'true';
+}
+
 function soar_options(): array
 {
     static $options;
@@ -121,8 +126,3 @@ function soar_options_example(): array
 
     return $options ??= require __DIR__.'/../examples/soar-options-example.php';
 }
-
-function running_in_github_action(): bool
-{
-    return getenv('GITHUB_ACTIONS') === 'true';
-}

tests/__snapshots__/HasOptionsTest__it_can_normalize_options__1.json

@@ -1,6 +1,6 @@
 {
     "-config": "-config",
-    "-test-dsn": "-test-dsn=you_user:you_password@you_host:you_port\/you_dbname?host=you_host&port=you_port",
+    "-test-dsn": "-test-dsn=you_user:you_password@you_host:you_port\/you_dbname",
     "-online-dsn": "-online-dsn=:********@127.0.0.1:3306\/information_schema?net=tcp&charset=utf8&collation=utf8mb4_general_ci&loc=UTC&tls=&server-public-key=&max-allowed-packet=4194304&params[charset]=utf8&timeout=3s&read-timeout=0s&write-timeout=0s&allow-native-passwords=1&allow-old-passwords=0",
     "-allow-online-as-test": "-allow-online-as-test=false",
     "-blacklist": "-blacklist=",