mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化PHP8.4兼容性

Browse Source
This commit is contained in:
Karson
2025-06-17 11:27:15 +08:00
parent bf57bdb9e1
commit 0216ba5027
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Collection.php
View File

@@ -263,7 +263,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
* @param callable|null $callback 回调函数 * @param callable|null $callback 回调函数
* @return static * @return static
*/ */
public function filter(callable $callback = null) public function filter(?callable $callback = null)
{ {
return new static(array_filter($this->items, $callback ?: null)); return new static(array_filter($this->items, $callback ?: null));
} }
@@ -317,7 +317,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
* @param callable|null $callback 回调函数 * @param callable|null $callback 回调函数
* @return static * @return static
*/ */
public function sort(callable $callback = null) public function sort(?callable $callback = null)
{ {
$items = $this->items; $items = $this->items;
$callback = $callback ?: function ($a, $b) { $callback = $callback ?: function ($a, $b) {

2
library/think/Controller.php
View File

@@ -50,7 +50,7 @@ class Controller
* @access public * @access public
* @param Request $request Request 对象 * @param Request $request Request 对象
*/ */
public function __construct(Request $request = null) public function __construct(?Request $request = null)
{ {
$this->view = View::instance(Config::get('template'), Config::get('view_replace_str')); $this->view = View::instance(Config::get('template'), Config::get('view_replace_str'));
$this->request = is_null($request) ? Request::instance() : $request; $this->request = is_null($request) ? Request::instance() : $request;

2
library/think/exception/HttpException.php
View File

@@ -16,7 +16,7 @@ class HttpException extends \RuntimeException
private $statusCode; private $statusCode;
private $headers; private $headers;
public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = [], $code = 0) public function __construct($statusCode, $message = null, ?\Exception $previous = null, array $headers = [], $code = 0)
{ {
$this->statusCode = $statusCode; $this->statusCode = $statusCode;
$this->headers = $headers; $this->headers = $headers;