@@ -42,7 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | throw new FormatException('invalid json response!'); |
44 | 44 | } |
45 | - $this->error_code = (isset($this->json['error']['code']))?$this->json['error']['code']:'undefined'; |
|
45 | + $this->error_code = (isset($this->json['error']['code'])) ? $this->json['error']['code'] : 'undefined'; |
|
46 | 46 | } |
47 | 47 | |
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 | { |
@@ -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 | { |
@@ -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 | } |
@@ -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 | { |
@@ -162,7 +162,9 @@ discard block |
||
162 | 162 | $payload['iat'] = $this->get_param_iat(); |
163 | 163 | $ar['token'] = $this->token_encode($payload); |
164 | 164 | |
165 | - if (isset($ar['data'])) unset($ar['data']); |
|
165 | + if (isset($ar['data'])) { |
|
166 | + unset($ar['data']); |
|
167 | + } |
|
166 | 168 | } |
167 | 169 | $json = json_encode($ar, JSON_UNESCAPED_SLASHES); |
168 | 170 | |
@@ -216,8 +218,7 @@ discard block |
||
216 | 218 | try |
217 | 219 | { |
218 | 220 | $token = JWT::encode($payload, $this->own_private_key(), 'RS512'); |
219 | - } |
|
220 | - catch (\Exception $e) |
|
221 | + } catch (\Exception $e) |
|
221 | 222 | { |
222 | 223 | Log::instance()->error($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
223 | 224 | throw new Exception\JSON('unable to create JWT token', $e); |
@@ -247,8 +248,7 @@ discard block |
||
247 | 248 | $body = $httpresponse->getBody()->getContents(); |
248 | 249 | Log::instance()->debug('got response:'.PHP_EOL.$body); |
249 | 250 | $response = new $this->response_class($body, $this->jwt); |
250 | - } |
|
251 | - catch (\GuzzleHttp\Exception\TransferException $e) |
|
251 | + } catch (\GuzzleHttp\Exception\TransferException $e) |
|
252 | 252 | { |
253 | 253 | Log::instance()->debug('request:'.PHP_EOL.\GuzzleHttp\Psr7\str($e->getRequest())); |
254 | 254 | if ($e->hasResponse()) { |
@@ -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 | /** |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | protected function own_private_key() |
171 | 171 | { |
172 | 172 | // check private key file |
173 | - if ( ! file_exists($this->jwt['our_privkey'])) |
|
173 | + if (!file_exists($this->jwt['our_privkey'])) |
|
174 | 174 | { |
175 | 175 | throw new Exception\Runtime('The file with the private key was not find!'); |
176 | 176 | } |
@@ -139,8 +139,7 @@ |
||
139 | 139 | try |
140 | 140 | { |
141 | 141 | $decoded = (array) JWT::decode($token, $this->uapay_public_key(), array('RS512')); |
142 | - } |
|
143 | - catch (\Exception $e) |
|
142 | + } catch (\Exception $e) |
|
144 | 143 | { |
145 | 144 | Log::instance()->error($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
146 | 145 | throw new Exception\JSON('unable to decode JWT token', $e); |
@@ -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' => '', |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param string $json_string JSON string |
34 | 34 | * @param array $jwt_options array of options |
35 | 35 | */ |
36 | - public function __construct($json_string, $jwt_options=null) |
|
36 | + public function __construct($json_string, $jwt_options = null) |
|
37 | 37 | { |
38 | 38 | if (isset($jwt_options) && is_array($jwt_options)) |
39 | 39 | { |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | { |
75 | 75 | throw new Exception\JSON('json response contain an error message!'); |
76 | 76 | } |
77 | - if ( ! isset($this->json['status'])) |
|
77 | + if (!isset($this->json['status'])) |
|
78 | 78 | { |
79 | 79 | throw new Exception\JSON('invalid json response!'); |
80 | 80 | } |
@@ -84,14 +84,14 @@ discard block |
||
84 | 84 | } |
85 | 85 | $this->status = $this->json['status']; |
86 | 86 | |
87 | - if ( ! isset($this->json['data']) || !is_array($this->json['data'])) |
|
87 | + if (!isset($this->json['data']) || !is_array($this->json['data'])) |
|
88 | 88 | { |
89 | 89 | throw new Exception\JSON('json does not contain the data field!'); |
90 | 90 | } |
91 | 91 | |
92 | 92 | if ($this->jwt['using'] === true) |
93 | 93 | { |
94 | - if ( ! isset($this->json['data']['token'])) |
|
94 | + if (!isset($this->json['data']['token'])) |
|
95 | 95 | { |
96 | 96 | throw new Exception\JSON('data does not contain the token field!'); |
97 | 97 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | protected function uapay_public_key() |
121 | 121 | { |
122 | 122 | // check public key file |
123 | - if ( ! file_exists($this->jwt['UAPAY_pubkey'])) |
|
123 | + if (!file_exists($this->jwt['UAPAY_pubkey'])) |
|
124 | 124 | { |
125 | 125 | throw new Exception\Runtime('The file with the public key was not find!'); |
126 | 126 | } |