@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | \Psr\Log\LogLevel::WARNING, |
| 13 | 13 | \Psr\Log\LogLevel::NOTICE); |
| 14 | 14 | |
| 15 | - public function __construct($params=false) |
|
| 15 | + public function __construct($params = false) |
|
| 16 | 16 | { |
| 17 | 17 | if(isset($params['defaultLogLevels'])) |
| 18 | 18 | { |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | // build a replacement array with braces around the context keys |
| 29 | 29 | $replace = array(); |
| 30 | - foreach ($context as $key => $val) { |
|
| 30 | + foreach($context as $key => $val) { |
|
| 31 | 31 | // check that the value can be casted to string |
| 32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
| 33 | - $replace['{' . $key . '}'] = $val; |
|
| 32 | + if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
| 33 | + $replace['{'.$key.'}'] = $val; |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -27,9 +27,11 @@ |
||
| 27 | 27 | { |
| 28 | 28 | // build a replacement array with braces around the context keys |
| 29 | 29 | $replace = array(); |
| 30 | - foreach ($context as $key => $val) { |
|
| 30 | + foreach ($context as $key => $val) |
|
| 31 | + { |
|
| 31 | 32 | // check that the value can be casted to string |
| 32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
| 33 | + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) |
|
| 34 | + { |
|
| 33 | 35 | $replace['{' . $key . '}'] = $val; |
| 34 | 36 | } |
| 35 | 37 | } |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | class PHPLog extends \Log\LogService |
| 5 | 5 | { |
| 6 | - public function __construct($params=false) |
|
| 6 | + public function __construct($params = false) |
|
| 7 | 7 | { |
| 8 | 8 | parent::__construct($params); |
| 9 | 9 | } |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * This cron script recompiles the Browscap cache |
| 16 | 16 | */ |
| 17 | -ini_set('memory_limit','-1'); // turn off memory limit for this script |
|
| 18 | -set_time_limit(120); // change to 2 minutes for this script |
|
| 17 | +ini_set('memory_limit', '-1'); // turn off memory limit for this script |
|
| 18 | +set_time_limit(120); // change to 2 minutes for this script |
|
| 19 | 19 | |
| 20 | 20 | require('vendor/autoload.php'); |
| 21 | 21 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | return $this->dataTable->create($data); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false) |
|
| 37 | + public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
|
| 38 | 38 | { |
| 39 | 39 | $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params); |
| 40 | 40 | if($res === false) |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | return $dataTable->delete($filter); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - public function count($filter=false) |
|
| 74 | + public function count($filter = false) |
|
| 75 | 75 | { |
| 76 | 76 | return parent::count($filter); |
| 77 | 77 | } |
@@ -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(); |
@@ -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); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]); |
| 14 | 14 | parent::__construct($settings); |
| 15 | 15 | $c = $this->getContainer(); |
| 16 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
| 16 | + $c['errorHandler'] = function($c) { return new WebErrorHandler(); }; |
|
| 17 | 17 | $this->add(new AuthMiddleware()); |
| 18 | 18 | $this->add(new ODataMiddleware()); |
| 19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function registerAPI($uri, $api) |
| 27 | 27 | { |
| 28 | - $group = $this->group($uri, function() use($api){$api->setup($this);}); |
|
| 28 | + $group = $this->group($uri, function() use($api){$api->setup($this); }); |
|
| 29 | 29 | $group->add(new \Http\Rest\SerializationMiddleware()); |
| 30 | 30 | $group->add(new \Http\Rest\CORSMiddleware($this->getContainer())); |
| 31 | 31 | } |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]); |
| 14 | 14 | parent::__construct($settings); |
| 15 | 15 | $c = $this->getContainer(); |
| 16 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
| 16 | + $c['errorHandler'] = function($c) |
|
| 17 | + { |
|
| 18 | +return new WebErrorHandler();}; |
|
| 17 | 19 | $this->add(new AuthMiddleware()); |
| 18 | 20 | $this->add(new ODataMiddleware()); |
| 19 | 21 | } |
@@ -25,7 +27,9 @@ discard block |
||
| 25 | 27 | |
| 26 | 28 | public function registerAPI($uri, $api) |
| 27 | 29 | { |
| 28 | - $group = $this->group($uri, function() use($api){$api->setup($this);}); |
|
| 30 | + $group = $this->group($uri, function() use($api) |
|
| 31 | + { |
|
| 32 | +$api->setup($this);}); |
|
| 29 | 33 | $group->add(new \Http\Rest\SerializationMiddleware()); |
| 30 | 34 | $group->add(new \Http\Rest\CORSMiddleware($this->getContainer())); |
| 31 | 35 | } |
@@ -13,5 +13,5 @@ |
||
| 13 | 13 | ->withStatus(500) |
| 14 | 14 | ->withHeader('Content-Type', 'text/html') |
| 15 | 15 | ->write($exception->__toString()); |
| 16 | - } |
|
| 16 | + } |
|
| 17 | 17 | } |
@@ -42,10 +42,13 @@ discard block |
||
| 42 | 42 | $args = array(); |
| 43 | 43 | $args['RawMessage'] = array(); |
| 44 | 44 | $args['RawMessage']['Data'] = $email->getRawMessage(); |
| 45 | - try { |
|
| 45 | + try |
|
| 46 | + { |
|
| 46 | 47 | $res = $this->ses->sendRawEmail($args); |
| 47 | 48 | return $res; |
| 48 | - } catch(\Exception $e) { |
|
| 49 | + } |
|
| 50 | + catch(\Exception $e) |
|
| 51 | + { |
|
| 49 | 52 | return false; |
| 50 | 53 | } |
| 51 | 54 | } |
@@ -66,9 +69,12 @@ discard block |
||
| 66 | 69 | $args['Message']['Body']['Text']['Data'] = $email->getTextBody(); |
| 67 | 70 | $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody(); |
| 68 | 71 | $args['ReplyToAddresses'] = array($email->getReplyTo()); |
| 69 | - try { |
|
| 72 | + try |
|
| 73 | + { |
|
| 70 | 74 | return $this->ses->sendEmail($args); |
| 71 | - } catch(\Exception $e) { |
|
| 75 | + } |
|
| 76 | + catch(\Exception $e) |
|
| 77 | + { |
|
| 72 | 78 | return false; |
| 73 | 79 | } |
| 74 | 80 | } |