Improve findOrFail() exceptions (#26182)

laravel · Oct 19, 2018 · 442c5ee · 442c5ee
1 parent 20fca27
commit 442c5ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
         }
         /**
@@ Expand Down @@