Laravel 5.3.28 changes (#29)

tighten · Dec 15, 2016 · bb49526 · bb49526
1 parent 726d0cf
commit bb49526
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -649,7 +649,9 @@ public function max($callback = null)
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter()->reduce(function ($result, $item) use ($callback) {
+        return $this->filter(function ($value) {
+            return ! is_null($value);
+        })->reduce(function ($result, $item) use ($callback) {
             $value = $callback($item);
 
             return is_null($result) || $value > $result ? $value : $result;
@@ -699,7 +701,9 @@ public function min($callback = null)
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter()->reduce(function ($result, $item) use ($callback) {
+        return $this->filter(function ($value) {
+            return ! is_null($value);
+        })->reduce(function ($result, $item) use ($callback) {
             $value = $callback($item);
 
             return is_null($result) || $value < $result ? $value : $result;

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -1377,6 +1377,9 @@ public function testGettingMinItemsFromCollection()
         $c = new Collection([1, null, 3, 4, 5]);
         $this->assertEquals(1, $c->min());
 
+        $c = new Collection([0, 1, 2, 3, 4]);
+        $this->assertEquals(0, $c->min());
+
         $c = new Collection();
         $this->assertNull($c->min());
     }