From aed0e76fbe80336373e724936680db1a9f2753dd Mon Sep 17 00:00:00 2001
From: health901 <health901@163.com>
Date: Fri, 22 Nov 2024 13:50:44 +0800
Subject: [PATCH] Update Str.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复默认字符表不含数字的bug

$type ==null 时不会进入case default,而是进入 case 0
---
 src/helper/Str.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/helper/Str.php b/src/helper/Str.php
index 61b34d8..a56a760 100644
--- a/src/helper/Str.php
+++ b/src/helper/Str.php
@@ -84,6 +84,10 @@ public static function random(int $length = 6, ?int $type = null, string $addCha
     {
         $str = '';
         switch ($type) {
+            case null:
+            default:
+                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789' . $addChars;
+                break;
             case 0:
                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' . $addChars;
                 break;
@@ -99,9 +103,6 @@ public static function random(int $length = 6, ?int $type = null, string $addCha
             case 4:
                 $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书" . $addChars;
                 break;
-            default:
-                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789' . $addChars;
-                break;
         }
         if ($length > 10) {
             $chars = $type == 1 ? str_repeat($chars, $length) : str_repeat($chars, 5);