Integrate Whoops into the core of the framework error handling.

composer.json

@@ -13,9 +13,10 @@
         "php": ">=5.3.7",
         "classpreloader/classpreloader": "1.0.*",
         "ircmaxell/password-compat": "1.0.*",
+        "filp/whoops": "1.0.0",
         "monolog/monolog": "1.4.*",
         "patchwork/utf8": "1.0.*",
-        "predis/predis": "0.*",
+        "predis/predis": "0.8.*",
         "swiftmailer/swiftmailer": "4.3.*",
         "symfony/browser-kit": "2.3.*",
         "symfony/console": "2.3.*",

src/Illuminate/Exception/ExceptionServiceProvider.php

@@ -1,7 +1,10 @@
 <?php namespace Illuminate\Exception;
 
 use Closure;
+use Whoops\Handler\PrettyPageHandler;
+use Whoops\Handler\JsonResponseHandler;
 use Illuminate\Support\ServiceProvider;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\ErrorHandler;
 use Symfony\Component\HttpKernel\Debug\ExceptionHandler as KernelHandler;
 
@@ -43,6 +46,8 @@ public function register()
 		});
 
 		$this->registerExceptionHandler();
+
+		$this->registerWhoops();
 	}
 
 	/**
@@ -72,11 +77,11 @@ protected function registerKernelHandlers()
 	 */
 	protected function registerExceptionHandler()
 	{
-		$app = $this->app;
+		list($me, $app) = array($this, $this->app);
 
-		$app['exception.function'] = function() use ($app)
+		$app['exception.function'] = function() use ($me, $app)
 		{
-			return function($exception) use ($app)
+			return function($exception) use ($me, $app)
 			{
 				$response = $app['exception']->handle($exception);
 
@@ -91,7 +96,7 @@ protected function registerExceptionHandler()
 				}
 				else
 				{
-					$app['kernel.exception']->handle($exception);
+					$me->displayException($exception);
 				}
 			};
 		};
@@ -114,6 +119,76 @@ protected function registerShutdownHandler()
 		});
 	}
 
+	/**
+	 * Register the Whoops error display service.
+	 *
+	 * @return void
+	 */
+	protected function registerWhoops()
+	{
+		$this->registerWhoopsHandler();
+
+		$this->app['whoops'] = $this->app->share(function($app)
+		{
+			$whoops = new \Whoops\Run;
+
+			$whoops->allowQuit(false);
+
+			return $whoops->pushHandler($app['whoops.handler']);
+		});
+	}
+
+	/**
+	 * Register the Whoops handler for the request.
+	 *
+	 * @return void
+	 */
+	protected function registerWhoopsHandler()
+	{
+		if ($this->app['request']->ajax() or $this->app->runningInConsole())
+		{
+			$this->app['whoops.handler'] = function() { return new JsonResponseHandler; };
+		}
+		else
+		{
+			$this->app['whoops.handler'] = function()
+			{
+				with($handler = new PrettyPageHandler)->setResourcesPath(__DIR__.'/resources');
+
+				return $handler;
+			};
+		}
+	}
+
+	/**
+	 * Display the given exception.
+	 *
+	 * @param  \Exception  $exception
+	 * @return void
+	 */
+	public function displayException($exception)
+	{
+		if ($this->app['config']['app.debug'])
+		{
+			return $this->displayWhoopsException($exception);
+		}
+
+		$this->app['kernel.exception']->handle($exception);
+	}
+
+	/**
+	 * Display a exception using the Whoops library.
+	 *
+	 * @param  \Exception  $exception
+	 * @return void
+	 */
+	protected function displayWhoopsException($exception)
+	{
+		ob_start(); $this->app['whoops']->handleException($exception);
+
+		with(new Response(ob_get_clean(), 500))->send();
+	}
+
 	/**
 	 * Set the given Closure as the exception handler.
 	 *

src/Illuminate/Exception/composer.json

@@ -10,6 +10,7 @@
     "require": {
         "php": ">=5.3.0",
         "illuminate/support": "4.0.x",
+        "symfony/http-foundation": "2.3.x",
         "symfony/http-kernel": "2.3.*"
     },
     "require-dev": {