@@ -463,7 +463,7 @@ |
||
463 | 463 | public function addToMap($methodName, $function, $sig = null, $doc = false, $sigDoc = false, $parametersType = false, |
464 | 464 | $exceptionHandling = false) |
465 | 465 | { |
466 | - return $this->addToMap($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling); |
|
466 | + return $this->addToMap($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling); |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | /** |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | public function getOptions() |
249 | 249 | { |
250 | 250 | $values = array(); |
251 | - foreach(static::$options as $opt) { |
|
251 | + foreach (static::$options as $opt) { |
|
252 | 252 | $values[$opt] = $this->getOption($opt); |
253 | 253 | } |
254 | 254 | return $values; |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | */ |
262 | 262 | public function setOptions($options) |
263 | 263 | { |
264 | - foreach($options as $name => $value) { |
|
264 | + foreach ($options as $name => $value) { |
|
265 | 265 | $this->setOption($name, $value); |
266 | 266 | } |
267 | 267 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | */ |
300 | 300 | public static function xmlrpc_debugmsg($msg) |
301 | 301 | { |
302 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
302 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
303 | 303 | } |
304 | 304 | |
305 | 305 | /** |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | */ |
312 | 312 | public static function error_occurred($msg) |
313 | 313 | { |
314 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
314 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | /** |
@@ -332,10 +332,10 @@ discard block |
||
332 | 332 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
333 | 333 | $out = ''; |
334 | 334 | if ($this->debug_info != '') { |
335 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
335 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
336 | 336 | } |
337 | 337 | if (static::$_xmlrpc_debuginfo != '') { |
338 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
338 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
339 | 339 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
340 | 340 | // into return payload AFTER the beginning tag |
341 | 341 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -364,8 +364,8 @@ discard block |
||
364 | 364 | $this->debug_info = ''; |
365 | 365 | |
366 | 366 | // Save what we received, before parsing it |
367 | - if ($this->debug > 1) { |
|
368 | - $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
367 | + if ($this->debug>1) { |
|
368 | + $this->debugMsg("+++GOT+++\n".$data."\n+++END+++"); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -382,13 +382,13 @@ discard block |
||
382 | 382 | $resp->raw_data = $rawData; |
383 | 383 | } |
384 | 384 | |
385 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
386 | - $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
387 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
385 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
386 | + $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
387 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | $header = $resp->xml_header($respCharset); |
391 | - if ($this->debug > 0) { |
|
391 | + if ($this->debug>0) { |
|
392 | 392 | $header .= $this->serializeDebug($respCharset); |
393 | 393 | } |
394 | 394 | |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | if (empty($payload)) { |
400 | 400 | $payload = $resp->serialize($respCharset); |
401 | 401 | } |
402 | - $payload = $header . $payload; |
|
402 | + $payload = $header.$payload; |
|
403 | 403 | |
404 | 404 | if ($returnPayload) { |
405 | 405 | return $payload; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | // if we get a warning/error that has output some text before here, then we cannot |
409 | 409 | // add a new header. We cannot say we are sending xml, either... |
410 | 410 | if (!headers_sent()) { |
411 | - header('Content-Type: ' . $resp->getContentType()); |
|
411 | + header('Content-Type: '.$resp->getContentType()); |
|
412 | 412 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
413 | 413 | header("Vary: Accept-Charset"); |
414 | 414 | |
@@ -431,10 +431,10 @@ discard block |
||
431 | 431 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
432 | 432 | // responses up to 8000 bytes |
433 | 433 | if ($phpNoSelfCompress) { |
434 | - header('Content-Length: ' . (int)strlen($payload)); |
|
434 | + header('Content-Length: '.(int) strlen($payload)); |
|
435 | 435 | } |
436 | 436 | } else { |
437 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
437 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | print $payload; |
@@ -523,9 +523,9 @@ discard block |
||
523 | 523 | $numParams = count($in); |
524 | 524 | } |
525 | 525 | foreach ($sigs as $curSig) { |
526 | - if (count($curSig) == $numParams + 1) { |
|
526 | + if (count($curSig) == $numParams+1) { |
|
527 | 527 | $itsOK = 1; |
528 | - for ($n = 0; $n < $numParams; $n++) { |
|
528 | + for ($n = 0; $n<$numParams; $n++) { |
|
529 | 529 | if (is_object($in)) { |
530 | 530 | $p = $in->getParam($n); |
531 | 531 | if ($p->kindOf() == 'scalar') { |
@@ -538,10 +538,10 @@ discard block |
||
538 | 538 | } |
539 | 539 | |
540 | 540 | // param index is $n+1, as first member of sig is return type |
541 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
541 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
542 | 542 | $itsOK = 0; |
543 | - $pno = $n + 1; |
|
544 | - $wanted = $curSig[$n + 1]; |
|
543 | + $pno = $n+1; |
|
544 | + $wanted = $curSig[$n+1]; |
|
545 | 545 | $got = $pt; |
546 | 546 | break; |
547 | 547 | } |
@@ -568,10 +568,10 @@ discard block |
||
568 | 568 | // check if $_SERVER is populated: it might have been disabled via ini file |
569 | 569 | // (this is true even when in CLI mode) |
570 | 570 | if (count($_SERVER) == 0) { |
571 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
571 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
572 | 572 | } |
573 | 573 | |
574 | - if ($this->debug > 1) { |
|
574 | + if ($this->debug>1) { |
|
575 | 575 | if (function_exists('getallheaders')) { |
576 | 576 | $this->debugMsg(''); // empty line |
577 | 577 | foreach (getallheaders() as $name => $val) { |
@@ -596,13 +596,13 @@ discard block |
||
596 | 596 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
597 | 597 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
598 | 598 | $data = $degzdata; |
599 | - if ($this->debug > 1) { |
|
600 | - $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
599 | + if ($this->debug>1) { |
|
600 | + $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
601 | 601 | } |
602 | 602 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
603 | 603 | $data = $degzdata; |
604 | - if ($this->debug > 1) { |
|
605 | - $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
604 | + if ($this->debug>1) { |
|
605 | + $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
606 | 606 | } |
607 | 607 | } else { |
608 | 608 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | if ($reqEncoding == 'ISO-8859-1') { |
690 | 690 | $data = utf8_encode($data); |
691 | 691 | } else { |
692 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
692 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
693 | 693 | } |
694 | 694 | } |
695 | 695 | } |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches); |
718 | 718 | return new Response( |
719 | 719 | 0, |
720 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
720 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
721 | 721 | $_xh['isf_reason']); |
722 | 722 | } elseif ($_xh['isf']) { |
723 | 723 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs. |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | return new Response( |
726 | 726 | 0, |
727 | 727 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
728 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']); |
|
728 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']); |
|
729 | 729 | } else { |
730 | 730 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
731 | 731 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -735,20 +735,20 @@ discard block |
||
735 | 735 | ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals') |
736 | 736 | ) |
737 | 737 | ) { |
738 | - if ($this->debug > 1) { |
|
739 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++"); |
|
738 | + if ($this->debug>1) { |
|
739 | + $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++"); |
|
740 | 740 | } |
741 | 741 | |
742 | 742 | return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']); |
743 | 743 | } else { |
744 | 744 | // build a Request object with data parsed from xml and add parameters in |
745 | 745 | $req = new Request($_xh['method']); |
746 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
746 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
747 | 747 | $req->addParam($_xh['params'][$i]); |
748 | 748 | } |
749 | 749 | |
750 | - if ($this->debug > 1) { |
|
751 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
750 | + if ($this->debug>1) { |
|
751 | + $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
752 | 752 | } |
753 | 753 | |
754 | 754 | return $this->execute($req); |
@@ -798,7 +798,7 @@ discard block |
||
798 | 798 | return new Response( |
799 | 799 | 0, |
800 | 800 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
801 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
801 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
802 | 802 | ); |
803 | 803 | } |
804 | 804 | } |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | // build string representation of function 'name' |
814 | 814 | if (is_array($func)) { |
815 | 815 | if (is_object($func[0])) { |
816 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
816 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
817 | 817 | } else { |
818 | 818 | $funcName = implode('::', $func); |
819 | 819 | } |
@@ -825,23 +825,23 @@ discard block |
||
825 | 825 | |
826 | 826 | // verify that function to be invoked is in fact callable |
827 | 827 | if (!is_callable($func)) { |
828 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
828 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
829 | 829 | return new Response( |
830 | 830 | 0, |
831 | 831 | PhpXmlRpc::$xmlrpcerr['server_error'], |
832 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
832 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
833 | 833 | ); |
834 | 834 | } |
835 | 835 | |
836 | 836 | if (isset($dmap[$methodName]['exception_handling'])) { |
837 | - $exception_handling = (int)$dmap[$methodName]['exception_handling']; |
|
837 | + $exception_handling = (int) $dmap[$methodName]['exception_handling']; |
|
838 | 838 | } else { |
839 | 839 | $exception_handling = $this->exception_handling; |
840 | 840 | } |
841 | 841 | |
842 | 842 | // If debug level is 3, we should catch all errors generated during processing of user function, and log them |
843 | 843 | // as part of response |
844 | - if ($this->debug > 2) { |
|
844 | + if ($this->debug>2) { |
|
845 | 845 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
846 | 846 | } |
847 | 847 | |
@@ -855,14 +855,14 @@ discard block |
||
855 | 855 | $r = call_user_func($func, $req); |
856 | 856 | } |
857 | 857 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
858 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
858 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
859 | 859 | if (is_a($r, 'PhpXmlRpc\Value')) { |
860 | 860 | $r = new Response($r); |
861 | 861 | } else { |
862 | 862 | $r = new Response( |
863 | 863 | 0, |
864 | 864 | PhpXmlRpc::$xmlrpcerr['server_error'], |
865 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
865 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
866 | 866 | ); |
867 | 867 | } |
868 | 868 | } |
@@ -877,7 +877,7 @@ discard block |
||
877 | 877 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
878 | 878 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
879 | 879 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
880 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
880 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
881 | 881 | } else { |
882 | 882 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
883 | 883 | // return type correctly |
@@ -902,7 +902,7 @@ discard block |
||
902 | 902 | // proper error-response |
903 | 903 | switch ($exception_handling) { |
904 | 904 | case 2: |
905 | - if ($this->debug > 2) { |
|
905 | + if ($this->debug>2) { |
|
906 | 906 | if (self::$_xmlrpcs_prev_ehandler) { |
907 | 907 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
908 | 908 | } else { |
@@ -925,7 +925,7 @@ discard block |
||
925 | 925 | // proper error-response |
926 | 926 | switch ($exception_handling) { |
927 | 927 | case 2: |
928 | - if ($this->debug > 2) { |
|
928 | + if ($this->debug>2) { |
|
929 | 929 | if (self::$_xmlrpcs_prev_ehandler) { |
930 | 930 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
931 | 931 | } else { |
@@ -945,7 +945,7 @@ discard block |
||
945 | 945 | } |
946 | 946 | } |
947 | 947 | |
948 | - if ($this->debug > 2) { |
|
948 | + if ($this->debug>2) { |
|
949 | 949 | // note: restore the error handler we found before calling the user func, even if it has been changed |
950 | 950 | // inside the func itself |
951 | 951 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | */ |
1012 | 1012 | protected function debugMsg($string) |
1013 | 1013 | { |
1014 | - $this->debug_info .= $string . "\n"; |
|
1014 | + $this->debug_info .= $string."\n"; |
|
1015 | 1015 | } |
1016 | 1016 | |
1017 | 1017 | /** |
@@ -1302,7 +1302,7 @@ discard block |
||
1302 | 1302 | $i++; // for error message, we count params from 1 |
1303 | 1303 | return static::_xmlrpcs_multicall_error(new Response(0, |
1304 | 1304 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
1305 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
1305 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
1306 | 1306 | } |
1307 | 1307 | } |
1308 | 1308 | |
@@ -1383,7 +1383,7 @@ discard block |
||
1383 | 1383 | } |
1384 | 1384 | } else { |
1385 | 1385 | $numCalls = count($req); |
1386 | - for ($i = 0; $i < $numCalls; $i++) { |
|
1386 | + for ($i = 0; $i<$numCalls; $i++) { |
|
1387 | 1387 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
1388 | 1388 | } |
1389 | 1389 | } |
@@ -1448,12 +1448,12 @@ discard block |
||
1448 | 1448 | */ |
1449 | 1449 | protected function xml_header($charsetEncoding = '') |
1450 | 1450 | { |
1451 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
1451 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
1452 | 1452 | |
1453 | 1453 | if ($charsetEncoding != '') { |
1454 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
1454 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
1455 | 1455 | } else { |
1456 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
1456 | + return "<?xml version=\"1.0\"?".">\n"; |
|
1457 | 1457 | } |
1458 | 1458 | } |
1459 | 1459 | |
@@ -1469,12 +1469,12 @@ discard block |
||
1469 | 1469 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
1470 | 1470 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
1471 | 1471 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
1472 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
1472 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
1473 | 1473 | return $this->$name; |
1474 | 1474 | default: |
1475 | 1475 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1476 | 1476 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1477 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1477 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1478 | 1478 | $result = null; |
1479 | 1479 | return $result; |
1480 | 1480 | } |
@@ -1491,13 +1491,13 @@ discard block |
||
1491 | 1491 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
1492 | 1492 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
1493 | 1493 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
1494 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
1494 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
1495 | 1495 | $this->$name = $value; |
1496 | 1496 | break; |
1497 | 1497 | default: |
1498 | 1498 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1499 | 1499 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1500 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1500 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1501 | 1501 | } |
1502 | 1502 | } |
1503 | 1503 | |
@@ -1512,7 +1512,7 @@ discard block |
||
1512 | 1512 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
1513 | 1513 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
1514 | 1514 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
1515 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
1515 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
1516 | 1516 | return isset($this->$name); |
1517 | 1517 | default: |
1518 | 1518 | return false; |
@@ -1530,13 +1530,13 @@ discard block |
||
1530 | 1530 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
1531 | 1531 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
1532 | 1532 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
1533 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
1533 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
1534 | 1534 | unset($this->$name); |
1535 | 1535 | break; |
1536 | 1536 | default: |
1537 | 1537 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1538 | 1538 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1539 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1539 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1540 | 1540 | } |
1541 | 1541 | } |
1542 | 1542 | } |
@@ -57,13 +57,13 @@ discard block |
||
57 | 57 | 'scalar' => $val, |
58 | 58 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
59 | 59 | ); |
60 | - return (object)$xmlrpcVal; |
|
60 | + return (object) $xmlrpcVal; |
|
61 | 61 | case 'base64': |
62 | 62 | $xmlrpcVal = array( |
63 | 63 | 'xmlrpc_type' => 'base64', |
64 | 64 | 'scalar' => $val |
65 | 65 | ); |
66 | - return (object)$xmlrpcVal; |
|
66 | + return (object) $xmlrpcVal; |
|
67 | 67 | case 'string': |
68 | 68 | if (isset($options['extension_api_encoding'])) { |
69 | 69 | // if iconv is not available, we use mb_convert_encoding |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | case 'msg': |
137 | 137 | $paramCount = $xmlrpcVal->getNumParams(); |
138 | 138 | $arr = array(); |
139 | - for ($i = 0; $i < $paramCount; $i++) { |
|
139 | + for ($i = 0; $i<$paramCount; $i++) { |
|
140 | 140 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
141 | 141 | } |
142 | 142 | return $arr; |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | break; |
262 | 262 | case 'resource': |
263 | 263 | if (in_array('extension_api', $options)) { |
264 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
264 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
265 | 265 | } else { |
266 | 266 | $xmlrpcVal = new Value(); |
267 | 267 | } |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
311 | 311 | $xmlVal = utf8_encode($xmlVal); |
312 | 312 | } else { |
313 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
313 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | } |
@@ -336,10 +336,10 @@ discard block |
||
336 | 336 | $_xh = $xmlRpcParser->_xh; |
337 | 337 | } |
338 | 338 | |
339 | - if ($_xh['isf'] > 1) { |
|
339 | + if ($_xh['isf']>1) { |
|
340 | 340 | // test that $_xh['value'] is an obj, too??? |
341 | 341 | |
342 | - $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']); |
|
342 | + $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']); |
|
343 | 343 | |
344 | 344 | return false; |
345 | 345 | } |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | |
361 | 361 | case 'methodcall': |
362 | 362 | $req = new Request($_xh['method']); |
363 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
363 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
364 | 364 | $req->addParam($_xh['params'][$i]); |
365 | 365 | } |
366 | 366 | return $req; |
@@ -187,12 +187,12 @@ discard block |
||
187 | 187 | // q: can php be built without ctype? should we use a regexp? |
188 | 188 | if (is_string($key) && !ctype_digit($key)) { |
189 | 189 | /// @todo on invalid options, throw/error-out instead of logging an error message? |
190 | - switch($key) { |
|
190 | + switch ($key) { |
|
191 | 191 | case 'target_charset': |
192 | 192 | if (function_exists('mb_convert_encoding')) { |
193 | 193 | $this->current_parsing_options['target_charset'] = $val; |
194 | 194 | } else { |
195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
196 | 196 | } |
197 | 197 | break; |
198 | 198 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | if (is_callable($val)) { |
201 | 201 | $this->current_parsing_options['methodname_callback'] = $val; |
202 | 202 | } else { |
203 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
203 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
204 | 204 | } |
205 | 205 | break; |
206 | 206 | |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | break; |
212 | 212 | |
213 | 213 | default: |
214 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
214 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
215 | 215 | } |
216 | 216 | unset($mergedOptions[$key]); |
217 | 217 | } |
@@ -257,10 +257,10 @@ discard block |
||
257 | 257 | |
258 | 258 | try { |
259 | 259 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
260 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
260 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
261 | 261 | $chunk = substr($data, $offset, $this->maxChunkLength); |
262 | 262 | // error handling: xml not well formed |
263 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
263 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
264 | 264 | $errCode = xml_get_error_code($parser); |
265 | 265 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
266 | 266 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | $this->_xh['isf_reason'] = $errStr; |
270 | 270 | } |
271 | 271 | // no need to parse further if we already have a fatal error |
272 | - if ($this->_xh['isf'] >= 2) { |
|
272 | + if ($this->_xh['isf']>=2) { |
|
273 | 273 | break; |
274 | 274 | } |
275 | 275 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
310 | 310 | { |
311 | 311 | // if invalid xml-rpc already detected, skip all processing |
312 | - if ($this->_xh['isf'] >= 2) { |
|
312 | + if ($this->_xh['isf']>=2) { |
|
313 | 313 | return; |
314 | 314 | } |
315 | 315 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | if ($acceptSingleVals === false) { |
324 | 324 | $accept = $this->current_parsing_options['accept']; |
325 | 325 | } else { |
326 | - $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated'); |
|
326 | + $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated'); |
|
327 | 327 | $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE; |
328 | 328 | } |
329 | 329 | if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) || |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | $this->_xh['rt'] = strtolower($name); |
334 | 334 | } else { |
335 | 335 | $this->_xh['isf'] = 2; |
336 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
336 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
337 | 337 | |
338 | 338 | return; |
339 | 339 | } |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | |
436 | 436 | case 'MEMBER': |
437 | 437 | // set member name to null, in case we do not find in the xml later on |
438 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null; |
|
438 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null; |
|
439 | 439 | //$this->_xh['ac']=''; |
440 | 440 | // Drop trough intentionally |
441 | 441 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | */ |
499 | 499 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
500 | 500 | { |
501 | - if ($this->_xh['isf'] >= 2) { |
|
501 | + if ($this->_xh['isf']>=2) { |
|
502 | 502 | return; |
503 | 503 | } |
504 | 504 | |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
521 | 521 | } |
522 | 522 | |
523 | - if ($rebuildXmlrpcvals > 0) { |
|
523 | + if ($rebuildXmlrpcvals>0) { |
|
524 | 524 | // build the xml-rpc val out of the data received, and substitute it |
525 | 525 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
526 | 526 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -528,15 +528,15 @@ discard block |
||
528 | 528 | $temp->_php_class = $this->_xh['php_class']; |
529 | 529 | } |
530 | 530 | $this->_xh['value'] = $temp; |
531 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
531 | + } elseif ($rebuildXmlrpcvals<0) { |
|
532 | 532 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
533 | - $this->_xh['value'] = (object)array( |
|
533 | + $this->_xh['value'] = (object) array( |
|
534 | 534 | 'xmlrpc_type' => 'datetime', |
535 | 535 | 'scalar' => $this->_xh['value'], |
536 | 536 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
537 | 537 | ); |
538 | 538 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
539 | - $this->_xh['value'] = (object)array( |
|
539 | + $this->_xh['value'] = (object) array( |
|
540 | 540 | 'xmlrpc_type' => 'base64', |
541 | 541 | 'scalar' => $this->_xh['value'] |
542 | 542 | ); |
@@ -551,8 +551,8 @@ discard block |
||
551 | 551 | // check if we are inside an array or struct: |
552 | 552 | // if value just built is inside an array, let's move it into array on the stack |
553 | 553 | $vscount = count($this->_xh['valuestack']); |
554 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
555 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
554 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
555 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
556 | 556 | } |
557 | 557 | break; |
558 | 558 | |
@@ -579,7 +579,7 @@ discard block |
||
579 | 579 | // log if receiving something strange, even though we set the value to false anyway |
580 | 580 | /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL |
581 | 581 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) { |
582 | - if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' . |
|
582 | + if (!$this->handleParsingError('invalid data received in BOOLEAN value: '. |
|
583 | 583 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
584 | 584 | return; |
585 | 585 | } |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | $this->_xh['vt'] = strtolower($name); |
600 | 600 | $this->_xh['lv'] = 3; // indicate we've found a value |
601 | 601 | if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) { |
602 | - if (!$this->handleParsingError('non numeric data received in INT value: ' . |
|
602 | + if (!$this->handleParsingError('non numeric data received in INT value: '. |
|
603 | 603 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
604 | 604 | return; |
605 | 605 | } |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
608 | 608 | } else { |
609 | 609 | // it's ok, add it on |
610 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
610 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
611 | 611 | } |
612 | 612 | break; |
613 | 613 | |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | $this->_xh['vt'] = Value::$xmlrpcDouble; |
616 | 616 | $this->_xh['lv'] = 3; // indicate we've found a value |
617 | 617 | if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) { |
618 | - if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' . |
|
618 | + if (!$this->handleParsingError('non numeric data received in DOUBLE value: '. |
|
619 | 619 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
620 | 620 | return; |
621 | 621 | } |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
624 | 624 | } else { |
625 | 625 | // it's ok, add it on |
626 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
626 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
627 | 627 | } |
628 | 628 | break; |
629 | 629 | |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
632 | 632 | $this->_xh['lv'] = 3; // indicate we've found a value |
633 | 633 | if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) { |
634 | - if (!$this->handleParsingError('invalid data received in DATETIME value: ' . |
|
634 | + if (!$this->handleParsingError('invalid data received in DATETIME value: '. |
|
635 | 635 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
636 | 636 | return; |
637 | 637 | } |
@@ -642,9 +642,9 @@ discard block |
||
642 | 642 | |
643 | 643 | // the default regex used to validate the date string a few lines above should make this case impossible, |
644 | 644 | // but one never knows... |
645 | - } catch(\Exception $e) { |
|
645 | + } catch (\Exception $e) { |
|
646 | 646 | // what to do? We can not guarantee that a valid date can be created. We return null... |
647 | - if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' . |
|
647 | + if (!$this->handleParsingError('invalid data received in DATETIME value. Error '. |
|
648 | 648 | $e->getMessage(), __METHOD__)) { |
649 | 649 | return; |
650 | 650 | } |
@@ -661,14 +661,14 @@ discard block |
||
661 | 661 | $v = base64_decode($this->_xh['ac'], true); |
662 | 662 | if ($v === false) { |
663 | 663 | $this->_xh['isf'] = 2; |
664 | - $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']); |
|
664 | + $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']); |
|
665 | 665 | return; |
666 | 666 | } |
667 | 667 | } else { |
668 | 668 | $v = base64_decode($this->_xh['ac']); |
669 | 669 | if ($v === '' && $this->_xh['ac'] !== '') { |
670 | 670 | // only the empty string should decode to the empty string |
671 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' . |
|
671 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '. |
|
672 | 672 | $this->truncateValueForLog($this->_xh['ac'])); |
673 | 673 | } |
674 | 674 | } |
@@ -676,20 +676,20 @@ discard block |
||
676 | 676 | break; |
677 | 677 | |
678 | 678 | case 'NAME': |
679 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
679 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
680 | 680 | break; |
681 | 681 | |
682 | 682 | case 'MEMBER': |
683 | 683 | // add to array in the stack the last element built, unless no VALUE or no NAME were found |
684 | 684 | if ($this->_xh['vt']) { |
685 | 685 | $vscount = count($this->_xh['valuestack']); |
686 | - if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) { |
|
686 | + if ($this->_xh['valuestack'][$vscount-1]['name'] === null) { |
|
687 | 687 | if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) { |
688 | 688 | return; |
689 | 689 | } |
690 | - $this->_xh['valuestack'][$vscount - 1]['name'] = ''; |
|
690 | + $this->_xh['valuestack'][$vscount-1]['name'] = ''; |
|
691 | 691 | } |
692 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
692 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
693 | 693 | } else { |
694 | 694 | if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) { |
695 | 695 | return; |
@@ -805,7 +805,7 @@ discard block |
||
805 | 805 | public function xmlrpc_cd($parser, $data) |
806 | 806 | { |
807 | 807 | // skip processing if xml fault already detected |
808 | - if ($this->_xh['isf'] >= 2) { |
|
808 | + if ($this->_xh['isf']>=2) { |
|
809 | 809 | return; |
810 | 810 | } |
811 | 811 | |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | public function xmlrpc_dh($parser, $data) |
828 | 828 | { |
829 | 829 | // skip processing if xml fault already detected |
830 | - if ($this->_xh['isf'] >= 2) { |
|
830 | + if ($this->_xh['isf']>=2) { |
|
831 | 831 | return; |
832 | 832 | } |
833 | 833 | |
@@ -903,8 +903,8 @@ discard block |
||
903 | 903 | // Details: |
904 | 904 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
905 | 905 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
906 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
907 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
906 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
907 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
908 | 908 | $xmlChunk, $matches)) { |
909 | 909 | return strtoupper(substr($matches[2], 1, -1)); |
910 | 910 | } |
@@ -922,7 +922,7 @@ discard block |
||
922 | 922 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
923 | 923 | // IANA also likes better US-ASCII, so go with it |
924 | 924 | if ($enc == 'ASCII') { |
925 | - $enc = 'US-' . $enc; |
|
925 | + $enc = 'US-'.$enc; |
|
926 | 926 | } |
927 | 927 | |
928 | 928 | return $enc; |
@@ -959,8 +959,8 @@ discard block |
||
959 | 959 | // Details: |
960 | 960 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
961 | 961 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
962 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
963 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
962 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
963 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
964 | 964 | $xmlChunk)) { |
965 | 965 | return true; |
966 | 966 | } |
@@ -980,7 +980,7 @@ discard block |
||
980 | 980 | $this->_xh['isf_reason'] = ucfirst($message); |
981 | 981 | return false; |
982 | 982 | } else { |
983 | - $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message); |
|
983 | + $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message); |
|
984 | 984 | return true; |
985 | 985 | } |
986 | 986 | } |
@@ -992,8 +992,8 @@ discard block |
||
992 | 992 | */ |
993 | 993 | protected function truncateValueForLog($data) |
994 | 994 | { |
995 | - if (strlen($data) > $this->maxLogValueLength) { |
|
996 | - return substr($data, 0, $this->maxLogValueLength - 3) . '...'; |
|
995 | + if (strlen($data)>$this->maxLogValueLength) { |
|
996 | + return substr($data, 0, $this->maxLogValueLength-3).'...'; |
|
997 | 997 | } |
998 | 998 | |
999 | 999 | return $data; |
@@ -1014,7 +1014,7 @@ discard block |
||
1014 | 1014 | public function xmlrpc_se_any($parser, $name, $attrs) |
1015 | 1015 | { |
1016 | 1016 | // this will be spamming the log if this method is in use... |
1017 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
1017 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
1018 | 1018 | |
1019 | 1019 | $this->xmlrpc_se($parser, $name, $attrs, true); |
1020 | 1020 | } |
@@ -1024,12 +1024,12 @@ discard block |
||
1024 | 1024 | switch ($name) { |
1025 | 1025 | case '_xh': |
1026 | 1026 | case 'xmlrpc_valid_parents': |
1027 | - $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated'); |
|
1027 | + $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated'); |
|
1028 | 1028 | return $this->$name; |
1029 | 1029 | default: |
1030 | 1030 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1031 | 1031 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1032 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1032 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1033 | 1033 | $result = null; |
1034 | 1034 | return $result; |
1035 | 1035 | } |
@@ -1040,18 +1040,18 @@ discard block |
||
1040 | 1040 | switch ($name) { |
1041 | 1041 | // this should only ever be called by subclasses which overtook `parse()` |
1042 | 1042 | case 'accept': |
1043 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
1043 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
1044 | 1044 | $this->current_parsing_options['accept'] = $value; |
1045 | 1045 | break; |
1046 | 1046 | case '_xh': |
1047 | 1047 | case 'xmlrpc_valid_parents': |
1048 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
1048 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
1049 | 1049 | $this->$name = $value; |
1050 | 1050 | break; |
1051 | 1051 | default: |
1052 | 1052 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1053 | 1053 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1054 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1054 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1055 | 1055 | } |
1056 | 1056 | } |
1057 | 1057 | |
@@ -1059,11 +1059,11 @@ discard block |
||
1059 | 1059 | { |
1060 | 1060 | switch ($name) { |
1061 | 1061 | case 'accept': |
1062 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
1062 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
1063 | 1063 | return isset($this->current_parsing_options['accept']); |
1064 | 1064 | case '_xh': |
1065 | 1065 | case 'xmlrpc_valid_parents': |
1066 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
1066 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
1067 | 1067 | return isset($this->$name); |
1068 | 1068 | default: |
1069 | 1069 | return false; |
@@ -1075,18 +1075,18 @@ discard block |
||
1075 | 1075 | switch ($name) { |
1076 | 1076 | // q: does this make sense at all? |
1077 | 1077 | case 'accept': |
1078 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
1078 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
1079 | 1079 | unset($this->current_parsing_options['accept']); |
1080 | 1080 | break; |
1081 | 1081 | case '_xh': |
1082 | 1082 | case 'xmlrpc_valid_parents': |
1083 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
1083 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
1084 | 1084 | unset($this->$name); |
1085 | 1085 | break; |
1086 | 1086 | default: |
1087 | 1087 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
1088 | 1088 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
1089 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
1089 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
1090 | 1090 | } |
1091 | 1091 | } |
1092 | 1092 | } |