tweak conditions

laravel · Jun 1, 2017 · 1229b7f · 1229b7f
1 parent df341e0
commit 1229b7f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -619,10 +619,12 @@ protected function sortMiddleware(Collection $middlewares)
      */
     public static function prepareResponse($request, $response)
     {
+        if ($response instanceof Responsable) {
+            $response = $response->toResponse();
+        }
+
         if ($response instanceof PsrResponseInterface) {
             $response = (new HttpFoundationFactory)->createResponse($response);
-        } elseif ($response instanceof Responsable) {
-            $response = $response->toResponse();
         } elseif (! $response instanceof SymfonyResponse &&
                    ($response instanceof Arrayable ||
                     $response instanceof Jsonable ||