Merge pull request laravel#1711 from torm3nt/master

taylorotwell · taylorotwell · commit 7fe61b74d60f · 2013-03-28T14:28:04.000-07:00
Event firing of 500s now passes along the $exception object
diff --git a/application/routes.php b/application/routes.php
@@ -48,7 +48,8 @@
 |
 | Similarly, we use an event to handle the display of 500 level errors
 | within the application. These errors are fired when there is an
-| uncaught exception thrown in the application.
+| uncaught exception thrown in the application. The exception object
+| that is captured during execution is then passed to the 500 listener.
 |
 */
 
@@ -57,7 +58,7 @@
 	return Response::error('404');
 });
 
-Event::listen('500', function()
+Event::listen('500', function($exception)
 {
 	return Response::error('500');
 });
diff --git a/laravel/error.php b/laravel/error.php
@@ -54,7 +54,7 @@ public static function exception($exception, $trace = true)
 		// Using events gives the developer more freedom.
 		else
 		{
-			$response = Event::first('500');
+			$response = Event::first('500', $exception);
 
 			$response = Response::prepare($response);
 		}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@`
`48`	`48`	`\|`
`49`	`49`	`\| Similarly, we use an event to handle the display of 500 level errors`
`50`	`50`	`\| within the application. These errors are fired when there is an`
`51`		`-\| uncaught exception thrown in the application.`
	`51`	`+\| uncaught exception thrown in the application. The exception object`
	`52`	`+\| that is captured during execution is then passed to the 500 listener.`
`52`	`53`	`\|`
`53`	`54`	`*/`
`54`	`55`
`@@ -57,7 +58,7 @@`
`57`	`58`	`return Response::error('404');`
`58`	`59`	`});`
`59`	`60`
`60`		`-Event::listen('500', function()`
	`61`	`+Event::listen('500', function($exception)`
`61`	`62`	`{`
`62`	`63`	`return Response::error('500');`
`63`	`64`	`});`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static function exception($exception, $trace = true)`
`54`	`54`	`// Using events gives the developer more freedom.`
`55`	`55`	`else`
`56`	`56`	`{`
`57`		`- $response = Event::first('500');`
	`57`	`+ $response = Event::first('500', $exception);`
`58`	`58`
`59`	`59`	`$response = Response::prepare($response);`
`60`	`60`	`}`