refactor(options): Improve option normalization logic

- Streamline normalization of options in the HasOptions trait
- Ensure string keys are used consistently in the normalization process
- Improve error handling by strictly checking array type for options
- Enhance test case to ensure normalization handles boolean values

Author: guanguans

baselines/function.alreadyNarrowedType.neon

@@ -1,6 +1,5 @@
-# total 4 errors
+# total 3 errors
 includes:
     - disallowed.function.neon
-    - function.alreadyNarrowedType.neon
     - new.static.neon
     - typePerfect.narrowPublicClassMethodParamType.neon

baselines/loader.neon

@@ -66,13 +66,13 @@ parameters:
             message: 'use config() instead'
     ignoreErrors:
 #        - identifier: argument.templateType
+#        - identifier: cast.string
 #        - identifier: method.nonObject
 #        - identifier: missingType.generics
 #        - identifier: return.void
 #        - identifier: typePerfect.noMixedMethodCaller
         - identifier: argument.type
         - identifier: binaryOp.invalid
-        - identifier: cast.string
         - identifier: encapsedStringPart.nonString
         - identifier: logicalAnd.resultUnused
         - identifier: missingType.iterableValue

phpstan.neon

@@ -1275,6 +1275,7 @@ public function exceptOption(string $name): self
     }
 
     /**
+     * @throws \JsonException
      * @throws \Guanguans\SoarPHP\Exceptions\InvalidOptionException
      */
     protected function getNormalizedOptions(): array
@@ -1283,58 +1284,71 @@ protected function getNormalizedOptions(): array
     }
 
     /**
+     * @throws \JsonException
      * @throws \Guanguans\SoarPHP\Exceptions\InvalidOptionException
      */
     protected function normalizeOptions(array $options): array
     {
-        return array_reduce_with_keys($options, function (array $normalizedOptions, mixed $value, int|string $name): array {
-            if ($normalizedOption = $this->normalizeOption($name, $value)) {
-                $normalizedOptions[\is_int($name) ? (string) $value : $name] = $normalizedOption;
-            }
+        return array_reduce_with_keys(
+            $options,
+            function (array $normalizedOptions, mixed $value, string $name): array {
+                $normalizedOptions[$name] = $this->normalizeOption($name, $value);
 
-            return $normalizedOptions;
-        }, []);
+                return $normalizedOptions;
+            },
+            []
+        );
     }
 
     /**
+     * @throws \JsonException
      * @throws \Guanguans\SoarPHP\Exceptions\InvalidOptionException
      */
-    protected function normalizeOption(int|string $name, mixed $value): string
+    protected function normalizeOption(string $name, mixed $value): string
     {
-        $converter = function (mixed $value) {
-            /** @noinspection UselessIsComparisonInspection */
-            \is_callable($value) and !(\is_string($value) && \function_exists($value)) and $value = $value($this);
-            true === $value and $value = 'true';
-            false === $value and $value = 'false';
-            0 === $value and $value = '0';
-
-            return $value;
-        };
+        if (
+            \is_array($value)
+            && !($value['disable'] ?? false)
+            && \in_array($name, ['-test-dsn', '-online-dsn'], true)
+        ) {
+            $value = "{$value['username']}:{$value['password']}@{$value['host']}:{$value['port']}/{$value['dbname']}";
+        }
 
-        $value = $converter($value);
+        return null === ($value = $this->normalizeValue($value)) ? $name : "$name=$value";
+    }
 
-        if (null === $value) {
-            return $name;
+    /**
+     * @throws \JsonException
+     * @throws \Guanguans\SoarPHP\Exceptions\InvalidOptionException
+     */
+    private function normalizeValue(mixed $value): ?string
+    {
+        if (\is_string($value) || null === $value) {
+            return $value;
         }
 
-        if (\is_scalar($value) || (\is_object($value) && method_exists($value, '__toString'))) {
-            if (\is_int($name)) {
-                return (string) $value;
-            }
-
-            return "$name=$value";
+        if (\is_scalar($value)) {
+            return json_encode($value, \JSON_THROW_ON_ERROR);
         }
 
-        if (\is_array($value)) {
-            if (!($value['disable'] ?? false) && \in_array($name, ['-test-dsn', '-online-dsn'], true)) {
-                $dsn = "{$value['username']}:{$value['password']}@{$value['host']}:{$value['port']}/{$value['dbname']}";
+        if (\is_callable($value)) {
+            return $this->normalizeValue($value($this));
+        }
 
-                return "$name=$dsn";
-            }
+        if (\is_object($value) && method_exists($value, '__toString')) {
+            return (string) $value;
+        }
 
-            return "$name=".implode(',', array_map($converter, $value));
+        if (!\is_array($value)) {
+            throw new InvalidOptionException(\sprintf('Invalid option type [%s].', \gettype($value)));
         }
 
-        throw new InvalidOptionException(\sprintf('Invalid configuration type(%s).', \gettype($value)));
+        return implode(
+            ',',
+            array_filter(
+                array_map(fn (mixed $val): ?string => $this->normalizeValue($val), $value),
+                static fn (?string $v): bool => null !== $v
+            )
+        );
     }
 }

src/Concerns/HasOptions.php

@@ -110,7 +110,7 @@
     expect(fn (): array => $this->getNormalizedOptions())
         ->call(Soar::create([
             'foo' => 'bar',
-            '-verbose',
+            '-verbose' => true,
             '-test-dsn' => [
                 'host' => 'you_host',
                 'port' => 'you_port',