Fix for fresh on empty Collection (#19651)

laravel · Jun 18, 2017 · 3a20ea2 · 3a20ea2
1 parent 124213e
commit 3a20ea2
Show file tree

Hide file tree

Showing 2 changed files with 8 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/DatabaseEloquentIntegrationTest.php b/tests/Database/DatabaseEloquentIntegrationTest.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use PHPUnit\Framework\TestCase;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\Model as Eloquent;
@@ -1109,6 +1110,9 @@ public function testFreshMethodOnCollection()
         EloquentTestUser::find(2)->update(['email' => 'dev@mathieutu.ovh']);
 
         $this->assertEquals($users->map->fresh(), $users->fresh());
+
+        $users = new Collection();
+        $this->assertEquals($users->map->fresh(), $users->fresh());
     }
 
     /**