@@ -65,20 +65,16 @@ discard block |
||
65 | 65 | { |
66 | 66 | $response = Response::forge($response); |
67 | 67 | } |
68 | - } |
|
69 | - elseif ($e === false) |
|
68 | + } elseif ($e === false) |
|
70 | 69 | { |
71 | 70 | $response = Request::forge()->execute()->response(); |
72 | - } |
|
73 | - elseif ($route) |
|
71 | + } elseif ($route) |
|
74 | 72 | { |
75 | 73 | $response = Request::forge($route, false)->execute(array($e))->response(); |
76 | - } |
|
77 | - elseif ($request) |
|
74 | + } elseif ($request) |
|
78 | 75 | { |
79 | 76 | $response = Request::forge($request)->execute(array($e))->response(); |
80 | - } |
|
81 | - else |
|
77 | + } else |
|
82 | 78 | { |
83 | 79 | throw $e; |
84 | 80 | } |
@@ -94,20 +90,16 @@ discard block |
||
94 | 90 | |
95 | 91 | // ... and execute the main request |
96 | 92 | $response = $routerequest(); |
97 | -} |
|
98 | -catch (HttpBadRequestException $e) |
|
93 | +} catch (HttpBadRequestException $e) |
|
99 | 94 | { |
100 | 95 | $response = $routerequest('_400_', $e); |
101 | -} |
|
102 | -catch (HttpNoAccessException $e) |
|
96 | +} catch (HttpNoAccessException $e) |
|
103 | 97 | { |
104 | 98 | $response = $routerequest('_403_', $e); |
105 | -} |
|
106 | -catch (HttpNotFoundException $e) |
|
99 | +} catch (HttpNotFoundException $e) |
|
107 | 100 | { |
108 | 101 | $response = $routerequest('_404_', $e); |
109 | -} |
|
110 | -catch (HttpServerErrorException $e) |
|
102 | +} catch (HttpServerErrorException $e) |
|
111 | 103 | { |
112 | 104 | $response = $routerequest('_500_', $e); |
113 | 105 | } |