Ensure that the model class name is properly set. (#36011)

laravel · Jan 23, 2021 · 72a44d3 · 72a44d3
1 parent cc03df3
commit 72a44d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -522,7 +522,7 @@ public function sole($columns = ['*'])
         try {
             return $this->baseSole($columns);
         } catch (RecordsNotFoundException $exception) {
-            throw new ModelNotFoundException($this->model);
+            throw (new ModelNotFoundException)->setModel(get_class($this->model));
         }
     }
 

diff --git a/tests/Integration/Database/EloquentWhereTest.php b/tests/Integration/Database/EloquentWhereTest.php
@@ -126,9 +126,13 @@ public function testSoleFailsForMultipleRecords()
 
     public function testSoleFailsIfNoRecords()
     {
-        $this->expectException(ModelNotFoundException::class);
+        try {
+            UserWhereTest::where('name', 'test-name')->sole();
+        } catch (ModelNotFoundException $exception) {
+            //
+        }
 
-        UserWhereTest::where('name', 'test-name')->sole();
+        $this->assertSame(UserWhereTest::class, $exception->getModel());
     }
 }