@@ -37,7 +37,7 @@ |
||
| 37 | 37 | * @param string $value |
| 38 | 38 | * @return string |
| 39 | 39 | */ |
| 40 | - public function sessionId($value=null) |
|
| 40 | + public function sessionId($value = null) |
|
| 41 | 41 | { |
| 42 | 42 | if ($value !== null) |
| 43 | 43 | { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param string $value |
| 43 | 43 | * @return string |
| 44 | 44 | */ |
| 45 | - public function sessionId($value=null) |
|
| 45 | + public function sessionId($value = null) |
|
| 46 | 46 | { |
| 47 | 47 | if ($value !== null) |
| 48 | 48 | { |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * @param string $value |
| 59 | 59 | * @return string |
| 60 | 60 | */ |
| 61 | - public function id($value=null) |
|
| 61 | + public function id($value = null) |
|
| 62 | 62 | { |
| 63 | 63 | if ($value !== null) |
| 64 | 64 | { |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | * @param string $value |
| 38 | 38 | * @return string |
| 39 | 39 | */ |
| 40 | - public function id($value=null) |
|
| 40 | + public function id($value = null) |
|
| 41 | 41 | { |
| 42 | 42 | if ($value !== null) |
| 43 | 43 | { |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | * @param string $value |
| 43 | 43 | * @return string |
| 44 | 44 | */ |
| 45 | - public function clientId($value=null) |
|
| 45 | + public function clientId($value = null) |
|
| 46 | 46 | { |
| 47 | 47 | if ($value !== null) |
| 48 | 48 | { |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | * @param string $value |
| 38 | 38 | * @return string |
| 39 | 39 | */ |
| 40 | - public function sessionId($value=null) |
|
| 40 | + public function sessionId($value = null) |
|
| 41 | 41 | { |
| 42 | 42 | if ($value !== null) |
| 43 | 43 | { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * |
| 38 | 38 | * @param array $jwt_options array of options |
| 39 | 39 | */ |
| 40 | - public function __construct($options=null) |
|
| 40 | + public function __construct($options = null) |
|
| 41 | 41 | { |
| 42 | 42 | $jo = new JWTOptions($options); |
| 43 | 43 | parent::__construct($this->get_http_raw_post_data(), $jo->get()); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | protected function get_http_raw_post_data() |
| 60 | 60 | { |
| 61 | - Log::instance()->add('callback request from ' . $_SERVER['REMOTE_ADDR']); |
|
| 61 | + Log::instance()->add('callback request from '.$_SERVER['REMOTE_ADDR']); |
|
| 62 | 62 | |
| 63 | 63 | $raw_request = file_get_contents('php://input'); |
| 64 | 64 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | if ($this->jwt['using'] === true) |
| 85 | 85 | { |
| 86 | - if ( ! isset($this->json['token'])) |
|
| 86 | + if (!isset($this->json['token'])) |
|
| 87 | 87 | { |
| 88 | 88 | throw new Exception\JSON('json does not contain the token field!'); |
| 89 | 89 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** |
| 17 | 17 | * @var array |
| 18 | 18 | */ |
| 19 | - protected $jwt=array( |
|
| 19 | + protected $jwt = array( |
|
| 20 | 20 | 'using' => false, |
| 21 | 21 | 'UAPAY_pubkey' => '', |
| 22 | 22 | 'our_privkey' => '', |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function __construct($options) |
| 37 | 37 | { |
| 38 | 38 | // api_url |
| 39 | - if ( ! isset($options['api_uri'])) |
|
| 39 | + if (!isset($options['api_uri'])) |
|
| 40 | 40 | { |
| 41 | 41 | throw new Exception\Data('parameter api_uri is not specified'); |
| 42 | 42 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * @param array $value |
| 58 | 58 | * @return array |
| 59 | 59 | */ |
| 60 | - public function data($value=null) |
|
| 60 | + public function data($value = null) |
|
| 61 | 61 | { |
| 62 | 62 | if ($value !== null) |
| 63 | 63 | { |
@@ -73,9 +73,9 @@ discard block |
||
| 73 | 73 | * @param mixed $value |
| 74 | 74 | * @return string |
| 75 | 75 | */ |
| 76 | - protected function as_string($value=null) |
|
| 76 | + protected function as_string($value = null) |
|
| 77 | 77 | { |
| 78 | - return (is_scalar($value))?((is_bool($value))?(($value)?'true':'false'):"$value"):null; |
|
| 78 | + return (is_scalar($value)) ? ((is_bool($value)) ? (($value) ? 'true' : 'false') : "$value") : null; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | * @param mixed $value |
| 85 | 85 | * @return integer |
| 86 | 86 | */ |
| 87 | - protected function as_int($value=null) |
|
| 87 | + protected function as_int($value = null) |
|
| 88 | 88 | { |
| 89 | - return (is_int($value))?$value:null; |
|
| 89 | + return (is_int($value)) ? $value : null; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | * @param mixed $value |
| 96 | 96 | * @return array |
| 97 | 97 | */ |
| 98 | - protected function as_array($value=null) |
|
| 98 | + protected function as_array($value = null) |
|
| 99 | 99 | { |
| 100 | - return (is_array($value))?$value:null; |
|
| 100 | + return (is_array($value)) ? $value : null; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -201,8 +201,7 @@ discard block |
||
| 201 | 201 | try |
| 202 | 202 | { |
| 203 | 203 | $token = JWT::encode($payload, $this->own_private_key(), $this->jwt['algorithm']); |
| 204 | - } |
|
| 205 | - catch (\Exception $e) |
|
| 204 | + } catch (\Exception $e) |
|
| 206 | 205 | { |
| 207 | 206 | Log::instance()->error($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
| 208 | 207 | throw new Exception\JSON('unable to create JWT token', $e); |
@@ -231,8 +230,7 @@ discard block |
||
| 231 | 230 | $body = $httpresponse->getBody()->getContents(); |
| 232 | 231 | Log::instance()->debug('got response:'.PHP_EOL.$body); |
| 233 | 232 | return new $this->response_class($body, $this->jwt); |
| 234 | - } |
|
| 235 | - catch (\GuzzleHttp\Exception\RequestException $e) |
|
| 233 | + } catch (\GuzzleHttp\Exception\RequestException $e) |
|
| 236 | 234 | { |
| 237 | 235 | $this->handle_request_exception($e); |
| 238 | 236 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | protected function check_exists($fname) |
| 30 | 30 | { |
| 31 | - if ( ! file_exists($fname)) |
|
| 31 | + if (!file_exists($fname)) |
|
| 32 | 32 | { |
| 33 | 33 | throw new Exception\Runtime('not exists'); |
| 34 | 34 | } |
@@ -22,8 +22,7 @@ |
||
| 22 | 22 | $this->check_exists($fname); |
| 23 | 23 | |
| 24 | 24 | $key = $this->load($fname); |
| 25 | - } |
|
| 26 | - catch (\Exception $e) |
|
| 25 | + } catch (\Exception $e) |
|
| 27 | 26 | { |
| 28 | 27 | throw new Exception\Runtime('The file with the '.$type.' key was '.$e->getMessage().'!'); |
| 29 | 28 | } |
@@ -11,9 +11,9 @@ |
||
| 11 | 11 | * @param string $message |
| 12 | 12 | * @param \Throwable $previous |
| 13 | 13 | */ |
| 14 | - public function __construct($message, \Exception $previous=null, $tracelog=false) |
|
| 14 | + public function __construct($message, \Exception $previous = null, $tracelog = false) |
|
| 15 | 15 | { |
| 16 | - Log::instance()->error($message.(($tracelog)?PHP_EOL.$this->getTraceAsString():null)); |
|
| 16 | + Log::instance()->error($message.(($tracelog) ?PHP_EOL.$this->getTraceAsString() : null)); |
|
| 17 | 17 | $code = 0; |
| 18 | 18 | parent::__construct($message, $code, $previous); |
| 19 | 19 | } |