feature #1088 Allow global after middlewares to return responses like route...

feature #1088 Allow global after middlewares to return responses like route specific ones (naderman)

This PR was merged into the 1.2 branch.

Discussion
----------

Allow global after middlewares to return responses like route specific ones

Handling responses returned from after middlewares is already implemented in the middleware event listener, but was missing from the application's after method. https://github.com/naderman/Silex/blob/1.2/src/Silex/EventListener/MiddlewareListener.php#L79

Commits
-------

d2b59062 Allow global after middlewares to return responses like route specific ones

src/Silex/Application.php

@@ -339,7 +339,12 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
                 return;
             }
 
-            call_user_func($app['callback_resolver']->resolveCallback($callback), $event->getRequest(), $event->getResponse(), $app);
+            $response = call_user_func($app['callback_resolver']->resolveCallback($callback), $event->getRequest(), $event->getResponse(), $app);
+            if ($response instanceof Response) {
+                $event->setResponse($response);
+            } elseif (null !== $response) {
+                throw new \RuntimeException('An after middleware returned an invalid response value. Must return null or an instance of Response.');
+            }
         }, $priority);
     }
 

tests/Silex/Tests/MiddlewareTest.php

@@ -234,6 +234,20 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo---', $app->handle($request)->getContent());
     }
 
+    public function testAfterFilterCanReturnResponse()
+    {
+        $app = new Application();
+
+        $app->after(function (Request $request, Response $response) {
+            return new Response('bar');
+        });
+
+        $app->match('/', function () { return new Response('foo'); });
+
+        $request = Request::create('/');
+        $this->assertEquals('bar', $app->handle($request)->getContent());
+    }
+
     public function testRouteAndApplicationMiddlewareParameterInjection()
     {
         $app = new Application();