FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #12001 from iUtvikler/5.1 · JavaDevl/framework@0ca1ff6 · GitHub

Commit 0ca1ff6

Browse files
committed
Merge pull request laravel#12001 from iUtvikler/5.1
[5.1] Return default value from Collection::first when there is no callback
2 parents 745888d + 73824da commit 0ca1ff6

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

‎src/Illuminate/Support/Collection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public function whereLoose($key, $value)
243243
public function first(callable $callback = null, $default = null)
244244
{
245245
if (is_null($callback)) {
246-
return count($this->items) > 0 ? reset($this->items) : null;
246+
return count($this->items) > 0 ? reset($this->items) : value($default);
247247
}
248248

249249
return Arr::first($this->items, $callback, $default);

‎tests/Support/SupportCollectionTest.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ public function testLastWithCallbackAndDefault()
3434
$this->assertEquals('default', $result);
3535
}
3636

37+
public function testLastWithDefaultAndWithoutCallback()
38+
{
39+
$data = new Collection;
40+
$result = $data->last(null, 'default');
41+
$this->assertEquals('default', $result);
42+
}
43+
3744
public function testPopReturnsAndRemovesLastItemInCollection()
3845
{
3946
$c = new Collection(['foo', 'bar']);
@@ -688,6 +695,13 @@ public function testFirstWithCallbackAndDefault()
688695
$this->assertEquals('default', $result);
689696
}
690697

698+
public function testFirstWithDefaultAndWithoutCallback()
699+
{
700+
$data = new Collection;
701+
$result = $data->first(null, 'default');
702+
$this->assertEquals('default', $result);
703+
}
704+
691705
public function testGroupByAttribute()
692706
{
693707
$data = new Collection([['rating' => 1, 'url' => '1'], ['rating' => 1, 'url' => '1'], ['rating' => 2, 'url' => '2']]);

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL