Check if collection is empty and prevent exception.

mathieutu · Jun 19, 2017 · 0d58b25 · 0d58b25
1 parent 7cd6ae2
commit 0d58b25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -146,6 +146,10 @@ public function map(callable $callback)
      */
     public function fresh($with = [])
     {
+        if ($this->isEmpty()) {
+            return new static;
+        }
+
         $model = $this->first();
 
         $freshModels = $model->newQueryWithoutScopes()

diff --git a/tests/Database/DatabaseEloquentCollectionTest.php b/tests/Database/DatabaseEloquentCollectionTest.php
@@ -357,6 +357,13 @@ public function testQueueableCollectionImplementationThrowsExceptionOnMultipleMo
         $c = new Collection([new TestEloquentCollectionModel, (object) ['id' => 'something']]);
         $c->getQueueableClass();
     }
+
+    public function testEmptyCollectionStayEmptyOnFresh()
+    {
+        $c = new Collection();
+        $this->assertEquals($c, $c->fresh());
+
+    }
 }
 
 class TestEloquentCollectionModel extends \Illuminate\Database\Eloquent\Model