fix: 修复PHP8.4下隐式 nullable 参数声明弃用的问题(5.x) (#2930)

karsonzhang · web-flow · commit fb8c14c0c0f9 · 2025-06-19T10:53:13.000+08:00
diff --git a/src/BasicService/Jssdk/Client.php b/src/BasicService/Jssdk/Client.php
@@ -55,7 +55,7 @@ class Client extends BaseClient
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function buildConfig(array $jsApiList, bool $debug = false, bool $beta = false, bool $json = true, array $openTagList = [], string $url = null)
+    public function buildConfig(array $jsApiList, bool $debug = false, bool $beta = false, bool $json = true, array $openTagList = [], ?string $url = null)
     {
         $config = array_merge(compact('debug', 'beta', 'jsApiList', 'openTagList'), $this->configSignature($url));
 
@@ -78,7 +78,7 @@ public function buildConfig(array $jsApiList, bool $debug = false, bool $beta =
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getConfigArray(array $apis, bool $debug = false, bool $beta = false, array $openTagList = [], string $url = null)
+    public function getConfigArray(array $apis, bool $debug = false, bool $beta = false, array $openTagList = [], ?string $url = null)
     {
         return $this->buildConfig($apis, $debug, $beta, false, $openTagList, $url);
     }
@@ -135,7 +135,7 @@ public function getTicket(bool $refresh = false, string $type = 'jsapi'): array
      * @throws \GuzzleHttp\Exception\GuzzleException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      */
-    protected function configSignature(string $url = null, string $nonce = null, $timestamp = null): array
+    protected function configSignature(?string $url = null, ?string $nonce = null, $timestamp = null): array
     {
         $url = $url ?: $this->getUrl();
         $nonce = $nonce ?: Support\Str::quickRandom(10);
diff --git a/src/Kernel/BaseClient.php b/src/Kernel/BaseClient.php
@@ -50,7 +50,7 @@ class BaseClient
      * @param \EasyWeChat\Kernel\ServiceContainer                    $app
      * @param \EasyWeChat\Kernel\Contracts\AccessTokenInterface|null $accessToken
      */
-    public function __construct(ServiceContainer $app, AccessTokenInterface $accessToken = null)
+    public function __construct(ServiceContainer $app, ?AccessTokenInterface $accessToken = null)
     {
         $this->app = $app;
         $this->accessToken = $accessToken ?? $this->app['access_token'];
@@ -261,7 +261,7 @@ protected function retryMiddleware()
             function (
                 $retries,
                 RequestInterface $request,
-                ResponseInterface $response = null
+                ?ResponseInterface $response = null
             ) {
                 // Limit the number of retries to 2
                 if ($retries < $this->app->config->get('http.max_retries', 1) && $response && $body = $response->getBody()) {
diff --git a/src/Kernel/Encryptor.php b/src/Kernel/Encryptor.php
@@ -70,7 +70,7 @@ class Encryptor
      * @param string|null $token
      * @param string|null $aesKey
      */
-    public function __construct(string $appId, string $token = null, string $aesKey = null)
+    public function __construct(string $appId, ?string $token = null, ?string $aesKey = null)
     {
         $this->appId = $appId;
         $this->token = $token;
diff --git a/src/Kernel/Exceptions/HttpException.php b/src/Kernel/Exceptions/HttpException.php
@@ -38,7 +38,7 @@ class HttpException extends Exception
      * @param null                                     $formattedResponse
      * @param int                                      $code
      */
-    public function __construct($message, ResponseInterface $response = null, $formattedResponse = null, $code = 0)
+    public function __construct($message, ?ResponseInterface $response = null, $formattedResponse = null, $code = 0)
     {
         parent::__construct($message, $code);
 
diff --git a/src/Kernel/Messages/Transfer.php b/src/Kernel/Messages/Transfer.php
@@ -40,7 +40,7 @@ class Transfer extends Message
      *
      * @param string|null $account
      */
-    public function __construct(string $account = null)
+    public function __construct(?string $account = null)
     {
         parent::__construct(compact('account'));
     }
diff --git a/src/Kernel/ServiceContainer.php b/src/Kernel/ServiceContainer.php
@@ -62,7 +62,7 @@ class ServiceContainer extends Container
      * @param array       $prepends
      * @param string|null $id
      */
-    public function __construct(array $config = [], array $prepends = [], string $id = null)
+    public function __construct(array $config = [], array $prepends = [], ?string $id = null)
     {
         $this->userConfig = $config;
 
diff --git a/src/Kernel/Support/Arr.php b/src/Kernel/Support/Arr.php
@@ -134,7 +134,7 @@ public static function exists(array $array, $key)
      *
      * @return mixed
      */
-    public static function first(array $array, callable $callback = null, $default = null)
+    public static function first(array $array, ?callable $callback = null, $default = null)
     {
         if (is_null($callback)) {
             if (empty($array)) {
@@ -164,7 +164,7 @@ public static function first(array $array, callable $callback = null, $default =
      *
      * @return mixed
      */
-    public static function last(array $array, callable $callback = null, $default = null)
+    public static function last(array $array, ?callable $callback = null, $default = null)
     {
         if (is_null($callback)) {
             return empty($array) ? $default : end($array);
@@ -389,7 +389,7 @@ public static function pull(array &$array, $key, $default = null)
      *
      * @throws \InvalidArgumentException
      */
-    public static function random(array $array, int $amount = null)
+    public static function random(array $array, ?int $amount = null)
     {
         if (is_null($amount)) {
             return $array[array_rand($array)];
diff --git a/src/Kernel/Traits/HasHttpRequests.php b/src/Kernel/Traits/HasHttpRequests.php
@@ -104,12 +104,12 @@ public function getHttpClient(): ClientInterface
     /**
      * Add a middleware.
      *
-     * @param callable $middleware
-     * @param string   $name
+     * @param callable    $middleware
+     * @param string|null $name
      *
      * @return $this
      */
-    public function pushMiddleware(callable $middleware, string $name = null)
+    public function pushMiddleware(callable $middleware, ?string $name = null)
     {
         if (!is_null($name)) {
             $this->middlewares[$name] = $middleware;
diff --git a/src/MiniProgram/AppCode/Client.php b/src/MiniProgram/AppCode/Client.php
@@ -63,7 +63,7 @@ public function getUnlimit(string $scene, array $optional = [])
      *
      * @return array|\EasyWeChat\Kernel\Support\Collection|object|\Psr\Http\Message\ResponseInterface|string
      */
-    public function getQrCode(string $path, int $width = null)
+    public function getQrCode(string $path, ?int $width = null)
     {
         return $this->getStream('cgi-bin/wxaapp/createwxaqrcode', compact('path', 'width'));
     }
diff --git a/src/MiniProgram/SubscribeMessage/Client.php b/src/MiniProgram/SubscribeMessage/Client.php
@@ -123,7 +123,7 @@ protected function restoreMessage()
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function addTemplate(string $tid, array $kidList, string $sceneDesc = null)
+    public function addTemplate(string $tid, array $kidList, ?string $sceneDesc = null)
     {
         $sceneDesc = $sceneDesc ?? '';
         $data = \compact('tid', 'kidList', 'sceneDesc');
diff --git a/src/OfficialAccount/Card/CodeClient.php b/src/OfficialAccount/Card/CodeClient.php
@@ -159,7 +159,7 @@ public function disable(string $code, string $cardId = '')
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function consume(string $code, string $cardId = null)
+    public function consume(string $code, ?string $cardId = null)
     {
         $params = [
             'code' => $code,
diff --git a/src/OfficialAccount/Comment/Client.php b/src/OfficialAccount/Comment/Client.php
@@ -31,7 +31,7 @@ class Client extends BaseClient
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function open(string $msgId, int $index = null)
+    public function open(string $msgId, ?int $index = null)
     {
         $params = [
             'msg_data_id' => $msgId,
@@ -52,7 +52,7 @@ public function open(string $msgId, int $index = null)
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function close(string $msgId, int $index = null)
+    public function close(string $msgId, ?int $index = null)
     {
         $params = [
             'msg_data_id' => $msgId,
diff --git a/src/OfficialAccount/Menu/Client.php b/src/OfficialAccount/Menu/Client.php
@@ -70,14 +70,14 @@ public function create(array $buttons, array $matchRule = [])
     /**
      * Destroy menu.
      *
-     * @param int $menuId
+     * @param int|null $menuId
      *
      * @return mixed
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function delete(int $menuId = null)
+    public function delete(?int $menuId = null)
     {
         if (is_null($menuId)) {
             return $this->httpGet('cgi-bin/menu/delete');
diff --git a/src/OfficialAccount/SubscribeMessage/Client.php b/src/OfficialAccount/SubscribeMessage/Client.php
@@ -42,7 +42,7 @@ class Client extends BaseClient
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function addTemplate(string $tid, array $kidList, string $sceneDesc = null)
+    public function addTemplate(string $tid, array $kidList, ?string $sceneDesc = null)
     {
         $sceneDesc = $sceneDesc ?? '';
         $data = \compact('tid', 'kidList', 'sceneDesc');
diff --git a/src/OfficialAccount/User/UserClient.php b/src/OfficialAccount/User/UserClient.php
@@ -66,13 +66,13 @@ public function select(array $openids, string $lang = 'zh_CN')
     /**
      * List users.
      *
-     * @param string $nextOpenId
+     * @param string|null $nextOpenId
      *
      * @return \Psr\Http\Message\ResponseInterface|\EasyWeChat\Kernel\Support\Collection|array|object|string
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      */
-    public function list(string $nextOpenId = null)
+    public function list(?string $nextOpenId = null)
     {
         $params = ['next_openid' => $nextOpenId];
 
@@ -110,7 +110,7 @@ public function remark(string $openid, string $remark)
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function blacklist(string $beginOpenid = null)
+    public function blacklist(?string $beginOpenid = null)
     {
         $params = ['begin_openid' => $beginOpenid];
 
diff --git a/src/OfficialAccount/WiFi/ShopClient.php b/src/OfficialAccount/WiFi/ShopClient.php
@@ -85,7 +85,7 @@ public function update(int $shopId, array $data)
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function clearDevice(int $shopId, string $ssid = null)
+    public function clearDevice(int $shopId, ?string $ssid = null)
     {
         $data = [
             'shop_id' => $shopId,
diff --git a/src/OpenPlatform/Authorizer/MiniProgram/Code/Client.php b/src/OpenPlatform/Authorizer/MiniProgram/Code/Client.php
@@ -49,7 +49,7 @@ public function commit(int $templateId, string $extJson, string $version, string
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getQrCode(string $path = null)
+    public function getQrCode(?string $path = null)
     {
         return $this->requestRaw('wxa/get_qrcode', 'GET', [
             'query' => ['path' => $path],
@@ -77,7 +77,7 @@ public function getPage()
     }
 
     /**
-     * @param array $data
+     * @param array       $data
      * @param string|null $feedbackInfo
      * @param string|null $feedbackStuff
      *
@@ -86,7 +86,7 @@ public function getPage()
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function submitAudit(array $data, string $feedbackInfo = null, string $feedbackStuff = null)
+    public function submitAudit(array $data, ?string $feedbackInfo = null, ?string $feedbackStuff = null)
     {
         if (isset($data['item_list'])) {
             return $this->httpPostJson('wxa/submit_audit', $data);
diff --git a/src/OpenPlatform/Authorizer/MiniProgram/Tester/Client.php b/src/OpenPlatform/Authorizer/MiniProgram/Tester/Client.php
@@ -40,15 +40,15 @@ public function bind(string $wechatId)
     /**
      * 解绑小程序体验者.
      *
-     * @param string $wechatId
-     * @param string $userStr
+     * @param string|null $wechatId
+     * @param string|null $userStr
      *
      * @return array|\EasyWeChat\Kernel\Support\Collection|object|\Psr\Http\Message\ResponseInterface|string
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function unbind(string $wechatId = null, string $userStr = null)
+    public function unbind(?string $wechatId = null, ?string $userStr = null)
     {
         return $this->httpPostJson('wxa/unbind_tester', [
                 ($userStr ? 'userstr' : 'wechatid') => $userStr ?? $wechatId,
diff --git a/src/OpenPlatform/Base/Client.php b/src/OpenPlatform/Base/Client.php
@@ -30,7 +30,7 @@ class Client extends BaseClient
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function handleAuthorize(string $authCode = null)
+    public function handleAuthorize(?string $authCode = null)
     {
         $params = [
             'component_appid' => $this->app['config']['app_id'],
diff --git a/src/OpenPlatform/CodeTemplate/Client.php b/src/OpenPlatform/CodeTemplate/Client.php
@@ -57,14 +57,14 @@ public function createFromDraft(int $draftId, int $templateType = 0)
     /**
      * 获取代码模版库中的所有小程序代码模版.
      *
-     * @param int $templateType
+     * @param int|null $templateType
      *
      * @return mixed
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function list(int $templateType = null)
+    public function list(?int $templateType = null)
     {
         $params = [
             'template_type' => $templateType,
diff --git a/src/OpenWork/Contact/Client.php b/src/OpenWork/Contact/Client.php
@@ -37,7 +37,7 @@ public function __construct(ServiceContainer $app)
      * @throws \GuzzleHttp\Exception\GuzzleException
      * @noinspection PhpFullyQualifiedNameUsageInspection
      */
-    public function idTranslate(string $authCorpId, array $mediaIdList, string $outputFileName = null, string $outputFileFormat = null)
+    public function idTranslate(string $authCorpId, array $mediaIdList, ?string $outputFileName = null, ?string $outputFileFormat = null)
     {
         /** @noinspection SpellCheckingInspection */
         return $this->httpPostJson('cgi-bin/service/contact/id_translate', [
diff --git a/src/OpenWork/Corp/Client.php b/src/OpenWork/Corp/Client.php
@@ -160,14 +160,14 @@ public function getManagers(string $authCorpId, string $agentId)
     /**
      * 获取登录url.
      *
-     * @param string $redirectUri
-     * @param string $scope
+     * @param string      $redirectUri
+     * @param string      $scope
      * @param string|null $state
      *
      * @return string
      * @throws \Exception
      */
-    public function getOAuthRedirectUrl(string $redirectUri = '', string $scope = 'snsapi_userinfo', string $state = null)
+    public function getOAuthRedirectUrl(string $redirectUri = '', string $scope = 'snsapi_userinfo', ?string $state = null)
     {
         $redirectUri || $redirectUri = $this->app->config['redirect_uri_oauth'];
         $state || $state = random_bytes(64);
diff --git a/src/Payment/Application.php b/src/Payment/Application.php
@@ -155,7 +155,7 @@ public function handleScannedNotify(Closure $closure)
      *
      * @return $this
      */
-    public function setSubMerchant(string $mchId, string $appId = null)
+    public function setSubMerchant(string $mchId, ?string $appId = null)
     {
         $this['config']->set('sub_mch_id', $mchId);
         $this['config']->set('sub_appid', $appId);
@@ -178,7 +178,7 @@ public function inSandbox(): bool
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      */
-    public function getKey(string $endpoint = null)
+    public function getKey(?string $endpoint = null)
     {
         if ('sandboxnew/pay/getsignkey' === $endpoint) {
             return $this['config']->key;
diff --git a/src/Work/Auth/Client.php b/src/Work/Auth/Client.php
@@ -25,15 +25,15 @@ class Client extends BaseClient
      *
      * @see https://developer.work.weixin.qq.com/document/path/91022
      *
-     * @param string $redirectUri
-     * @param string $scope
-     * @param string $agentId
+     * @param string      $redirectUri
+     * @param string      $scope
+     * @param string      $agentId
      * @param string|null $state
      *
      * @return string
      * @throws \Exception
      */
-    public function getOAuthRedirectUrl(string $redirectUri = '', string $scope = 'snsapi_privateinfo', string $agentId = '', string $state = null)
+    public function getOAuthRedirectUrl(string $redirectUri = '', string $scope = 'snsapi_privateinfo', string $agentId = '', ?string $state = null)
     {
         $redirectUri || $redirectUri = $this->app->config['redirect_uri_oauth'];
         $state || $state = random_bytes(64);
diff --git a/src/Work/ExternalContact/ContactWayClient.php b/src/Work/ExternalContact/ContactWayClient.php
@@ -99,17 +99,17 @@ public function delete(string $configId)
     /**
      * 获取企业已配置的「联系我」列表，注意，该接口仅可获取2021年7月10日以后创建的「联系我」
      *
-     * @param string $cursor 分页查询使用的游标，为上次请求返回的 next_cursor
-     * @param int $limit 每次查询的分页大小，默认为100条，最多支持1000条
+     * @param string   $cursor    分页查询使用的游标，为上次请求返回的 next_cursor
+     * @param int      $limit     每次查询的分页大小，默认为100条，最多支持1000条
      * @param int|null $startTime 「联系我」创建起始时间戳, 不传默认为90天前
-     * @param int|null $endTime 「联系我」创建结束时间戳, 不传默认为当前时间
+     * @param int|null $endTime   「联系我」创建结束时间戳, 不传默认为当前时间
      *
      * @return array|\EasyWeChat\Kernel\Support\Collection|object|\Psr\Http\Message\ResponseInterface|string
      *
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function list(string $cursor = '', int $limit = 100, int $startTime = null, int $endTime = null)
+    public function list(string $cursor = '', int $limit = 100, ?int $startTime = null, ?int $endTime = null)
     {
         $data = [
             'cursor' => $cursor,
diff --git a/src/Work/Jssdk/Client.php b/src/Work/Jssdk/Client.php
diff --git a/src/Work/MsgAudit/Client.php b/src/Work/MsgAudit/Client.php
diff --git a/src/Work/OA/Client.php b/src/Work/OA/Client.php
diff --git a/src/Work/User/Client.php b/src/Work/User/Client.php
diff --git a/src/Work/User/TagClient.php b/src/Work/User/TagClient.php
diff --git a/tests/Kernel/BaseClientTest.php b/tests/Kernel/BaseClientTest.php
diff --git a/tests/Kernel/Traits/ObservableTest.php b/tests/Kernel/Traits/ObservableTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class Client extends BaseClient`
`55`	`55`	`* @throws \Psr\SimpleCache\InvalidArgumentException`
`56`	`56`	`* @throws \GuzzleHttp\Exception\GuzzleException`
`57`	`57`	`*/`
`58`		`- public function buildConfig(array $jsApiList, bool $debug = false, bool $beta = false, bool $json = true, array $openTagList = [], string $url = null)`
	`58`	`+ public function buildConfig(array $jsApiList, bool $debug = false, bool $beta = false, bool $json = true, array $openTagList = [], ?string $url = null)`
`59`	`59`	`{`
`60`	`60`	`$config = array_merge(compact('debug', 'beta', 'jsApiList', 'openTagList'), $this->configSignature($url));`
`61`	`61`
`@@ -78,7 +78,7 @@ public function buildConfig(array $jsApiList, bool $debug = false, bool $beta =`
`78`	`78`	`* @throws \Psr\SimpleCache\InvalidArgumentException`
`79`	`79`	`* @throws \GuzzleHttp\Exception\GuzzleException`
`80`	`80`	`*/`
`81`		`- public function getConfigArray(array $apis, bool $debug = false, bool $beta = false, array $openTagList = [], string $url = null)`
	`81`	`+ public function getConfigArray(array $apis, bool $debug = false, bool $beta = false, array $openTagList = [], ?string $url = null)`
`82`	`82`	`{`
`83`	`83`	`return $this->buildConfig($apis, $debug, $beta, false, $openTagList, $url);`
`84`	`84`	`}`
`@@ -135,7 +135,7 @@ public function getTicket(bool $refresh = false, string $type = 'jsapi'): array`
`135`	`135`	`* @throws \GuzzleHttp\Exception\GuzzleException`
`136`	`136`	`* @throws \Psr\SimpleCache\InvalidArgumentException`
`137`	`137`	`*/`
`138`		`- protected function configSignature(string $url = null, string $nonce = null, $timestamp = null): array`
	`138`	`+ protected function configSignature(?string $url = null, ?string $nonce = null, $timestamp = null): array`
`139`	`139`	`{`
`140`	`140`	`$url = $url ?: $this->getUrl();`
`141`	`141`	`$nonce = $nonce ?: Support\Str::quickRandom(10);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class Encryptor`
`70`	`70`	`* @param string\|null $token`
`71`	`71`	`* @param string\|null $aesKey`
`72`	`72`	`*/`
`73`		`- public function __construct(string $appId, string $token = null, string $aesKey = null)`
	`73`	`+ public function __construct(string $appId, ?string $token = null, ?string $aesKey = null)`
`74`	`74`	`{`
`75`	`75`	`$this->appId = $appId;`
`76`	`76`	`$this->token = $token;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class HttpException extends Exception`
`38`	`38`	`* @param null $formattedResponse`
`39`	`39`	`* @param int $code`
`40`	`40`	`*/`
`41`		`- public function __construct($message, ResponseInterface $response = null, $formattedResponse = null, $code = 0)`
	`41`	`+ public function __construct($message, ?ResponseInterface $response = null, $formattedResponse = null, $code = 0)`
`42`	`42`	`{`
`43`	`43`	`parent::__construct($message, $code);`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Transfer extends Message`
`40`	`40`	`*`
`41`	`41`	`* @param string\|null $account`
`42`	`42`	`*/`
`43`		`- public function __construct(string $account = null)`
	`43`	`+ public function __construct(?string $account = null)`
`44`	`44`	`{`
`45`	`45`	`parent::__construct(compact('account'));`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class ServiceContainer extends Container`
`62`	`62`	`* @param array $prepends`
`63`	`63`	`* @param string\|null $id`
`64`	`64`	`*/`
`65`		`- public function __construct(array $config = [], array $prepends = [], string $id = null)`
	`65`	`+ public function __construct(array $config = [], array $prepends = [], ?string $id = null)`
`66`	`66`	`{`
`67`	`67`	`$this->userConfig = $config;`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public static function exists(array $array, $key)`
`134`	`134`	`*`
`135`	`135`	`* @return mixed`
`136`	`136`	`*/`
`137`		`- public static function first(array $array, callable $callback = null, $default = null)`
	`137`	`+ public static function first(array $array, ?callable $callback = null, $default = null)`
`138`	`138`	`{`
`139`	`139`	`if (is_null($callback)) {`
`140`	`140`	`if (empty($array)) {`
`@@ -164,7 +164,7 @@ public static function first(array $array, callable $callback = null, $default =`
`164`	`164`	`*`
`165`	`165`	`* @return mixed`
`166`	`166`	`*/`
`167`		`- public static function last(array $array, callable $callback = null, $default = null)`
	`167`	`+ public static function last(array $array, ?callable $callback = null, $default = null)`
`168`	`168`	`{`
`169`	`169`	`if (is_null($callback)) {`
`170`	`170`	`return empty($array) ? $default : end($array);`
`@@ -389,7 +389,7 @@ public static function pull(array &$array, $key, $default = null)`
`389`	`389`	`*`
`390`	`390`	`* @throws \InvalidArgumentException`
`391`	`391`	`*/`
`392`		`- public static function random(array $array, int $amount = null)`
	`392`	`+ public static function random(array $array, ?int $amount = null)`
`393`	`393`	`{`
`394`	`394`	`if (is_null($amount)) {`
`395`	`395`	`return $array[array_rand($array)];`
Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,12 @@ public function getHttpClient(): ClientInterface`
`104`	`104`	`/**`
`105`	`105`	`* Add a middleware.`
`106`	`106`	`*`
`107`		`- * @param callable $middleware`
`108`		`- * @param string $name`
	`107`	`+ * @param callable $middleware`
	`108`	`+ * @param string\|null $name`
`109`	`109`	`*`
`110`	`110`	`* @return $this`
`111`	`111`	`*/`
`112`		`- public function pushMiddleware(callable $middleware, string $name = null)`
	`112`	`+ public function pushMiddleware(callable $middleware, ?string $name = null)`
`113`	`113`	`{`
`114`	`114`	`if (!is_null($name)) {`
`115`	`115`	`$this->middlewares[$name] = $middleware;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function getUnlimit(string $scene, array $optional = [])`
`63`	`63`	`*`
`64`	`64`	`* @return array\|\EasyWeChat\Kernel\Support\Collection\|object\|\Psr\Http\Message\ResponseInterface\|string`
`65`	`65`	`*/`
`66`		`- public function getQrCode(string $path, int $width = null)`
	`66`	`+ public function getQrCode(string $path, ?int $width = null)`
`67`	`67`	`{`
`68`	`68`	`return $this->getStream('cgi-bin/wxaapp/createwxaqrcode', compact('path', 'width'));`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ protected function restoreMessage()`
`123`	`123`	`* @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException`
`124`	`124`	`* @throws \GuzzleHttp\Exception\GuzzleException`
`125`	`125`	`*/`
`126`		`- public function addTemplate(string $tid, array $kidList, string $sceneDesc = null)`
	`126`	`+ public function addTemplate(string $tid, array $kidList, ?string $sceneDesc = null)`
`127`	`127`	`{`
`128`	`128`	`$sceneDesc = $sceneDesc ?? '';`
`129`	`129`	`$data = \compact('tid', 'kidList', 'sceneDesc');`