tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 07:59:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG Consistent return values for first and last methods

Browse Source
This commit is contained in:
Saophalkun Ponlu 2017-06-02 16:04:54 +12:00
parent 44f27645bd
commit e267d29b9a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ORM/ArrayList.php
View File

@ -302,6 +302,10 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
*/ */
public function first() public function first()
{ {
if (empty($this->items)) {
return null;
}
return reset($this->items); return reset($this->items);
} }
@ -312,6 +316,10 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
*/ */
public function last() public function last()
{ {
if (empty($this->items)) {
return null;
}
return end($this->items); return end($this->items);
} }
@ -514,12 +522,12 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
*/ */
public function canFilterBy($by) public function canFilterBy($by)
{ {
$firstRecord = $this->first(); if (empty($this->items)) {
if ($firstRecord === false) {
return false; return false;
} }
$firstRecord = $this->first();
return array_key_exists($by, $firstRecord); return array_key_exists($by, $firstRecord);
} }