Merge pull request laravel#6124 from dbwhddn10/patch-1

[4.2] Fix PHPDoc Block For Eloquent Model Find Method
JeroenDeDauw · Oct 20, 2014 · 7ef285b · 7ef285b
2 parents 2bdd744 + 9a6b775
commit 7ef285b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -633,7 +633,7 @@ public static function all($columns = array('*'))
 	 *
 	 * @param  mixed  $id
 	 * @param  array  $columns
-	 * @return \Illuminate\Support\Collection|static
+	 * @return \Illuminate\Support\Collection|static|null
 	 */
 	public static function find($id, $columns = array('*'))
 	{