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

改进分页类和数据集类的each方法

Browse Source
This commit is contained in:
thinkphp
2017-09-05 15:12:51 +08:00
parent 495020b7b0
commit b115680a4d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Collection.php
View File

@@ -189,8 +189,11 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
public function each(callable $callback) public function each(callable $callback)
{ {
foreach ($this->items as $key => $item) { foreach ($this->items as $key => $item) {
if ($callback($item, $key) === false) { $result = $callback($item, $key);
if (false === $result) {
break; break;
} elseif (!is_object($item)) {
$this->items[$key] = $result;
} }
} }

5
library/think/Paginator.php
View File

@@ -288,8 +288,11 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
public function each(callable $callback) public function each(callable $callback)
{ {
foreach ($this->items as $key => $item) { foreach ($this->items as $key => $item) {
if ($callback($item, $key) === false) { $result = $callback($item, $key);
if (false === $result) {
break; break;
} elseif (!is_object($item)) {
$this->items[$key] = $result;
} }
} }