From 442c5eea031f4bfdcbe1de790a9f383e1314dcec Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Fri, 19 Oct 2018 06:35:29 +0200 Subject: [PATCH] Improve findOrFail() exceptions (#26182) --- src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php | 2 +- src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php | 2 +- .../Database/DatabaseEloquentHasManyThroughIntegrationTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php index fc1e3a053f44..5f4828af2d37 100755 --- a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php +++ b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php @@ -514,7 +514,7 @@ public function findOrFail($id, $columns = ['*']) return $result; } - throw (new ModelNotFoundException)->setModel(get_class($this->related)); + throw (new ModelNotFoundException)->setModel(get_class($this->related), $id); } /** diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php index e1ecb1206c69..4ac8a3713e0c 100644 --- a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php +++ b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php @@ -331,7 +331,7 @@ public function findOrFail($id, $columns = ['*']) return $result; } - throw (new ModelNotFoundException)->setModel(get_class($this->related)); + throw (new ModelNotFoundException)->setModel(get_class($this->related), $id); } /** diff --git a/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php b/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php index 65174d4cd37a..966cf136d299 100644 --- a/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php +++ b/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php @@ -132,7 +132,7 @@ public function testFirstOrFailThrowsAnException() /** * @expectedException \Illuminate\Database\Eloquent\ModelNotFoundException - * @expectedExceptionMessage No query results for model [Illuminate\Tests\Database\HasManyThroughTestPost]. + * @expectedExceptionMessage No query results for model [Illuminate\Tests\Database\HasManyThroughTestPost] 1 */ public function testFindOrFailThrowsAnException() {