fix: unit tests error

Author: inhere

src/Flag/AbstractFlag.php

@@ -10,7 +10,6 @@
 namespace Toolkit\PFlag\Flag;
 
 use ArrayAccess;
-use Toolkit\Cli\Helper\FlagHelper;
 use Toolkit\PFlag\Contract\FlagInterface;
 use Toolkit\PFlag\Contract\ValidatorInterface;
 use Toolkit\PFlag\Exception\FlagException;
@@ -70,16 +69,16 @@ abstract class AbstractFlag implements ArrayAccess, FlagInterface
     /**
      * The default value
      *
-     * @var mixed
+     * @var mixed|null
      */
-    protected mixed $default;
+    protected mixed $default = null;
 
     /**
      * The flag value
      *
-     * @var mixed
+     * @var mixed|null
      */
-    protected mixed $value;
+    protected mixed $value = null;
 
     // TODO category
     // protected $category = '';
@@ -105,15 +104,15 @@ abstract class AbstractFlag implements ArrayAccess, FlagInterface
      * @param bool   $required
      * @param mixed|null $default
      *
-     * @return static|Argument|Option
+     * @return static
      */
     public static function new(
         string $name,
         string $desc = '',
         string $type = 'string',
         bool $required = false,
         mixed $default = null
-    ): self {
+    ): static {
         return new static($name, $desc, $type, $required, $default);
     }
 
@@ -123,9 +122,9 @@ public static function new(
      * @param string $name
      * @param array  $define
      *
-     * @return static|Argument|Option
+     * @return static
      */
-    public static function newByArray(string $name, array $define): self
+    public static function newByArray(string $name, array $define): static
     {
         $flag = new static($name);
         if (isset($define['name'])) {

src/FlagType.php

@@ -124,31 +124,14 @@ public static function getHelpName(string $type, bool $toUpper = true): string
      */
     public static function getDefault(string $type): float|bool|int|array|string|null
     {
-        $value = null;
-        switch ($type) {
-            case self::INT:
-                $value = 0;
-                break;
-            case self::BOOL:
-                $value = false;
-                break;
-            case self::FLOAT:
-                $value = (float)0;
-                break;
-            case self::STRING:
-                $value = '';
-                break;
-            case self::INTS:
-            case self::ARRAY:
-            case self::STRINGS:
-                $value = [];
-                break;
-            default:
-                // nothing
-                break;
-        }
-
-        return $value;
+        return match ($type) {
+            self::INT => 0,
+            self::BOOL => false,
+            self::FLOAT => (float)0,
+            self::STRING => '',
+            self::INTS, self::ARRAY, self::STRINGS => [],
+            default => null,
+        };
     }
 
     /**
@@ -164,32 +147,13 @@ public static function fmtBasicTypeValue(string $type, mixed $value): mixed
         }
 
         // format value by type
-        switch ($type) {
-            case self::INT:
-            case self::INTS:
-                $value = (int)$value;
-                break;
-            case self::BOOL:
-                if (is_string($value)) {
-                    // $value = FlagHelper::str2bool($value);
-                    $value = Str::toBool2($value);
-                } else {
-                    $value = (bool)$value;
-                }
-                break;
-            case self::FLOAT:
-                $value = (float)$value;
-                break;
-            case self::STRING:
-            case self::STRINGS:
-                $value = (string)$value;
-                break;
-            default:
-                // nothing
-                break;
-        }
-
-        return $value;
+        return match ($type) {
+            self::INT, self::INTS => (int)$value,
+            self::BOOL => is_string($value) ? Str::toBool2($value) : (bool)$value,
+            self::FLOAT => (float)$value,
+            self::STRING, self::STRINGS => (string)$value,
+            default => $value,
+        };
     }
 
     /**