@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $this->me['struct'] = $val; |
99 | 99 | break; |
100 | 100 | default: |
101 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
101 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | } |
129 | 129 | |
130 | 130 | if ($typeOf !== 1) { |
131 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
131 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
132 | 132 | return 0; |
133 | 133 | } |
134 | 134 | |
@@ -145,10 +145,10 @@ discard block |
||
145 | 145 | |
146 | 146 | switch ($this->mytype) { |
147 | 147 | case 1: |
148 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
148 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
149 | 149 | return 0; |
150 | 150 | case 3: |
151 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
151 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
152 | 152 | return 0; |
153 | 153 | case 2: |
154 | 154 | // we're adding a scalar value to an array here |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | return 1; |
194 | 194 | } else { |
195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
196 | 196 | return 0; |
197 | 197 | } |
198 | 198 | } |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | |
224 | 224 | return 1; |
225 | 225 | } else { |
226 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
226 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
227 | 227 | return 0; |
228 | 228 | } |
229 | 229 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $val = reset($this->me); |
289 | 289 | $typ = key($this->me); |
290 | 290 | |
291 | - return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n"; |
|
291 | + return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n"; |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | /** |
@@ -311,19 +311,19 @@ discard block |
||
311 | 311 | case 1: |
312 | 312 | switch ($typ) { |
313 | 313 | case static::$xmlrpcBase64: |
314 | - $rs = "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
314 | + $rs = "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
315 | 315 | break; |
316 | 316 | case static::$xmlrpcBoolean: |
317 | - $rs = "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
317 | + $rs = "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
318 | 318 | break; |
319 | 319 | case static::$xmlrpcString: |
320 | 320 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
321 | - $rs = "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
321 | + $rs = "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
322 | 322 | break; |
323 | 323 | case static::$xmlrpcInt: |
324 | 324 | case static::$xmlrpcI4: |
325 | 325 | case static::$xmlrpcI8: |
326 | - $rs = "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
326 | + $rs = "<{$typ}>".(int) $val."</{$typ}>"; |
|
327 | 327 | break; |
328 | 328 | case static::$xmlrpcDouble: |
329 | 329 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -331,16 +331,16 @@ discard block |
||
331 | 331 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
332 | 332 | // The code below tries its best at keeping max precision while avoiding exp notation, |
333 | 333 | // but there is of course no limit in the number of decimal places to be used... |
334 | - $rs = "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
334 | + $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
335 | 335 | break; |
336 | 336 | case static::$xmlrpcDateTime: |
337 | 337 | if (is_string($val)) { |
338 | 338 | $rs = "<{$typ}>{$val}</{$typ}>"; |
339 | 339 | // DateTimeInterface is not present in php 5.4... |
340 | 340 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
341 | - $rs = "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
341 | + $rs = "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
342 | 342 | } elseif (is_int($val)) { |
343 | - $rs = "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
343 | + $rs = "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
344 | 344 | } else { |
345 | 345 | // not really a good idea here: but what should we output anyway? left for backward compat... |
346 | 346 | $rs = "<{$typ}>{$val}</{$typ}>"; |
@@ -362,14 +362,14 @@ discard block |
||
362 | 362 | case 3: |
363 | 363 | // struct |
364 | 364 | if ($this->_php_class) { |
365 | - $rs = '<struct php_class="' . $this->_php_class . "\">\n"; |
|
365 | + $rs = '<struct php_class="'.$this->_php_class."\">\n"; |
|
366 | 366 | } else { |
367 | 367 | $rs = "<struct>\n"; |
368 | 368 | } |
369 | 369 | $charsetEncoder = $this->getCharsetEncoder(); |
370 | 370 | /** @var Value $val2 */ |
371 | 371 | foreach ($val as $key2 => $val2) { |
372 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
372 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
373 | 373 | $rs .= $val2->serialize($charsetEncoding); |
374 | 374 | $rs .= "</member>\n"; |
375 | 375 | } |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | */ |
584 | 584 | public function structMemExists($key) |
585 | 585 | { |
586 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
586 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
587 | 587 | |
588 | 588 | return array_key_exists($key, $this->me['struct']); |
589 | 589 | } |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | */ |
600 | 600 | public function structMem($key) |
601 | 601 | { |
602 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
602 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
603 | 603 | |
604 | 604 | return $this->me['struct'][$key]; |
605 | 605 | } |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | */ |
613 | 613 | public function structReset() |
614 | 614 | { |
615 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
615 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
616 | 616 | |
617 | 617 | reset($this->me['struct']); |
618 | 618 | } |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | */ |
627 | 627 | public function structEach() |
628 | 628 | { |
629 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
629 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
630 | 630 | |
631 | 631 | $key = key($this->me['struct']); |
632 | 632 | $value = current($this->me['struct']); |
@@ -645,7 +645,7 @@ discard block |
||
645 | 645 | */ |
646 | 646 | public function arrayMem($key) |
647 | 647 | { |
648 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
648 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
649 | 649 | |
650 | 650 | return $this->me['array'][$key]; |
651 | 651 | } |
@@ -659,7 +659,7 @@ discard block |
||
659 | 659 | */ |
660 | 660 | public function arraySize() |
661 | 661 | { |
662 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
662 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
663 | 663 | |
664 | 664 | return count($this->me['array']); |
665 | 665 | } |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | */ |
674 | 674 | public function structSize() |
675 | 675 | { |
676 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
676 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
677 | 677 | |
678 | 678 | return count($this->me['struct']); |
679 | 679 | } |
@@ -685,12 +685,12 @@ discard block |
||
685 | 685 | case 'me': |
686 | 686 | case 'mytype': |
687 | 687 | case '_php_class': |
688 | - $this->logDeprecation('Getting property Value::' . $name . ' is deprecated'); |
|
688 | + $this->logDeprecation('Getting property Value::'.$name.' is deprecated'); |
|
689 | 689 | return $this->$name; |
690 | 690 | default: |
691 | 691 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
692 | 692 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
693 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
693 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
694 | 694 | $result = null; |
695 | 695 | return $result; |
696 | 696 | } |
@@ -702,13 +702,13 @@ discard block |
||
702 | 702 | case 'me': |
703 | 703 | case 'mytype': |
704 | 704 | case '_php_class': |
705 | - $this->logDeprecation('Setting property Value::' . $name . ' is deprecated'); |
|
705 | + $this->logDeprecation('Setting property Value::'.$name.' is deprecated'); |
|
706 | 706 | $this->$name = $value; |
707 | 707 | break; |
708 | 708 | default: |
709 | 709 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
710 | 710 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
711 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
711 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
712 | 712 | } |
713 | 713 | } |
714 | 714 | |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | case 'me': |
719 | 719 | case 'mytype': |
720 | 720 | case '_php_class': |
721 | - $this->logDeprecation('Checking property Value::' . $name . ' is deprecated'); |
|
721 | + $this->logDeprecation('Checking property Value::'.$name.' is deprecated'); |
|
722 | 722 | return isset($this->$name); |
723 | 723 | default: |
724 | 724 | return false; |
@@ -731,13 +731,13 @@ discard block |
||
731 | 731 | case 'me': |
732 | 732 | case 'mytype': |
733 | 733 | case '_php_class': |
734 | - $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated'); |
|
734 | + $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated'); |
|
735 | 735 | unset($this->$name); |
736 | 736 | break; |
737 | 737 | default: |
738 | 738 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
739 | 739 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
740 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
740 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
741 | 741 | } |
742 | 742 | } |
743 | 743 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | return true; |
86 | 86 | } else { |
87 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value'); |
|
87 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value'); |
|
88 | 88 | return false; |
89 | 89 | } |
90 | 90 | } |
@@ -134,17 +134,17 @@ discard block |
||
134 | 134 | $this->logDeprecationUnlessCalledBy('serialize'); |
135 | 135 | |
136 | 136 | if ($charsetEncoding != '') { |
137 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
137 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
138 | 138 | } else { |
139 | 139 | $this->content_type = 'text/xml'; |
140 | 140 | } |
141 | 141 | |
142 | 142 | $result = $this->xml_header($charsetEncoding); |
143 | - $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
144 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
143 | + $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
144 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
145 | 145 | $result .= "<params>\n"; |
146 | 146 | foreach ($this->params as $p) { |
147 | - $result .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
147 | + $result .= "<param>\n".$p->serialize($charsetEncoding). |
|
148 | 148 | "</param>\n"; |
149 | 149 | } |
150 | 150 | $result .= "</params>\n"; |
@@ -164,9 +164,9 @@ discard block |
||
164 | 164 | $this->logDeprecationUnlessCalledBy('createPayload'); |
165 | 165 | |
166 | 166 | if ($charsetEncoding != '') { |
167 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
167 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
168 | 168 | } else { |
169 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
169 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS) |
230 | 230 | { |
231 | - if ($this->debug > 0) { |
|
231 | + if ($this->debug>0) { |
|
232 | 232 | $this->getLogger()->debug("---GOT---\n$data\n---END---"); |
233 | 233 | } |
234 | 234 | |
235 | 235 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
236 | 236 | |
237 | 237 | if ($data == '') { |
238 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
238 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
239 | 239 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
240 | 240 | } |
241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
243 | 243 | if (substr($data, 0, 4) == 'HTTP') { |
244 | 244 | $httpParser = new Http(); |
245 | 245 | try { |
246 | - $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0); |
|
246 | + $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0); |
|
247 | 247 | } catch (HttpException $e) { |
248 | 248 | // failed processing of HTTP response headers |
249 | 249 | // save into response obj the full payload received, for debugging |
250 | 250 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode())); |
251 | - } catch(\Exception $e) { |
|
251 | + } catch (\Exception $e) { |
|
252 | 252 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
253 | 253 | } |
254 | 254 | } else { |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib |
265 | 265 | $pos = strrpos($data, '</methodResponse>'); |
266 | 266 | if ($pos !== false) { |
267 | - $data = substr($data, 0, $pos + 17); |
|
267 | + $data = substr($data, 0, $pos+17); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | // try to 'guestimate' the character encoding of the received response |
@@ -273,21 +273,21 @@ discard block |
||
273 | 273 | $data |
274 | 274 | ); |
275 | 275 | |
276 | - if ($this->debug >= 0) { |
|
276 | + if ($this->debug>=0) { |
|
277 | 277 | $this->httpResponse = $httpResponse; |
278 | 278 | } else { |
279 | 279 | $httpResponse = null; |
280 | 280 | } |
281 | 281 | |
282 | - if ($this->debug > 0) { |
|
282 | + if ($this->debug>0) { |
|
283 | 283 | $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
284 | 284 | if ($start) { |
285 | 285 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
286 | 286 | /// @todo what if there is no end tag? |
287 | 287 | $end = strpos($data, '-->', $start); |
288 | - $comments = substr($data, $start, $end - $start); |
|
289 | - $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" . |
|
290 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding)); |
|
288 | + $comments = substr($data, $start, $end-$start); |
|
289 | + $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t". |
|
290 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding)); |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | if ($respEncoding == 'ISO-8859-1') { |
310 | 310 | $data = utf8_encode($data); |
311 | 311 | } else { |
312 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
312 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
313 | 313 | } |
314 | 314 | } |
315 | 315 | } |
@@ -336,16 +336,16 @@ discard block |
||
336 | 336 | // there could be proxies meddling with the request, or network data corruption... |
337 | 337 | |
338 | 338 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
339 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
339 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
340 | 340 | |
341 | - if ($this->debug > 0) { |
|
341 | + if ($this->debug>0) { |
|
342 | 342 | $this->getLogger()->debug($_xh['isf_reason']); |
343 | 343 | } |
344 | 344 | } |
345 | 345 | // second error check: xml well-formed but not xml-rpc compliant |
346 | 346 | elseif ($_xh['isf'] == 2) { |
347 | 347 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
348 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
348 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
349 | 349 | |
350 | 350 | /// @todo echo something for the user? check if it was already done by the parser... |
351 | 351 | //if ($this->debug > 0) { |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | } |
355 | 355 | // third error check: parsing of the response has somehow gone boink. |
356 | 356 | /// @todo shall we omit this check, since we trust the parsing code? |
357 | - elseif ($_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) { |
|
357 | + elseif ($_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) { |
|
358 | 358 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
359 | 359 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
360 | 360 | '', $httpResponse |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | |
363 | 363 | /// @todo echo something for the user? |
364 | 364 | } else { |
365 | - if ($this->debug > 1) { |
|
365 | + if ($this->debug>1) { |
|
366 | 366 | $this->getLogger()->debug( |
367 | 367 | "---PARSED---\n".var_export($_xh['value'], true)."\n---END---" |
368 | 368 | ); |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | if ($errNo == 0) { |
387 | 387 | // FAULT returned, errno needs to reflect that |
388 | 388 | /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr |
389 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1'); |
|
389 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1'); |
|
390 | 390 | $errNo = -1; |
391 | 391 | } |
392 | 392 | |
@@ -432,12 +432,12 @@ discard block |
||
432 | 432 | case '_php_class': |
433 | 433 | case 'payload': |
434 | 434 | case 'content_type': |
435 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
435 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
436 | 436 | return $this->$name; |
437 | 437 | default: |
438 | 438 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
439 | 439 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
440 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
440 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
441 | 441 | $result = null; |
442 | 442 | return $result; |
443 | 443 | } |
@@ -451,13 +451,13 @@ discard block |
||
451 | 451 | case 'debug': |
452 | 452 | case 'payload': |
453 | 453 | case 'content_type': |
454 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
454 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
455 | 455 | $this->$name = $value; |
456 | 456 | break; |
457 | 457 | default: |
458 | 458 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
459 | 459 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
460 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
460 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
461 | 461 | } |
462 | 462 | } |
463 | 463 | |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | case 'debug': |
470 | 470 | case 'payload': |
471 | 471 | case 'content_type': |
472 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
472 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
473 | 473 | return isset($this->$name); |
474 | 474 | default: |
475 | 475 | return false; |
@@ -484,13 +484,13 @@ discard block |
||
484 | 484 | case 'debug': |
485 | 485 | case 'payload': |
486 | 486 | case 'content_type': |
487 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
487 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
488 | 488 | unset($this->$name); |
489 | 489 | break; |
490 | 490 | default: |
491 | 491 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
492 | 492 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
493 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
493 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
494 | 494 | } |
495 | 495 | } |
496 | 496 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function echoInput() |
56 | 56 | { |
57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
58 | 58 | print $r->serialize(); |
59 | 59 | } |
60 | 60 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function &__get($name) |
67 | 67 | { |
68 | - switch($name) { |
|
68 | + switch ($name) { |
|
69 | 69 | case 'dmap': |
70 | 70 | return $this->dmap; |
71 | 71 | default: |
@@ -96,30 +96,30 @@ discard block |
||
96 | 96 | Server::xmlrpc_debugmsg($m); |
97 | 97 | } |
98 | 98 | |
99 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
99 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
100 | 100 | { |
101 | 101 | return Server::_xmlrpcs_getCapabilities($server, $m); |
102 | 102 | } |
103 | 103 | |
104 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
105 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
106 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
107 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
104 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
105 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
106 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
107 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
108 | 108 | { |
109 | 109 | return Server::_xmlrpcs_listMethods($server, $m); |
110 | 110 | } |
111 | 111 | |
112 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
113 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
114 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
112 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
113 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
114 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
115 | 115 | function _xmlrpcs_methodSignature($server, $m) |
116 | 116 | { |
117 | 117 | return Server::_xmlrpcs_methodSignature($server, $m); |
118 | 118 | } |
119 | 119 | |
120 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
121 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
122 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
120 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
121 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
122 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
123 | 123 | function _xmlrpcs_methodHelp($server, $m) |
124 | 124 | { |
125 | 125 | return Server::_xmlrpcs_methodHelp($server, $m); |