Merge branch 'master' of gitee.com:fastadminnet/framework

2026-07-01 12:42:48 +08:00 · 2024-03-26 17:19:29 +08:00
parent 1a609a99c6 2156891a69
commit 3883e15817
15 changed files with 35 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /vendor
 .idea
 .DS_Store
+/.vscode
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ ThinkPHP遵循Apache2开源协议发布，并提供免费使用。

 本项目包含的第三方源码和二进制文件之版权信息另行标注。

-版权所有Copyright © 2006-2022 by ThinkPHP (http://thinkphp.cn)
+版权所有Copyright © 2006-2024 by ThinkPHP (http://thinkphp.cn)

 All rights reserved。

--- a/base.php
+++ b/base.php
@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------

-define('THINK_VERSION', '5.0.25');
+define('THINK_VERSION', '5.0.26');
 define('THINK_START_TIME', microtime(true));
 define('THINK_START_MEM', memory_get_usage());
 define('EXT', '.php');
--- a/library/think/Collection.php
+++ b/library/think/Collection.php
@@ -360,6 +360,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @param  mixed $offset 键名
     * @return bool
     */
+    #[\ReturnTypeWillChange]
    public function offsetExists($offset)
    {
        return array_key_exists($offset, $this->items);
@@ -371,6 +372,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @param  mixed $offset 键名
     * @return mixed
     */
+    #[\ReturnTypeWillChange]
    public function offsetGet($offset)
    {
        return $this->items[$offset];
@@ -383,6 +385,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @param  mixed $value  值
     * @return void
     */
+    #[\ReturnTypeWillChange]
    public function offsetSet($offset, $value)
    {
        if (is_null($offset)) {
@@ -398,6 +401,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @param  mixed $offset 键名
     * @return void
     */
+    #[\ReturnTypeWillChange]
    public function offsetUnset($offset)
    {
        unset($this->items[$offset]);
@@ -408,6 +412,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @access public
     * @return int
     */
+    #[\ReturnTypeWillChange]
    public function count()
    {
        return count($this->items);
@@ -418,6 +423,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @access public
     * @return ArrayIterator
     */
+    #[\ReturnTypeWillChange]
    public function getIterator()
    {
        return new ArrayIterator($this->items);
@@ -428,6 +434,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
     * @access public
     * @return array
     */
+    #[\ReturnTypeWillChange]
    public function jsonSerialize()
    {
        return $this->toArray();
--- 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);
        }
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -2276,27 +2276,32 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
    }

    // JsonSerializable
+    #[\ReturnTypeWillChange]
    public function jsonSerialize()
    {
        return $this->toArray();
    }

    // ArrayAccess
+    #[\ReturnTypeWillChange]
    public function offsetSet($name, $value)
    {
        $this->setAttr($name, $value);
    }

+    #[\ReturnTypeWillChange]
    public function offsetExists($name)
    {
        return $this->__isset($name);
    }

+    #[\ReturnTypeWillChange]
    public function offsetUnset($name)
    {
        $this->__unset($name);
    }

+    #[\ReturnTypeWillChange]
    public function offsetGet($name)
    {
        return $this->getAttr($name);
--- a/library/think/Paginator.php
+++ b/library/think/Paginator.php
@@ -128,7 +128,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
        }
        $url = $path;
        if (!empty($parameters)) {
-            $url .= '?' . http_build_query($parameters, null, '&');
+            $url .= '?' . http_build_query($parameters, '', '&');
        }
        return $url . $this->buildFragment();
    }
@@ -304,6 +304,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
     * @return Traversable An instance of an object implementing <b>Iterator</b> or
     * <b>Traversable</b>
     */
+    #[\ReturnTypeWillChange]
    public function getIterator()
    {
        return new ArrayIterator($this->items->all());
@@ -314,6 +315,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
     * @param mixed $offset
     * @return bool
     */
+    #[\ReturnTypeWillChange]
    public function offsetExists($offset)
    {
        return $this->items->offsetExists($offset);
@@ -324,6 +326,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
     * @param mixed $offset
     * @return mixed
     */
+    #[\ReturnTypeWillChange]
    public function offsetGet($offset)
    {
        return $this->items->offsetGet($offset);
@@ -334,6 +337,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
     * @param mixed $offset
     * @param mixed $value
     */
+    #[\ReturnTypeWillChange]
    public function offsetSet($offset, $value)
    {
        $this->items->offsetSet($offset, $value);
@@ -345,6 +349,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
     * @return void
     * @since 5.0.0
     */
+    #[\ReturnTypeWillChange]
    public function offsetUnset($offset)
    {
        $this->items->offsetUnset($offset);
@@ -353,6 +358,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
    /**
     * Count elements of an object
     */
+    #[\ReturnTypeWillChange]
    public function count()
    {
        return $this->items->count();
@@ -388,6 +394,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
    /**
     * Specify data which should be serialized to JSON
     */
+    #[\ReturnTypeWillChange]
    public function jsonSerialize()
    {
        return $this->toArray();
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1091,7 +1091,7 @@ class Request
        foreach ($filters as $filter) {
            if (is_callable($filter)) {
                // 调用函数或者方法过滤
-                $value = call_user_func($filter, $value);
+                $value = call_user_func($filter, $value ?? '');
            } elseif (is_scalar($value)) {
                if (false !== strpos($filter, '/')) {
                    // 正则过滤
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -925,11 +925,11 @@ class Template
                                    $args[1] = str_replace('###', $name, $args[1]);
                                    $name    = "$fun($args[1])";
                                } else {
-                                    $name = "$fun($name,$args[1])";
+                                    $name = "$fun($name ?? '',$args[1])";
                                }
                            } else {
                                if (!empty($args[0])) {
-                                    $name = "$fun($name)";
+                                    $name = "$fun($name ?? '')";
                                }
                            }
                        }
--- 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);
    }
--- a/library/think/console/output/Ask.php
+++ b/library/think/console/output/Ask.php
@@ -299,7 +299,7 @@ class Ask
            $width = max(array_map('strlen', array_keys($this->question->getChoices())));

            foreach ($this->question->getChoices() as $key => $value) {
-                $this->output->writeln(sprintf("  [<comment>%-${width}s</comment>] %s", $key, $value));
+                $this->output->writeln(sprintf("  [<comment>%-{$width}s</comment>] %s", $key, $value));
            }
        }

--- a/library/think/console/output/Descriptor.php
+++ b/library/think/console/output/Descriptor.php
@@ -219,7 +219,7 @@ class Descriptor
            $width = $this->getColumnWidth($description->getCommands());

            foreach ($description->getCommands() as $command) {
-                $this->writeText(sprintf("%-${width}s %s", $command->getName(), $command->getDescription()), $options);
+                $this->writeText(sprintf("%-{$width}s %s", $command->getName(), $command->getDescription()), $options);
                $this->writeText("\n");
            }
        } else {
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -480,6 +480,7 @@ class Query
            $result = Cache::get($guid);
        }
        if (false === $result) {
+            $result = [];
            if (isset($this->options['field'])) {
                unset($this->options['field']);
            }
--- a/library/think/model/relation/HasMany.php
+++ b/library/think/model/relation/HasMany.php
@@ -164,7 +164,7 @@ class HasMany extends Relation
            }
        }
        $localKey = $this->localKey ?: $this->parent->getPk();
-        return $this->query->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $localKey)->fetchSql()->count();
+        return $this->query->alias( 'count_table')->whereExp( 'count_table.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $localKey)->fetchSql()->count();
    }

    /**
--- a/library/traits/controller/Jump.php
+++ b/library/traits/controller/Jump.php
@@ -38,8 +38,8 @@ trait Jump
    {
        if (is_null($url) && !is_null(Request::instance()->server('HTTP_REFERER'))) {
            $url = Request::instance()->server('HTTP_REFERER');
-        } elseif ('' !== $url && !strpos($url, '://') && 0 !== strpos($url, '/')) {
-            $url = Url::build($url);
+        } elseif ('' !== $url && !strpos($url ?? '', '://') && 0 !== strpos($url ?? '', '/')) {
+            $url = Url::build($url ?? '');
        }

        $type = $this->getResponseType();