@@ -20,8 +20,7 @@ |
||
20 | 20 | $this->check_exists($fname); |
21 | 21 | |
22 | 22 | $key = $this->load($fname); |
23 | - } |
|
24 | - catch (\Exception $e) |
|
23 | + } catch (\Exception $e) |
|
25 | 24 | { |
26 | 25 | throw new Exception\Runtime('The file with the '.$type.' key was '.$e->getMessage().'!', -98); |
27 | 26 | } |
@@ -124,7 +124,9 @@ discard block |
||
124 | 124 | */ |
125 | 125 | protected function sign($options) |
126 | 126 | { |
127 | - if (isset($this->Sign)) return; |
|
127 | + if (isset($this->Sign)) { |
|
128 | + return; |
|
129 | + } |
|
128 | 130 | |
129 | 131 | if (isset($options['UseSign']) && ($options['UseSign'] === true)) |
130 | 132 | { |
@@ -153,8 +155,7 @@ discard block |
||
153 | 155 | try |
154 | 156 | { |
155 | 157 | $pkeyid = (new Key())->get($options['ProviderPKey'], 'private'); |
156 | - } |
|
157 | - catch (\Exception $e) |
|
158 | + } catch (\Exception $e) |
|
158 | 159 | { |
159 | 160 | return null; |
160 | 161 | } |
@@ -71,20 +71,16 @@ |
||
71 | 71 | $this->response = $this->get_response(); |
72 | 72 | |
73 | 73 | Log::instance()->add('the request was processed successfully'); |
74 | - } |
|
75 | - catch (Exception\Structure $e) |
|
74 | + } catch (Exception\Structure $e) |
|
76 | 75 | { |
77 | 76 | $this->response = $this->get_error_response($e->getCode(), 'Error in request'); |
78 | - } |
|
79 | - catch (Exception\Sign $e) |
|
77 | + } catch (Exception\Sign $e) |
|
80 | 78 | { |
81 | 79 | $this->response = $this->get_error_response($e->getCode(), 'Signature error!'); |
82 | - } |
|
83 | - catch (Exception\Runtime $e) |
|
80 | + } catch (Exception\Runtime $e) |
|
84 | 81 | { |
85 | 82 | $this->response = $this->get_error_response($e->getCode(), 'Error while processing request'); |
86 | - } |
|
87 | - catch (\Exception $e) |
|
83 | + } catch (\Exception $e) |
|
88 | 84 | { |
89 | 85 | $this->response = $this->get_error_response($e->getCode(), $e->getMessage()); |
90 | 86 | } |
@@ -43,7 +43,9 @@ |
||
43 | 43 | */ |
44 | 44 | public function create_AccountInfo($accountinfo) |
45 | 45 | { |
46 | - if (isset($this->AccountInfo)) return; |
|
46 | + if (isset($this->AccountInfo)) { |
|
47 | + return; |
|
48 | + } |
|
47 | 49 | |
48 | 50 | $this->AccountInfo = $this->createElement('AccountInfo'); |
49 | 51 | $this->Response->appendChild($this->AccountInfo); |
@@ -41,7 +41,9 @@ |
||
41 | 41 | */ |
42 | 42 | public function create_CancelDate($canceldate) |
43 | 43 | { |
44 | - if (isset($this->CancelDate)) return; |
|
44 | + if (isset($this->CancelDate)) { |
|
45 | + return; |
|
46 | + } |
|
45 | 47 | |
46 | 48 | $this->CancelDate = $this->createElement('CancelDate', $canceldate); |
47 | 49 | $this->Response->appendChild($this->CancelDate); |
@@ -42,7 +42,9 @@ |
||
42 | 42 | */ |
43 | 43 | public function create_OrderDate($orderdate) |
44 | 44 | { |
45 | - if (isset($this->OrderDate)) return; |
|
45 | + if (isset($this->OrderDate)) { |
|
46 | + return; |
|
47 | + } |
|
46 | 48 | |
47 | 49 | $this->OrderDate = $this->createElement('OrderDate', $orderdate); |
48 | 50 | $this->Response->appendChild($this->OrderDate); |
@@ -42,7 +42,9 @@ |
||
42 | 42 | */ |
43 | 43 | public function create_PaymentId($paymentid) |
44 | 44 | { |
45 | - if (isset($this->PaymentId)) return; |
|
45 | + if (isset($this->PaymentId)) { |
|
46 | + return; |
|
47 | + } |
|
46 | 48 | |
47 | 49 | $this->PaymentId = $this->createElement('PaymentId', $paymentid); |
48 | 50 | $this->Response->appendChild($this->PaymentId); |
@@ -135,18 +135,15 @@ discard block |
||
135 | 135 | if ($child->nodeName == 'DateTime') |
136 | 136 | { |
137 | 137 | $this->parse_request_node($child, 'DateTime'); |
138 | - } |
|
139 | - elseif ($child->nodeName == 'Sign') |
|
138 | + } elseif ($child->nodeName == 'Sign') |
|
140 | 139 | { |
141 | 140 | $this->parse_request_node($child, 'Sign'); |
142 | - } |
|
143 | - elseif (in_array($child->nodeName, $this->operations)) |
|
141 | + } elseif (in_array($child->nodeName, $this->operations)) |
|
144 | 142 | { |
145 | 143 | if ( ! isset($this->Operation)) |
146 | 144 | { |
147 | 145 | $this->Operation = $child->nodeName; |
148 | - } |
|
149 | - else |
|
146 | + } else |
|
150 | 147 | { |
151 | 148 | throw new Exception\Structure('There is more than one Operation type element in the xml-query!', -53); |
152 | 149 | } |
@@ -183,8 +180,7 @@ discard block |
||
183 | 180 | if ( ! isset($this->$name)) |
184 | 181 | { |
185 | 182 | $this->$name = $n->nodeValue; |
186 | - } |
|
187 | - else |
|
183 | + } else |
|
188 | 184 | { |
189 | 185 | throw new Exception\Structure('There is more than one '.$name.' element in the xml-query!', -56); |
190 | 186 | } |
@@ -270,8 +266,7 @@ discard block |
||
270 | 266 | if ($result == -1) |
271 | 267 | { |
272 | 268 | throw new Exception\Sign('Error verify signature of request!', -96); |
273 | - } |
|
274 | - elseif ($result == 0) |
|
269 | + } elseif ($result == 0) |
|
275 | 270 | { |
276 | 271 | throw new Exception\Sign('Signature of request is incorrect!', -95); |
277 | 272 | } |
@@ -293,8 +288,7 @@ discard block |
||
293 | 288 | if ($child->nodeName == $name) |
294 | 289 | { |
295 | 290 | array_push($ret, $child); |
296 | - } |
|
297 | - else |
|
291 | + } else |
|
298 | 292 | { |
299 | 293 | if (count($child->childNodes) > 0) |
300 | 294 | { |