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

Merge branch 'master' of https://git.topthink.com/topteam/framework

Browse Source
This commit is contained in:
thinkphp
2018-12-20 15:36:49 +08:00
parent 29dd79b664 679f4d0368
commit 539b3bdbe9
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/Collection.php
View File

@@ -99,6 +99,16 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static(array_keys($this->items)); return new static(array_keys($this->items));
} }
/**
* 返回数组中所有的值组成的新 Collection 实例
* @access public
* @return static
*/
public function values()
{
return new static(array_values($this->items));
}
/** /**
* 合并数组并返回一个新的 Collection 实例 * 合并数组并返回一个新的 Collection 实例
* @access public * @access public
@@ -273,7 +283,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
$result = []; $result = [];
foreach ($this->items as $row) { foreach ($this->items as $row) {
$key = $value = null; $key = $value = null;
$keySet = $valueSet = false; $keySet = $valueSet = false;
if (null !== $indexKey && array_key_exists($indexKey, $row)) { if (null !== $indexKey && array_key_exists($indexKey, $row)) {
@@ -309,7 +319,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
*/ */
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) {
return $a == $b ? 0 : (($a < $b) ? -1 : 1); return $a == $b ? 0 : (($a < $b) ? -1 : 1);
}; };