From 4a004b0b85e78d3da0d4c096b4b202d11cc5e562 Mon Sep 17 00:00:00 2001
From: F4nniu <sparkamax@gmail.com>
Date: Thu, 6 Jul 2023 17:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20php8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Loader.php   | 2 +-
 library/think/Validate.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index d813a5d7..283a2807 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -613,7 +613,7 @@ class Loader
         if ($type) {
             $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
                 return strtoupper($match[1]);
-            }, $name);
+            }, $name ?? '');
 
             return $ucfirst ? ucfirst($name) : lcfirst($name);
         }
diff --git a/library/think/Validate.php b/library/think/Validate.php
index 608e1e4a..11a1de9f 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -931,10 +931,10 @@ class Validate
         if (is_string($rule) && strpos($rule, ',')) {
             list($rule, $param) = explode(',', $rule);
         } elseif (is_array($rule)) {
-            $param = isset($rule[1]) ? $rule[1] : null;
+            $param = $rule[1] ?? 0;
             $rule  = $rule[0];
         } else {
-            $param = null;
+            $param = 0;
         }
         return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $param);
     }