@@ -24,6 +24,9 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | + /** |
|
| 28 | + * @param string $param |
|
| 29 | + */ |
|
| 27 | 30 | private function getParamFromArrayIfSet($array, $param, $default = null) |
| 28 | 31 | { |
| 29 | 32 | if(isset($array[$param])) |
@@ -52,6 +55,9 @@ discard block |
||
| 52 | 55 | return $response; |
| 53 | 56 | } |
| 54 | 57 | |
| 58 | + /** |
|
| 59 | + * @param string $serializer |
|
| 60 | + */ |
|
| 55 | 61 | protected function reserializeBody($response, $serializer) |
| 56 | 62 | { |
| 57 | 63 | $body = $response->getBody(); |
@@ -13,5 +13,5 @@ |
||
| 13 | 13 | ->withStatus(500) |
| 14 | 14 | ->withHeader('Content-Type', 'text/html') |
| 15 | 15 | ->write(print_r($exception, true)); |
| 16 | - } |
|
| 16 | + } |
|
| 17 | 17 | } |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | { |
| 13 | 13 | parent::__construct(); |
| 14 | 14 | $c = $this->getContainer(); |
| 15 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
| 15 | + $c['errorHandler'] = function($c) { return new WebErrorHandler(); }; |
|
| 16 | 16 | $this->add(new AuthMiddleware()); |
| 17 | 17 | $this->add(new ODataMiddleware()); |
| 18 | 18 | } |
@@ -24,6 +24,6 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function registerAPI($uri, $api) |
| 26 | 26 | { |
| 27 | - $this->group($uri, function() use($api) {$api->setup($this);})->add(new \Http\Rest\SerializationMiddleware()); |
|
| 27 | + $this->group($uri, function() use($api) {$api->setup($this); })->add(new \Http\Rest\SerializationMiddleware()); |
|
| 28 | 28 | } |
| 29 | 29 | } |
@@ -12,7 +12,9 @@ discard block |
||
| 12 | 12 | { |
| 13 | 13 | parent::__construct(); |
| 14 | 14 | $c = $this->getContainer(); |
| 15 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
| 15 | + $c['errorHandler'] = function($c) |
|
| 16 | + { |
|
| 17 | +return new WebErrorHandler();}; |
|
| 16 | 18 | $this->add(new AuthMiddleware()); |
| 17 | 19 | $this->add(new ODataMiddleware()); |
| 18 | 20 | } |
@@ -24,6 +26,8 @@ discard block |
||
| 24 | 26 | |
| 25 | 27 | public function registerAPI($uri, $api) |
| 26 | 28 | { |
| 27 | - $this->group($uri, function() use($api) {$api->setup($this);})->add(new \Http\Rest\SerializationMiddleware()); |
|
| 29 | + $this->group($uri, function() use($api) |
|
| 30 | + { |
|
| 31 | +$api->setup($this);})->add(new \Http\Rest\SerializationMiddleware()); |
|
| 28 | 32 | } |
| 29 | 33 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 92 | 92 | $params = $this->manipulateParameters($request, $odata); |
| 93 | 93 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
| 94 | - $odata->skip, $odata->orderby, $params); |
|
| 94 | + $odata->skip, $odata->orderby, $params); |
|
| 95 | 95 | if($areas === false) |
| 96 | 96 | { |
| 97 | 97 | $areas = array(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 134 | 134 | $filter = $this->getFilterForPrimaryKey($args['name']); |
| 135 | 135 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
| 136 | - $odata->skip, $odata->orderby); |
|
| 136 | + $odata->skip, $odata->orderby); |
|
| 137 | 137 | if(empty($areas)) |
| 138 | 138 | { |
| 139 | 139 | return $response->withStatus(404); |