up: update some for string to bool value

php-toolkit · Apr 12, 2022 · 190cf6f · 190cf6f
1 parent 2fe57cd
commit 190cf6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/FlagType.php b/src/FlagType.php
@@ -9,6 +9,7 @@
 
 namespace Toolkit\PFlag;
 
+use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\Stdlib\Str;
 use function is_scalar;
 use function is_string;
@@ -127,7 +128,7 @@ public static function getDefault(string $type): float|bool|int|array|string|nul
         return match ($type) {
             self::INT => 0,
             self::BOOL => false,
-            self::FLOAT => (float)0,
+            self::FLOAT => 0.0,
             self::STRING => '',
             self::INTS, self::ARRAY, self::STRINGS => [],
             default => null,
@@ -146,10 +147,20 @@ public static function fmtBasicTypeValue(string $type, mixed $value): mixed
             return $value;
         }
 
+        // convert to bool
+        if ($type === self::BOOL) {
+            $value = is_string($value) ? Str::tryToBool($value) : (bool)$value;
+
+            if (is_string($value)) {
+                throw new FlagException("convert value '$value' to bool failed");
+            }
+            return $value;
+        }
+
         // format value by type
         return match ($type) {
             self::INT, self::INTS => (int)$value,
-            self::BOOL => is_string($value) ? Str::toBool2($value) : (bool)$value,
+            // self::BOOL => is_string($value) ? Str::toBool2($value) : (bool)$value,
             self::FLOAT => (float)$value,
             self::STRING, self::STRINGS => (string)$value,
             default => $value,

diff --git a/src/FlagsParser.php b/src/FlagsParser.php
@@ -504,11 +504,14 @@ public function popFirstRawArg(): string
     }
 
     /**
+     * @param bool $more
+     *
      * @return array
      */
     public function getInfo(bool $more = false): array
     {
         $info = [
+            'driver'     => static::class,
             'flags'      => $this->flags,
             'rawArgs'    => $this->rawArgs,
             'remainArgs' => $this->remainArgs,