[8.x] Preserve eloquent collection type after calling ->fresh() (#34848)

* Preserve eloquent collection class type after calling ->fresh() * Re-order imports * Update ->fresh() to filter out non-existant models * Fix ->fresh() test
laravel · Oct 16, 2020 · 914a203 · 914a203
1 parent 3e4f5f4
commit 914a203
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -300,9 +300,11 @@ public function fresh($with = [])
             ->get()
             ->getDictionary();
 
-        return $this->map(function ($model) use ($freshModels) {
-            return $model->exists && isset($freshModels[$model->getKey()])
-                    ? $freshModels[$model->getKey()] : null;
+        return $this->filter(function ($model) use ($freshModels) {
+            return $model->exists && isset($freshModels[$model->getKey()]);
+        })
+        ->map(function ($model) use ($freshModels) {
+            return $freshModels[$model->getKey()];
         });
     }
 

diff --git a/tests/Database/DatabaseEloquentIntegrationTest.php b/tests/Database/DatabaseEloquentIntegrationTest.php
@@ -1340,10 +1340,15 @@ public function testFreshMethodOnCollection()
         EloquentTestUser::find(1)->update(['name' => 'Mathieu TUDISCO']);
         EloquentTestUser::find(2)->update(['email' => 'dev@mathieutu.ovh']);
 
-        $this->assertEquals($users->map->fresh(), $users->fresh());
+        $this->assertCount(3, $users);
+        $this->assertNotEquals('Mathieu TUDISCO', $users[0]->name);
+        $this->assertNotEquals('dev@mathieutu.ovh', $users[1]->email);
 
-        $users = new Collection;
-        $this->assertEquals($users->map->fresh(), $users->fresh());
+        $refreshedUsers = $users->fresh();
+
+        $this->assertCount(2, $refreshedUsers);
+        $this->assertEquals('Mathieu TUDISCO', $refreshedUsers[0]->name);
+        $this->assertEquals('dev@mathieutu.ovh', $refreshedUsers[1]->email);
     }
 
     public function testTimestampsUsingDefaultDateFormat()

diff --git a/tests/Integration/Database/EloquentCollectionFreshTest.php b/tests/Integration/Database/EloquentCollectionFreshTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Integration\Database;
 
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Tests\Integration\Database\Fixtures\User;
@@ -30,8 +31,11 @@ public function testEloquentCollectionFresh()
 
         $collection = User::all();
 
-        User::whereKey($collection->pluck('id')->toArray())->delete();
+        $collection->first()->delete();
 
-        $this->assertEmpty($collection->fresh()->filter());
+        $freshCollection = $collection->fresh();
+
+        $this->assertCount(1, $freshCollection);
+        $this->assertInstanceOf(EloquentCollection::class, $freshCollection);
     }
 }