simplified the callback the developer needs to create when handling errors...

simplified the callback the developer needs to create when handling errors through Application::error()

doc/usage.rst

@@ -366,25 +366,24 @@ which takes an ``Exception`` argument and returns a response::
 
     use Symfony\Component\HttpFoundation\Response;
 
-    $app->error(function (\Exception $e) {
-        return new Response('We are sorry, but something went terribly wrong.', 500);
+    $app->error(function (\Exception $e, $code) {
+        return new Response('We are sorry, but something went terribly wrong.', $code);
     });
 
-You can also check for specific errors by using ``instanceof``, and handle
-them differently::
+You can also check for specific errors by using the ``$code`` argument, and
+handle them differently::
 
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-    use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-    $app->error(function (\Exception $e) {
-        if ($e instanceof NotFoundHttpException) {
-            return new Response('The requested page could not be found.', 404);
+    $app->error(function (\Exception $e, $code) {
+        switch ($code) {
+            case 404:
+                $message = 'The requested page could not be found.';
+            default:
+                $message = 'We are sorry, but something went terribly wrong.';
         }
 
-        $code = $e instanceof HttpExceptionInterface ? $e->getStatusCode() : 500;
-
-        return new Response('We are sorry, but something went terribly wrong.', $code);
+        return new Response($message, $code);
     });
 
 If you want to set up logging you can use a separate error handler for that.

src/Silex/Application.php

@@ -20,6 +20,7 @@ use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -230,7 +231,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     {
         $this['dispatcher']->addListener(SilexEvents::ERROR, function (GetResponseForErrorEvent $event) use ($callback) {
             $exception = $event->getException();
-            $result = $callback($exception);
+            $code = $exception instanceof HttpExceptionInterface ? $exception->getStatusCode() : 500;
+
+            $result = $callback($exception, $code);
 
             if (null !== $result) {
                 $event->setStringResponse($result);

tests/Silex/Tests/ErrorHandlerTest.php

@@ -15,6 +15,7 @@ use Silex\Application;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Error handler test cases.
@@ -97,16 +98,24 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
 
-        $app->match('/foo', function () {
+        $app->match('/500', function () {
             throw new \RuntimeException('foo exception');
         });
 
-        $app->error(function ($e) {
-            return new Response('foo exception handler');
+        $app->match('/404', function () {
+            throw new NotFoundHttpException('foo exception');
         });
 
-        $request = Request::create('/foo');
-        $this->checkRouteResponse($app, '/foo', 'foo exception handler');
+        $app->error(function ($e, $code) {
+            return new Response('foo exception handler', $code);
+        });
+
+        $response = $this->checkRouteResponse($app, '/500', 'foo exception handler');
+        $this->assertEquals(500, $response->getStatusCode());
+
+        $request = Request::create('/404');
+        $response = $app->handle($request);
+        $this->assertEquals(404, $response->getStatusCode());
     }
 
     public function testMultipleErrorHandlers()
@@ -211,5 +220,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
         $request = Request::create($path, $method);
         $response = $app->handle($request);
         $this->assertEquals($expectedContent, $response->getContent(), $message);
+
+        return $response;
     }
 }