@@ -113,7 +113,9 @@ |
||
113 | 113 | */ |
114 | 114 | protected function sign($options) |
115 | 115 | { |
116 | - if (isset($this->Sign)) return; |
|
116 | + if (isset($this->Sign)) { |
|
117 | + return; |
|
118 | + } |
|
117 | 119 | |
118 | 120 | if (isset($options['UseSign']) && ($options['UseSign'] === true)) |
119 | 121 | { |
@@ -37,7 +37,9 @@ |
||
37 | 37 | */ |
38 | 38 | public function create_AccountInfo($accountinfo) |
39 | 39 | { |
40 | - if (isset($this->AccountInfo)) return; |
|
40 | + if (isset($this->AccountInfo)) { |
|
41 | + return; |
|
42 | + } |
|
41 | 43 | |
42 | 44 | $this->AccountInfo = self::createElement('AccountInfo'); |
43 | 45 | $this->Response->appendChild($this->AccountInfo); |
@@ -36,7 +36,9 @@ |
||
36 | 36 | */ |
37 | 37 | public function create_OrderDate($orderdate) |
38 | 38 | { |
39 | - if (isset($this->OrderDate)) return; |
|
39 | + if (isset($this->OrderDate)) { |
|
40 | + return; |
|
41 | + } |
|
40 | 42 | |
41 | 43 | $this->OrderDate = self::createElement('OrderDate', $orderdate); |
42 | 44 | $this->Response->appendChild($this->OrderDate); |
@@ -36,7 +36,9 @@ |
||
36 | 36 | */ |
37 | 37 | public function create_CancelDate($canceldate) |
38 | 38 | { |
39 | - if (isset($this->CancelDate)) return; |
|
39 | + if (isset($this->CancelDate)) { |
|
40 | + return; |
|
41 | + } |
|
40 | 42 | |
41 | 43 | $this->CancelDate = self::createElement('CancelDate', $canceldate); |
42 | 44 | $this->Response->appendChild($this->CancelDate); |
@@ -36,7 +36,9 @@ |
||
36 | 36 | */ |
37 | 37 | public function create_PaymentId($paymentid) |
38 | 38 | { |
39 | - if (isset($this->PaymentId)) return; |
|
39 | + if (isset($this->PaymentId)) { |
|
40 | + return; |
|
41 | + } |
|
40 | 42 | |
41 | 43 | $this->PaymentId = self::createElement('PaymentId', $paymentid); |
42 | 44 | $this->Response->appendChild($this->PaymentId); |
@@ -70,20 +70,16 @@ |
||
70 | 70 | $this->response = $this->get_response(); |
71 | 71 | |
72 | 72 | Log::instance()->add('the request was processed successfully'); |
73 | - } |
|
74 | - catch (Exception\Structure $e) |
|
73 | + } catch (Exception\Structure $e) |
|
75 | 74 | { |
76 | 75 | $this->response = $this->get_error_response($e->getCode(), 'Error in request'); |
77 | - } |
|
78 | - catch (Exception\Sign $e) |
|
76 | + } catch (Exception\Sign $e) |
|
79 | 77 | { |
80 | 78 | $this->response = $this->get_error_response($e->getCode(), 'Signature error!'); |
81 | - } |
|
82 | - catch (Exception\Runtime $e) |
|
79 | + } catch (Exception\Runtime $e) |
|
83 | 80 | { |
84 | 81 | $this->response = $this->get_error_response($e->getCode(), 'Error while processing request'); |
85 | - } |
|
86 | - catch (\Exception $e) |
|
82 | + } catch (\Exception $e) |
|
87 | 83 | { |
88 | 84 | $this->response = $this->get_error_response($e->getCode(), $e->getMessage()); |
89 | 85 | } |
@@ -133,18 +133,15 @@ discard block |
||
133 | 133 | if ($child->nodeName == 'DateTime') |
134 | 134 | { |
135 | 135 | $this->parse_request_node($child, 'DateTime'); |
136 | - } |
|
137 | - elseif ($child->nodeName == 'Sign') |
|
136 | + } elseif ($child->nodeName == 'Sign') |
|
138 | 137 | { |
139 | 138 | $this->parse_request_node($child, 'Sign'); |
140 | - } |
|
141 | - elseif (in_array($child->nodeName, $this->operations)) |
|
139 | + } elseif (in_array($child->nodeName, $this->operations)) |
|
142 | 140 | { |
143 | 141 | if ( ! isset($this->Operation)) |
144 | 142 | { |
145 | 143 | $this->Operation = $child->nodeName; |
146 | - } |
|
147 | - else |
|
144 | + } else |
|
148 | 145 | { |
149 | 146 | throw new Exception\Structure('There is more than one Operation type element in the xml-query!', -53); |
150 | 147 | } |
@@ -181,8 +178,7 @@ discard block |
||
181 | 178 | if ( ! isset($this->$name)) |
182 | 179 | { |
183 | 180 | $this->$name = $n->nodeValue; |
184 | - } |
|
185 | - else |
|
181 | + } else |
|
186 | 182 | { |
187 | 183 | throw new Exception\Structure('There is more than one '.$name.' element in the xml-query!', -56); |
188 | 184 | } |
@@ -264,8 +260,7 @@ discard block |
||
264 | 260 | if ($check == -1) |
265 | 261 | { |
266 | 262 | throw new Exception\Sign('Error verify signature of request!', -96); |
267 | - } |
|
268 | - elseif ($check == 0) |
|
263 | + } elseif ($check == 0) |
|
269 | 264 | { |
270 | 265 | throw new Exception\Sign('Signature of request is incorrect!', -95); |
271 | 266 | } |
@@ -287,8 +282,7 @@ discard block |
||
287 | 282 | if ($child->nodeName == $name) |
288 | 283 | { |
289 | 284 | array_push($ret, $child); |
290 | - } |
|
291 | - else |
|
285 | + } else |
|
292 | 286 | { |
293 | 287 | if (count($child->childNodes) > 0) |
294 | 288 | { |