gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc - Introspect demo</title></head> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | function display_error($r) |
| 18 | 18 | { |
| 19 | 19 | output("An error occurred: "); |
| 20 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
| 20 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | $client = new Client(XMLRPCSERVER); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP); |
| 26 | 26 | |
| 27 | 27 | // First off, let's retrieve the list of methods available on the remote server |
| 28 | -output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n"); |
|
| 28 | +output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n"); |
|
| 29 | 29 | $req = new Request('system.listMethods'); |
| 30 | 30 | $resp = $client->send($req); |
| 31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | // Then, retrieve the signature and help text of each available method |
| 49 | 49 | foreach ($v as $methodName) { |
| 50 | - output("<h4>" . htmlspecialchars($methodName) . "</h4>\n"); |
|
| 50 | + output("<h4>".htmlspecialchars($methodName)."</h4>\n"); |
|
| 51 | 51 | // build requests first, add params later |
| 52 | 52 | $r1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 53 | 53 | $r2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | continue; |
| 84 | 84 | } |
| 85 | 85 | $ret = $sig[0]; |
| 86 | - output("<code>" . htmlspecialchars($ret) . " " |
|
| 87 | - . htmlspecialchars($methodName) . "("); |
|
| 88 | - if (count($sig) > 1) { |
|
| 89 | - for ($k = 1; $k < count($sig); $k++) { |
|
| 86 | + output("<code>".htmlspecialchars($ret)." " |
|
| 87 | + . htmlspecialchars($methodName)."("); |
|
| 88 | + if (count($sig)>1) { |
|
| 89 | + for ($k = 1; $k<count($sig); $k++) { |
|
| 90 | 90 | output(htmlspecialchars($sig[$k])); |
| 91 | - if ($k < count($sig) - 1) { |
|
| 91 | + if ($k<count($sig)-1) { |
|
| 92 | 92 | output(", "); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -2011,9 +2011,9 @@ |
||
| 2011 | 2011 | * @return false|\CurlHandle|resource |
| 2012 | 2012 | */ |
| 2013 | 2013 | protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 2014 | - $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 2015 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 2016 | - $keyPass = '', $sslVersion = 0) |
|
| 2014 | + $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 2015 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 2016 | + $keyPass = '', $sslVersion = 0) |
|
| 2017 | 2017 | { |
| 2018 | 2018 | $this->logDeprecationUnlessCalledBy('sendViaCURL'); |
| 2019 | 2019 | |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | $server = $parts['host']; |
| 336 | 336 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 337 | 337 | if (isset($parts['query'])) { |
| 338 | - $path .= '?' . $parts['query']; |
|
| 338 | + $path .= '?'.$parts['query']; |
|
| 339 | 339 | } |
| 340 | 340 | if (isset($parts['fragment'])) { |
| 341 | - $path .= '#' . $parts['fragment']; |
|
| 341 | + $path .= '#'.$parts['fragment']; |
|
| 342 | 342 | } |
| 343 | 343 | if (isset($parts['port'])) { |
| 344 | 344 | $port = $parts['port']; |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | if ($path == '' || $path[0] != '/') { |
| 357 | - $this->path = '/' . $path; |
|
| 357 | + $this->path = '/'.$path; |
|
| 358 | 358 | } else { |
| 359 | 359 | $this->path = $path; |
| 360 | 360 | } |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | //$this->accepted_charset_encodings = $ch->knownCharsets(); |
| 387 | 387 | |
| 388 | 388 | // initialize user_agent string |
| 389 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 389 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | /** |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | */ |
| 559 | 559 | public function setSSLVerifyPeer($i) |
| 560 | 560 | { |
| 561 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 561 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 562 | 562 | |
| 563 | 563 | $this->verifypeer = $i; |
| 564 | 564 | return $this; |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | */ |
| 576 | 576 | public function setSSLVerifyHost($i) |
| 577 | 577 | { |
| 578 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 578 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 579 | 579 | |
| 580 | 580 | $this->verifyhost = $i; |
| 581 | 581 | return $this; |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | public function setSSLVersion($i) |
| 592 | 592 | { |
| 593 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 593 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 594 | 594 | |
| 595 | 595 | $this->sslversion = $i; |
| 596 | 596 | return $this; |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | */ |
| 656 | 656 | public function setRequestCompression($compMethod) |
| 657 | 657 | { |
| 658 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 658 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 659 | 659 | |
| 660 | 660 | $this->request_compression = $compMethod; |
| 661 | 661 | return $this; |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | */ |
| 706 | 706 | public function setCurlOptions($options) |
| 707 | 707 | { |
| 708 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 708 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 709 | 709 | |
| 710 | 710 | $this->extracurlopts = $options; |
| 711 | 711 | return $this; |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | */ |
| 719 | 719 | public function setUseCurl($useCurlMode) |
| 720 | 720 | { |
| 721 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 721 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 722 | 722 | |
| 723 | 723 | $this->use_curl = $useCurlMode; |
| 724 | 724 | return $this; |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | */ |
| 737 | 737 | public function setUserAgent($agentString) |
| 738 | 738 | { |
| 739 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 739 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 740 | 740 | |
| 741 | 741 | $this->user_agent = $agentString; |
| 742 | 742 | return $this; |
@@ -767,12 +767,12 @@ discard block |
||
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | |
| 770 | - $url = $this->method . '://' . $this->server; |
|
| 770 | + $url = $this->method.'://'.$this->server; |
|
| 771 | 771 | if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) || |
| 772 | 772 | ($this->port == 443 && in_array($this->method, array('https', 'h2')))) { |
| 773 | - return $url . $this->path; |
|
| 773 | + return $url.$this->path; |
|
| 774 | 774 | } else { |
| 775 | - return $url . ':' . $this->port . $this->path; |
|
| 775 | + return $url.':'.$this->port.$this->path; |
|
| 776 | 776 | } |
| 777 | 777 | } |
| 778 | 778 | |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | public function send($req, $timeout = 0, $method = '') |
| 813 | 813 | { |
| 814 | 814 | if ($method !== '' || $timeout !== 0) { |
| 815 | - $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated'); |
|
| 815 | + $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated'); |
|
| 816 | 816 | } |
| 817 | 817 | |
| 818 | 818 | // if user does not specify http protocol, use native method of this client |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | $payload = $a; |
| 932 | 932 | $encodingHdr = "Content-Encoding: gzip\r\n"; |
| 933 | 933 | } else { |
| 934 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 934 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 935 | 935 | } |
| 936 | 936 | } else if (function_exists('gzcompress')) { |
| 937 | 937 | $a = @gzcompress($payload); |
@@ -939,14 +939,14 @@ discard block |
||
| 939 | 939 | $payload = $a; |
| 940 | 940 | $encodingHdr = "Content-Encoding: deflate\r\n"; |
| 941 | 941 | } else { |
| 942 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 942 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 943 | 943 | } |
| 944 | 944 | } else { |
| 945 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 945 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 946 | 946 | } |
| 947 | 947 | } else { |
| 948 | 948 | if ($opts['request_compression'] != '') { |
| 949 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 949 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 950 | 950 | } |
| 951 | 951 | } |
| 952 | 952 | |
@@ -954,16 +954,16 @@ discard block |
||
| 954 | 954 | $credentials = ''; |
| 955 | 955 | if ($opts['username'] != '') { |
| 956 | 956 | if ($opts['authtype'] != 1) { |
| 957 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 957 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 958 | 958 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 959 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0'); |
|
| 959 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0'); |
|
| 960 | 960 | } |
| 961 | - $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n"; |
|
| 961 | + $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n"; |
|
| 962 | 962 | } |
| 963 | 963 | |
| 964 | 964 | $acceptedEncoding = ''; |
| 965 | 965 | if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) { |
| 966 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n"; |
|
| 966 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n"; |
|
| 967 | 967 | } |
| 968 | 968 | |
| 969 | 969 | if ($port == 0) { |
@@ -979,15 +979,15 @@ discard block |
||
| 979 | 979 | $connectPort = $opts['proxyport']; |
| 980 | 980 | $transport = 'tcp'; |
| 981 | 981 | /// @todo check: should we not use https in some cases? |
| 982 | - $uri = 'http://' . $server . ':' . $port . $path; |
|
| 982 | + $uri = 'http://'.$server.':'.$port.$path; |
|
| 983 | 983 | if ($opts['proxy_user'] != '') { |
| 984 | 984 | if ($opts['proxy_authtype'] != 1) { |
| 985 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 985 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 986 | 986 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 987 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 987 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 988 | 988 | } |
| 989 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' . |
|
| 990 | - $opts['proxy_pass']) . "\r\n"; |
|
| 989 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'. |
|
| 990 | + $opts['proxy_pass'])."\r\n"; |
|
| 991 | 991 | } |
| 992 | 992 | } else { |
| 993 | 993 | $connectServer = $server; |
@@ -1003,38 +1003,38 @@ discard block |
||
| 1003 | 1003 | $version = ''; |
| 1004 | 1004 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1005 | 1005 | /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments |
| 1006 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 1006 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 1007 | 1007 | } |
| 1008 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 1008 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 1009 | 1009 | } |
| 1010 | 1010 | |
| 1011 | 1011 | $extraHeaders = ''; |
| 1012 | 1012 | if (is_array($this->extra_headers) && $this->extra_headers) { |
| 1013 | - $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n"; |
|
| 1013 | + $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n"; |
|
| 1014 | 1014 | } |
| 1015 | 1015 | |
| 1016 | 1016 | // omit port if default |
| 1017 | 1017 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 1018 | 1018 | $port = ''; |
| 1019 | 1019 | } else { |
| 1020 | - $port = ':' . $port; |
|
| 1021 | - } |
|
| 1022 | - |
|
| 1023 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 1024 | - 'User-Agent: ' . $opts['user_agent'] . "\r\n" . |
|
| 1025 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 1026 | - $credentials . |
|
| 1027 | - $proxyCredentials . |
|
| 1028 | - $acceptedEncoding . |
|
| 1029 | - $encodingHdr . |
|
| 1030 | - 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" . |
|
| 1031 | - $cookieHeader . |
|
| 1032 | - 'Content-Type: ' . $req->getContentType() . "\r\n" . |
|
| 1033 | - $extraHeaders . |
|
| 1034 | - 'Content-Length: ' . strlen($payload) . "\r\n\r\n" . |
|
| 1020 | + $port = ':'.$port; |
|
| 1021 | + } |
|
| 1022 | + |
|
| 1023 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 1024 | + 'User-Agent: '.$opts['user_agent']."\r\n". |
|
| 1025 | + 'Host: '.$server.$port."\r\n". |
|
| 1026 | + $credentials. |
|
| 1027 | + $proxyCredentials. |
|
| 1028 | + $acceptedEncoding. |
|
| 1029 | + $encodingHdr. |
|
| 1030 | + 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n". |
|
| 1031 | + $cookieHeader. |
|
| 1032 | + 'Content-Type: '.$req->getContentType()."\r\n". |
|
| 1033 | + $extraHeaders. |
|
| 1034 | + 'Content-Length: '.strlen($payload)."\r\n\r\n". |
|
| 1035 | 1035 | $payload; |
| 1036 | 1036 | |
| 1037 | - if ($opts['debug'] > 1) { |
|
| 1037 | + if ($opts['debug']>1) { |
|
| 1038 | 1038 | $this->getLogger()->debug("---SENDING---\n$op\n---END---"); |
| 1039 | 1039 | } |
| 1040 | 1040 | |
@@ -1060,7 +1060,7 @@ discard block |
||
| 1060 | 1060 | |
| 1061 | 1061 | if ($opts['sslversion'] != 0) { |
| 1062 | 1062 | /// @see https://www.php.net/manual/en/function.curl-setopt.php, https://www.php.net/manual/en/migration56.openssl.php |
| 1063 | - switch($opts['sslversion']) { |
|
| 1063 | + switch ($opts['sslversion']) { |
|
| 1064 | 1064 | /// @todo what does this map to? 1.0-1.3? |
| 1065 | 1065 | //case 1: // TLSv1 |
| 1066 | 1066 | // break; |
@@ -1084,12 +1084,12 @@ discard block |
||
| 1084 | 1084 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT; |
| 1085 | 1085 | } else { |
| 1086 | 1086 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1087 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1087 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1088 | 1088 | } |
| 1089 | 1089 | break; |
| 1090 | 1090 | default: |
| 1091 | 1091 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1092 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version'); |
|
| 1092 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version'); |
|
| 1093 | 1093 | } |
| 1094 | 1094 | } |
| 1095 | 1095 | } |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | |
| 1103 | 1103 | $context = stream_context_create($contextOptions); |
| 1104 | 1104 | |
| 1105 | - if ($opts['timeout'] <= 0) { |
|
| 1105 | + if ($opts['timeout']<=0) { |
|
| 1106 | 1106 | $connectTimeout = ini_get('default_socket_timeout'); |
| 1107 | 1107 | } else { |
| 1108 | 1108 | $connectTimeout = $opts['timeout']; |
@@ -1114,7 +1114,7 @@ discard block |
||
| 1114 | 1114 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 1115 | 1115 | STREAM_CLIENT_CONNECT, $context); |
| 1116 | 1116 | if ($fp) { |
| 1117 | - if ($opts['timeout'] > 0) { |
|
| 1117 | + if ($opts['timeout']>0) { |
|
| 1118 | 1118 | stream_set_timeout($fp, $opts['timeout'], 0); |
| 1119 | 1119 | } |
| 1120 | 1120 | } else { |
@@ -1123,8 +1123,8 @@ discard block |
||
| 1123 | 1123 | $this->errstr = $err['message']; |
| 1124 | 1124 | } |
| 1125 | 1125 | |
| 1126 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 1127 | - $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 1126 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 1127 | + $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 1128 | 1128 | |
| 1129 | 1129 | return $r; |
| 1130 | 1130 | } |
@@ -1191,19 +1191,19 @@ discard block |
||
| 1191 | 1191 | $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']); |
| 1192 | 1192 | |
| 1193 | 1193 | if (!$curl) { |
| 1194 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1194 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1195 | 1195 | ': error during curl initialization. Check php error log for details'); |
| 1196 | 1196 | } |
| 1197 | 1197 | |
| 1198 | 1198 | $result = curl_exec($curl); |
| 1199 | 1199 | |
| 1200 | - if ($opts['debug'] > 1) { |
|
| 1200 | + if ($opts['debug']>1) { |
|
| 1201 | 1201 | $message = "---CURL INFO---\n"; |
| 1202 | 1202 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1203 | 1203 | if (is_array($val)) { |
| 1204 | 1204 | $val = implode("\n", $val); |
| 1205 | 1205 | } |
| 1206 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1206 | + $message .= $name.': '.$val."\n"; |
|
| 1207 | 1207 | } |
| 1208 | 1208 | $message .= '---END---'; |
| 1209 | 1209 | $this->getLogger()->debug($message); |
@@ -1213,8 +1213,8 @@ discard block |
||
| 1213 | 1213 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1214 | 1214 | |
| 1215 | 1215 | $this->errstr = 'no response'; |
| 1216 | - $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1217 | - ': ' . curl_error($curl)); |
|
| 1216 | + $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1217 | + ': '.curl_error($curl)); |
|
| 1218 | 1218 | curl_close($curl); |
| 1219 | 1219 | if ($opts['keepalive']) { |
| 1220 | 1220 | $this->xmlrpc_curl_handle = null; |
@@ -1272,7 +1272,7 @@ discard block |
||
| 1272 | 1272 | $payload = $a; |
| 1273 | 1273 | $encodingHdr = 'Content-Encoding: gzip'; |
| 1274 | 1274 | } else { |
| 1275 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 1275 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 1276 | 1276 | } |
| 1277 | 1277 | } else if (function_exists('gzcompress')) { |
| 1278 | 1278 | $a = @gzcompress($payload); |
@@ -1280,14 +1280,14 @@ discard block |
||
| 1280 | 1280 | $payload = $a; |
| 1281 | 1281 | $encodingHdr = 'Content-Encoding: deflate'; |
| 1282 | 1282 | } else { |
| 1283 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 1283 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 1284 | 1284 | } |
| 1285 | 1285 | } else { |
| 1286 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 1286 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 1287 | 1287 | } |
| 1288 | 1288 | } else { |
| 1289 | 1289 | if ($opts['request_compression'] != '') { |
| 1290 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 1290 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 1291 | 1291 | } |
| 1292 | 1292 | } |
| 1293 | 1293 | |
@@ -1301,12 +1301,12 @@ discard block |
||
| 1301 | 1301 | // http, https |
| 1302 | 1302 | $protocol = $method; |
| 1303 | 1303 | if (strpos($protocol, ':') !== false) { |
| 1304 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1304 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1305 | 1305 | return false; |
| 1306 | 1306 | } |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
| 1309 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $path); |
|
| 1309 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$path); |
|
| 1310 | 1310 | if (!$curl) { |
| 1311 | 1311 | return false; |
| 1312 | 1312 | } |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | // results into variable |
| 1321 | 1321 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1322 | 1322 | |
| 1323 | - if ($opts['debug'] > 1) { |
|
| 1323 | + if ($opts['debug']>1) { |
|
| 1324 | 1324 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1325 | 1325 | /// @todo redirect curlopt_stderr to some stream which can be piped to the logger |
| 1326 | 1326 | } |
@@ -1345,7 +1345,7 @@ discard block |
||
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | 1347 | // extra headers |
| 1348 | - $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings'])); |
|
| 1348 | + $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])); |
|
| 1349 | 1349 | // if no keepalive is wanted, let the server know it in advance |
| 1350 | 1350 | if (!$opts['keepalive']) { |
| 1351 | 1351 | $headers[] = 'Connection: close'; |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1367 | 1367 | // timeout is borked |
| 1368 | 1368 | if ($opts['timeout']) { |
| 1369 | - curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout'] - 1); |
|
| 1369 | + curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout']-1); |
|
| 1370 | 1370 | } |
| 1371 | 1371 | |
| 1372 | 1372 | switch ($method) { |
@@ -1380,7 +1380,7 @@ discard block |
||
| 1380 | 1380 | if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) { |
| 1381 | 1381 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1382 | 1382 | } else { |
| 1383 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1383 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1384 | 1384 | curl_close($curl); |
| 1385 | 1385 | return false; |
| 1386 | 1386 | } |
@@ -1391,11 +1391,11 @@ discard block |
||
| 1391 | 1391 | } |
| 1392 | 1392 | |
| 1393 | 1393 | if ($opts['username'] && $opts['password']) { |
| 1394 | - curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']); |
|
| 1394 | + curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']); |
|
| 1395 | 1395 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1396 | 1396 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1397 | 1397 | } elseif ($opts['authtype'] != 1) { |
| 1398 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1398 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1399 | 1399 | curl_close($curl); |
| 1400 | 1400 | return false; |
| 1401 | 1401 | } |
@@ -1440,13 +1440,13 @@ discard block |
||
| 1440 | 1440 | if ($opts['proxyport'] == 0) { |
| 1441 | 1441 | $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1442 | 1442 | } |
| 1443 | - curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']); |
|
| 1443 | + curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']); |
|
| 1444 | 1444 | if ($opts['proxy_user']) { |
| 1445 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']); |
|
| 1445 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']); |
|
| 1446 | 1446 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1447 | 1447 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1448 | 1448 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1449 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1449 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1450 | 1450 | curl_close($curl); |
| 1451 | 1451 | return false; |
| 1452 | 1452 | } |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | if (count($opts['cookies'])) { |
| 1459 | 1459 | $cookieHeader = ''; |
| 1460 | 1460 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1461 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1461 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1462 | 1462 | } |
| 1463 | 1463 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1464 | 1464 | } |
@@ -1467,7 +1467,7 @@ discard block |
||
| 1467 | 1467 | curl_setopt($curl, $opt, $val); |
| 1468 | 1468 | } |
| 1469 | 1469 | |
| 1470 | - if ($opts['debug'] > 1) { |
|
| 1470 | + if ($opts['debug']>1) { |
|
| 1471 | 1471 | $this->getLogger()->debug("---SENDING---\n$payload\n---END---"); |
| 1472 | 1472 | } |
| 1473 | 1473 | |
@@ -1568,7 +1568,7 @@ discard block |
||
| 1568 | 1568 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1569 | 1569 | $numParams = $req->getNumParams(); |
| 1570 | 1570 | $params = array(); |
| 1571 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1571 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1572 | 1572 | $params[$i] = $req->getParam($i); |
| 1573 | 1573 | } |
| 1574 | 1574 | $call['params'] = new Value($params, 'array'); |
@@ -1590,7 +1590,7 @@ discard block |
||
| 1590 | 1590 | $response = array(); |
| 1591 | 1591 | |
| 1592 | 1592 | if ($this->return_type == 'xml') { |
| 1593 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1593 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1594 | 1594 | $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse()); |
| 1595 | 1595 | } |
| 1596 | 1596 | |
@@ -1598,21 +1598,21 @@ discard block |
||
| 1598 | 1598 | if (!is_array($rets)) { |
| 1599 | 1599 | // bad return type from system.multicall |
| 1600 | 1600 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1601 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1601 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1602 | 1602 | } |
| 1603 | 1603 | $numRets = count($rets); |
| 1604 | 1604 | if ($numRets != count($reqs)) { |
| 1605 | 1605 | // wrong number of return values. |
| 1606 | 1606 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1607 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1607 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1608 | 1608 | $result->httpResponse()); |
| 1609 | 1609 | } |
| 1610 | 1610 | |
| 1611 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1611 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1612 | 1612 | $val = $rets[$i]; |
| 1613 | 1613 | if (!is_array($val)) { |
| 1614 | 1614 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1615 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1615 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1616 | 1616 | 'phpvals', $result->httpResponse()); |
| 1617 | 1617 | } |
| 1618 | 1618 | switch (count($val)) { |
@@ -1620,7 +1620,7 @@ discard block |
||
| 1620 | 1620 | if (!isset($val[0])) { |
| 1621 | 1621 | // Bad value |
| 1622 | 1622 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1623 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1623 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1624 | 1624 | 'phpvals', $result->httpResponse()); |
| 1625 | 1625 | } |
| 1626 | 1626 | // Normal return value |
@@ -1632,20 +1632,20 @@ discard block |
||
| 1632 | 1632 | if (!is_int($code)) { |
| 1633 | 1633 | /// @todo should we check that it is != 0? |
| 1634 | 1634 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1635 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1635 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1636 | 1636 | 'phpvals', $result->httpResponse()); |
| 1637 | 1637 | } |
| 1638 | 1638 | $str = @$val['faultString']; |
| 1639 | 1639 | if (!is_string($str)) { |
| 1640 | 1640 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1641 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1641 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1642 | 1642 | 'phpvals', $result->httpResponse()); |
| 1643 | 1643 | } |
| 1644 | 1644 | $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1645 | 1645 | break; |
| 1646 | 1646 | default: |
| 1647 | 1647 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1648 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1648 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1649 | 1649 | 'phpvals', $result->httpResponse()); |
| 1650 | 1650 | } |
| 1651 | 1651 | } |
@@ -1654,14 +1654,14 @@ discard block |
||
| 1654 | 1654 | // return type == 'xmlrpcvals' |
| 1655 | 1655 | if ($rets->kindOf() != 'array') { |
| 1656 | 1656 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1657 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1657 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1658 | 1658 | $result->httpResponse()); |
| 1659 | 1659 | } |
| 1660 | 1660 | $numRets = $rets->count(); |
| 1661 | 1661 | if ($numRets != count($reqs)) { |
| 1662 | 1662 | // wrong number of return values. |
| 1663 | 1663 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1664 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1664 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1665 | 1665 | $result->httpResponse()); |
| 1666 | 1666 | } |
| 1667 | 1667 | |
@@ -1670,7 +1670,7 @@ discard block |
||
| 1670 | 1670 | case 'array': |
| 1671 | 1671 | if ($val->count() != 1) { |
| 1672 | 1672 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1673 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1673 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1674 | 1674 | 'phpvals', $result->httpResponse()); |
| 1675 | 1675 | } |
| 1676 | 1676 | // Normal return value |
@@ -1679,28 +1679,28 @@ discard block |
||
| 1679 | 1679 | case 'struct': |
| 1680 | 1680 | if ($val->count() != 2) { |
| 1681 | 1681 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1682 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1682 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1683 | 1683 | 'phpvals', $result->httpResponse()); |
| 1684 | 1684 | } |
| 1685 | 1685 | /** @var Value $code */ |
| 1686 | 1686 | $code = $val['faultCode']; |
| 1687 | 1687 | if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') { |
| 1688 | 1688 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1689 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1689 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1690 | 1690 | 'xmlrpcvals', $result->httpResponse()); |
| 1691 | 1691 | } |
| 1692 | 1692 | /** @var Value $str */ |
| 1693 | 1693 | $str = $val['faultString']; |
| 1694 | 1694 | if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') { |
| 1695 | 1695 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1696 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1696 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1697 | 1697 | 'xmlrpcvals', $result->httpResponse()); |
| 1698 | 1698 | } |
| 1699 | 1699 | $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse()); |
| 1700 | 1700 | break; |
| 1701 | 1701 | default: |
| 1702 | 1702 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1703 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1703 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1704 | 1704 | 'xmlrpcvals', $result->httpResponse()); |
| 1705 | 1705 | } |
| 1706 | 1706 | } |
@@ -1733,7 +1733,7 @@ discard block |
||
| 1733 | 1733 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 1734 | 1734 | $method = 'http') |
| 1735 | 1735 | { |
| 1736 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1736 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1737 | 1737 | |
| 1738 | 1738 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 1739 | 1739 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -1769,7 +1769,7 @@ discard block |
||
| 1769 | 1769 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 1770 | 1770 | $sslVersion = 0) |
| 1771 | 1771 | { |
| 1772 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1772 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1773 | 1773 | |
| 1774 | 1774 | return $this->sendPayloadCURL($req, $server, $port, $timeout, $username, |
| 1775 | 1775 | $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort, |
@@ -1982,7 +1982,7 @@ discard block |
||
| 1982 | 1982 | public function &__get($name) |
| 1983 | 1983 | { |
| 1984 | 1984 | if (in_array($name, static::$options)) { |
| 1985 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1985 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1986 | 1986 | return $this->$name; |
| 1987 | 1987 | } |
| 1988 | 1988 | |
@@ -1993,12 +1993,12 @@ discard block |
||
| 1993 | 1993 | case 'server': |
| 1994 | 1994 | case 'port': |
| 1995 | 1995 | case 'path': |
| 1996 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1996 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1997 | 1997 | return $this->$name; |
| 1998 | 1998 | default: |
| 1999 | 1999 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2000 | 2000 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2001 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2001 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2002 | 2002 | $result = null; |
| 2003 | 2003 | return $result; |
| 2004 | 2004 | } |
@@ -2007,7 +2007,7 @@ discard block |
||
| 2007 | 2007 | public function __set($name, $value) |
| 2008 | 2008 | { |
| 2009 | 2009 | if (in_array($name, static::$options)) { |
| 2010 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2010 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2011 | 2011 | $this->$name = $value; |
| 2012 | 2012 | return; |
| 2013 | 2013 | } |
@@ -2019,20 +2019,20 @@ discard block |
||
| 2019 | 2019 | case 'server': |
| 2020 | 2020 | case 'port': |
| 2021 | 2021 | case 'path': |
| 2022 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2022 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2023 | 2023 | $this->$name = $value; |
| 2024 | 2024 | return; |
| 2025 | 2025 | default: |
| 2026 | 2026 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2027 | 2027 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2028 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2028 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2029 | 2029 | } |
| 2030 | 2030 | } |
| 2031 | 2031 | |
| 2032 | 2032 | public function __isset($name) |
| 2033 | 2033 | { |
| 2034 | 2034 | if (in_array($name, static::$options)) { |
| 2035 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2035 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2036 | 2036 | return isset($this->$name); |
| 2037 | 2037 | } |
| 2038 | 2038 | |
@@ -2043,7 +2043,7 @@ discard block |
||
| 2043 | 2043 | case 'server': |
| 2044 | 2044 | case 'port': |
| 2045 | 2045 | case 'path': |
| 2046 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2046 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2047 | 2047 | return isset($this->$name); |
| 2048 | 2048 | default: |
| 2049 | 2049 | return false; |
@@ -2053,7 +2053,7 @@ discard block |
||
| 2053 | 2053 | public function __unset($name) |
| 2054 | 2054 | { |
| 2055 | 2055 | if (in_array($name, static::$options)) { |
| 2056 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2056 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2057 | 2057 | unset($this->$name); |
| 2058 | 2058 | return; |
| 2059 | 2059 | } |
@@ -2065,13 +2065,13 @@ discard block |
||
| 2065 | 2065 | case 'server': |
| 2066 | 2066 | case 'port': |
| 2067 | 2067 | case 'path': |
| 2068 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2068 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2069 | 2069 | unset($this->$name); |
| 2070 | 2070 | return; |
| 2071 | 2071 | default: |
| 2072 | 2072 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2073 | 2073 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2074 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2074 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2075 | 2075 | } |
| 2076 | 2076 | } |
| 2077 | 2077 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $message); |
|
| 17 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$message); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] . |
|
| 38 | - ' is only supposed to be called by ' . $expectedCaller); |
|
| 37 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function']. |
|
| 38 | + ' is only supposed to be called by '.$expectedCaller); |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 79 | 79 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 80 | 80 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 81 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 81 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -165,34 +165,34 @@ discard block |
||
| 165 | 165 | public function serialize($charsetEncoding = '') |
| 166 | 166 | { |
| 167 | 167 | if ($charsetEncoding != '') { |
| 168 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 168 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 169 | 169 | } else { |
| 170 | 170 | $this->content_type = 'text/xml'; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 174 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 174 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 175 | 175 | } else { |
| 176 | 176 | $result = "<methodResponse>\n"; |
| 177 | 177 | } |
| 178 | 178 | if ($this->errno) { |
| 179 | 179 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 180 | - $result .= "<fault>\n" . |
|
| 181 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 182 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 183 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 180 | + $result .= "<fault>\n". |
|
| 181 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 182 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 183 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 184 | 184 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 185 | 185 | } else { |
| 186 | 186 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 187 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 187 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 188 | 188 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 189 | - $result .= "<params>\n<param>\n" . |
|
| 190 | - $this->val . |
|
| 189 | + $result .= "<params>\n<param>\n". |
|
| 190 | + $this->val. |
|
| 191 | 191 | "</param>\n</params>"; |
| 192 | 192 | } else if ($this->valtyp == 'phpvals') { |
| 193 | 193 | $encoder = new Encoder(); |
| 194 | 194 | $val = $encoder->encode($this->val); |
| 195 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 195 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 196 | 196 | } else { |
| 197 | 197 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 198 | 198 | } |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | public function xml_header($charsetEncoding = '') |
| 212 | 212 | { |
| 213 | 213 | if ($charsetEncoding != '') { |
| 214 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 214 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 215 | 215 | } else { |
| 216 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 216 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | case 'errstr': |
| 230 | 230 | case 'payload': |
| 231 | 231 | case 'content_type': |
| 232 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 232 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 233 | 233 | return $this->$name; |
| 234 | 234 | case 'hdrs': |
| 235 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 235 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 236 | 236 | return $this->httpResponse['headers']; |
| 237 | 237 | case '_cookies': |
| 238 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 238 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 239 | 239 | return $this->httpResponse['cookies']; |
| 240 | 240 | case 'raw_data': |
| 241 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return $this->httpResponse['raw_data']; |
| 243 | 243 | default: |
| 244 | 244 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 245 | 245 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 246 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 246 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 247 | 247 | $result = null; |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -258,25 +258,25 @@ discard block |
||
| 258 | 258 | case 'errstr': |
| 259 | 259 | case 'payload': |
| 260 | 260 | case 'content_type': |
| 261 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 261 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 262 | 262 | $this->$name = $value; |
| 263 | 263 | break; |
| 264 | 264 | case 'hdrs': |
| 265 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 265 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 266 | 266 | $this->httpResponse['headers'] = $value; |
| 267 | 267 | break; |
| 268 | 268 | case '_cookies': |
| 269 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 269 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 270 | 270 | $this->httpResponse['cookies'] = $value; |
| 271 | 271 | break; |
| 272 | 272 | case 'raw_data': |
| 273 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 273 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 274 | 274 | $this->httpResponse['raw_data'] = $value; |
| 275 | 275 | break; |
| 276 | 276 | default: |
| 277 | 277 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 278 | 278 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 279 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 279 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | case 'errstr': |
| 290 | 290 | case 'payload': |
| 291 | 291 | case 'content_type': |
| 292 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 292 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 293 | 293 | return isset($this->$name); |
| 294 | 294 | case 'hdrs': |
| 295 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 295 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 296 | 296 | return isset($this->httpResponse['headers']); |
| 297 | 297 | case '_cookies': |
| 298 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 298 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 299 | 299 | return isset($this->httpResponse['cookies']); |
| 300 | 300 | case 'raw_data': |
| 301 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 301 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 302 | 302 | return isset($this->httpResponse['raw_data']); |
| 303 | 303 | default: |
| 304 | 304 | return false; |
@@ -314,25 +314,25 @@ discard block |
||
| 314 | 314 | case 'errstr': |
| 315 | 315 | case 'payload': |
| 316 | 316 | case 'content_type': |
| 317 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 317 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 318 | 318 | unset($this->$name); |
| 319 | 319 | break; |
| 320 | 320 | case 'hdrs': |
| 321 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 321 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 322 | 322 | unset($this->httpResponse['headers']); |
| 323 | 323 | break; |
| 324 | 324 | case '_cookies': |
| 325 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 325 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 326 | 326 | unset($this->httpResponse['cookies']); |
| 327 | 327 | break; |
| 328 | 328 | case 'raw_data': |
| 329 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 329 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 330 | 330 | unset($this->httpResponse['raw_data']); |
| 331 | 331 | break; |
| 332 | 332 | default: |
| 333 | 333 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 334 | 334 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 335 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 335 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
@@ -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 | } |
@@ -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); |
@@ -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; |
@@ -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 | - $this->add_to_map($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling); |
|
| 466 | + $this->add_to_map($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling); |
|
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | /** |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function getOptions() |
| 252 | 252 | { |
| 253 | 253 | $values = array(); |
| 254 | - foreach(static::$options as $opt) { |
|
| 254 | + foreach (static::$options as $opt) { |
|
| 255 | 255 | $values[$opt] = $this->getOption($opt); |
| 256 | 256 | } |
| 257 | 257 | return $values; |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | */ |
| 265 | 265 | public function setOptions($options) |
| 266 | 266 | { |
| 267 | - foreach($options as $name => $value) { |
|
| 267 | + foreach ($options as $name => $value) { |
|
| 268 | 268 | $this->setOption($name, $value); |
| 269 | 269 | } |
| 270 | 270 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public static function xmlrpc_debugmsg($msg) |
| 304 | 304 | { |
| 305 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 305 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | */ |
| 315 | 315 | public static function error_occurred($msg) |
| 316 | 316 | { |
| 317 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 317 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | /** |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 336 | 336 | $out = ''; |
| 337 | 337 | if ($this->debug_info != '') { |
| 338 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 338 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 339 | 339 | } |
| 340 | 340 | if (static::$_xmlrpc_debuginfo != '') { |
| 341 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 341 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 342 | 342 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 343 | 343 | // into return payload AFTER the beginning tag |
| 344 | 344 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -367,8 +367,8 @@ discard block |
||
| 367 | 367 | $this->debug_info = ''; |
| 368 | 368 | |
| 369 | 369 | // Save what we received, before parsing it |
| 370 | - if ($this->debug > 1) { |
|
| 371 | - $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 370 | + if ($this->debug>1) { |
|
| 371 | + $this->debugMsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -385,13 +385,13 @@ discard block |
||
| 385 | 385 | $resp->raw_data = $rawData; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | - $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 390 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 388 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | + $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 390 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | $header = $resp->xml_header($respCharset); |
| 394 | - if ($this->debug > 0) { |
|
| 394 | + if ($this->debug>0) { |
|
| 395 | 395 | $header .= $this->serializeDebug($respCharset); |
| 396 | 396 | } |
| 397 | 397 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | if (empty($payload)) { |
| 403 | 403 | $payload = $resp->serialize($respCharset); |
| 404 | 404 | } |
| 405 | - $payload = $header . $payload; |
|
| 405 | + $payload = $header.$payload; |
|
| 406 | 406 | |
| 407 | 407 | if ($returnPayload) { |
| 408 | 408 | return $payload; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | // if we get a warning/error that has output some text before here, then we cannot |
| 412 | 412 | // add a new header. We cannot say we are sending xml, either... |
| 413 | 413 | if (!headers_sent()) { |
| 414 | - header('Content-Type: ' . $resp->getContentType()); |
|
| 414 | + header('Content-Type: '.$resp->getContentType()); |
|
| 415 | 415 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
| 416 | 416 | header("Vary: Accept-Charset"); |
| 417 | 417 | |
@@ -434,10 +434,10 @@ discard block |
||
| 434 | 434 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 435 | 435 | // responses up to 8000 bytes |
| 436 | 436 | if ($phpNoSelfCompress) { |
| 437 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 437 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 438 | 438 | } |
| 439 | 439 | } else { |
| 440 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 440 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | print $payload; |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | $numParams = count($in); |
| 527 | 527 | } |
| 528 | 528 | foreach ($sigs as $curSig) { |
| 529 | - if (count($curSig) == $numParams + 1) { |
|
| 529 | + if (count($curSig) == $numParams+1) { |
|
| 530 | 530 | $itsOK = 1; |
| 531 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 531 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 532 | 532 | if (is_object($in)) { |
| 533 | 533 | $p = $in->getParam($n); |
| 534 | 534 | if ($p->kindOf() == 'scalar') { |
@@ -541,10 +541,10 @@ discard block |
||
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | // param index is $n+1, as first member of sig is return type |
| 544 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 544 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 545 | 545 | $itsOK = 0; |
| 546 | - $pno = $n + 1; |
|
| 547 | - $wanted = $curSig[$n + 1]; |
|
| 546 | + $pno = $n+1; |
|
| 547 | + $wanted = $curSig[$n+1]; |
|
| 548 | 548 | $got = $pt; |
| 549 | 549 | break; |
| 550 | 550 | } |
@@ -571,10 +571,10 @@ discard block |
||
| 571 | 571 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 572 | 572 | // (this is true even when in CLI mode) |
| 573 | 573 | if (count($_SERVER) == 0) { |
| 574 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 574 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 575 | 575 | } |
| 576 | 576 | |
| 577 | - if ($this->debug > 1) { |
|
| 577 | + if ($this->debug>1) { |
|
| 578 | 578 | if (function_exists('getallheaders')) { |
| 579 | 579 | $this->debugMsg(''); // empty line |
| 580 | 580 | foreach (getallheaders() as $name => $val) { |
@@ -599,13 +599,13 @@ discard block |
||
| 599 | 599 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 600 | 600 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 601 | 601 | $data = $degzdata; |
| 602 | - if ($this->debug > 1) { |
|
| 603 | - $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 602 | + if ($this->debug>1) { |
|
| 603 | + $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 604 | 604 | } |
| 605 | 605 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 606 | 606 | $data = $degzdata; |
| 607 | - if ($this->debug > 1) { |
|
| 608 | - $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 607 | + if ($this->debug>1) { |
|
| 608 | + $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 609 | 609 | } |
| 610 | 610 | } else { |
| 611 | 611 | $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | if ($reqEncoding == 'ISO-8859-1') { |
| 694 | 694 | $data = utf8_encode($data); |
| 695 | 695 | } else { |
| 696 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
| 696 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
| 697 | 697 | } |
| 698 | 698 | } |
| 699 | 699 | } |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches); |
| 725 | 725 | return new static::$responseClass( |
| 726 | 726 | 0, |
| 727 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 727 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 728 | 728 | $_xh['isf_reason']); |
| 729 | 729 | } elseif ($_xh['isf']) { |
| 730 | 730 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs. |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | return new static::$responseClass( |
| 733 | 733 | 0, |
| 734 | 734 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 735 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']); |
|
| 735 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']); |
|
| 736 | 736 | } else { |
| 737 | 737 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
| 738 | 738 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -742,8 +742,8 @@ discard block |
||
| 742 | 742 | ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 743 | 743 | ) |
| 744 | 744 | ) { |
| 745 | - if ($this->debug > 1) { |
|
| 746 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++"); |
|
| 745 | + if ($this->debug>1) { |
|
| 746 | + $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++"); |
|
| 747 | 747 | } |
| 748 | 748 | |
| 749 | 749 | return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']); |
@@ -751,12 +751,12 @@ discard block |
||
| 751 | 751 | // build a Request object with data parsed from xml and add parameters in |
| 752 | 752 | $req = new Request($_xh['method']); |
| 753 | 753 | /// @todo for more speed, we could just pass in the array to the constructor (and loose the type validation)... |
| 754 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
| 754 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
| 755 | 755 | $req->addParam($_xh['params'][$i]); |
| 756 | 756 | } |
| 757 | 757 | |
| 758 | - if ($this->debug > 1) { |
|
| 759 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 758 | + if ($this->debug>1) { |
|
| 759 | + $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | return $this->execute($req); |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | return new static::$responseClass( |
| 807 | 807 | 0, |
| 808 | 808 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 809 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 809 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 810 | 810 | ); |
| 811 | 811 | } |
| 812 | 812 | } |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | // build string representation of function 'name' |
| 822 | 822 | if (is_array($func)) { |
| 823 | 823 | if (is_object($func[0])) { |
| 824 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 824 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 825 | 825 | } else { |
| 826 | 826 | $funcName = implode('::', $func); |
| 827 | 827 | } |
@@ -833,16 +833,16 @@ discard block |
||
| 833 | 833 | |
| 834 | 834 | // verify that function to be invoked is in fact callable |
| 835 | 835 | if (!is_callable($func)) { |
| 836 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 836 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 837 | 837 | return new static::$responseClass( |
| 838 | 838 | 0, |
| 839 | 839 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 840 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 840 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 841 | 841 | ); |
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | if (isset($dmap[$methodName]['exception_handling'])) { |
| 845 | - $exception_handling = (int)$dmap[$methodName]['exception_handling']; |
|
| 845 | + $exception_handling = (int) $dmap[$methodName]['exception_handling']; |
|
| 846 | 846 | } else { |
| 847 | 847 | $exception_handling = $this->exception_handling; |
| 848 | 848 | } |
@@ -863,14 +863,14 @@ discard block |
||
| 863 | 863 | $r = call_user_func($func, $req); |
| 864 | 864 | } |
| 865 | 865 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 866 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 866 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 867 | 867 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 868 | 868 | $r = new static::$responseClass($r); |
| 869 | 869 | } else { |
| 870 | 870 | $r = new static::$responseClass( |
| 871 | 871 | 0, |
| 872 | 872 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 873 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 873 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 874 | 874 | ); |
| 875 | 875 | } |
| 876 | 876 | } |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
| 886 | 886 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
| 887 | 887 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 888 | - $r = new static::$responseClass(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 888 | + $r = new static::$responseClass(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 889 | 889 | } else { |
| 890 | 890 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
| 891 | 891 | // return type correctly |
@@ -1016,7 +1016,7 @@ discard block |
||
| 1016 | 1016 | */ |
| 1017 | 1017 | protected function debugMsg($string) |
| 1018 | 1018 | { |
| 1019 | - $this->debug_info .= $string . "\n"; |
|
| 1019 | + $this->debug_info .= $string."\n"; |
|
| 1020 | 1020 | } |
| 1021 | 1021 | |
| 1022 | 1022 | /** |
@@ -1307,7 +1307,7 @@ discard block |
||
| 1307 | 1307 | $i++; // for error message, we count params from 1 |
| 1308 | 1308 | return static::_xmlrpcs_multicall_error(new static::$responseClass(0, |
| 1309 | 1309 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1310 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1310 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1311 | 1311 | } |
| 1312 | 1312 | } |
| 1313 | 1313 | |
@@ -1388,7 +1388,7 @@ discard block |
||
| 1388 | 1388 | } |
| 1389 | 1389 | } else { |
| 1390 | 1390 | $numCalls = count($req); |
| 1391 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1391 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1392 | 1392 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1393 | 1393 | } |
| 1394 | 1394 | } |
@@ -1453,12 +1453,12 @@ discard block |
||
| 1453 | 1453 | */ |
| 1454 | 1454 | protected function xml_header($charsetEncoding = '') |
| 1455 | 1455 | { |
| 1456 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1456 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1457 | 1457 | |
| 1458 | 1458 | if ($charsetEncoding != '') { |
| 1459 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 1459 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 1460 | 1460 | } else { |
| 1461 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 1461 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 1462 | 1462 | } |
| 1463 | 1463 | } |
| 1464 | 1464 | |
@@ -1474,7 +1474,7 @@ discard block |
||
| 1474 | 1474 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1475 | 1475 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1476 | 1476 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1477 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1477 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1478 | 1478 | return $this->$name; |
| 1479 | 1479 | case 'accepted_charset_encodings': |
| 1480 | 1480 | // manually implement the 'protected property' behaviour |
@@ -1486,16 +1486,16 @@ discard block |
||
| 1486 | 1486 | } |
| 1487 | 1487 | } |
| 1488 | 1488 | if ($canAccess) { |
| 1489 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1489 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1490 | 1490 | return $this->accepted_compression; |
| 1491 | 1491 | } else { |
| 1492 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1492 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1493 | 1493 | } |
| 1494 | 1494 | break; |
| 1495 | 1495 | default: |
| 1496 | 1496 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1497 | 1497 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1498 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1498 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1499 | 1499 | $result = null; |
| 1500 | 1500 | return $result; |
| 1501 | 1501 | } |
@@ -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('Setting property Request::' . $name . ' is deprecated'); |
|
| 1515 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1516 | 1516 | $this->$name = $value; |
| 1517 | 1517 | break; |
| 1518 | 1518 | case 'accepted_charset_encodings': |
@@ -1525,16 +1525,16 @@ discard block |
||
| 1525 | 1525 | } |
| 1526 | 1526 | } |
| 1527 | 1527 | if ($canAccess) { |
| 1528 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1528 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1529 | 1529 | $this->accepted_compression = $value; |
| 1530 | 1530 | } else { |
| 1531 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1531 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1532 | 1532 | } |
| 1533 | 1533 | break; |
| 1534 | 1534 | default: |
| 1535 | 1535 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1536 | 1536 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1537 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1537 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1538 | 1538 | } |
| 1539 | 1539 | } |
| 1540 | 1540 | |
@@ -1549,7 +1549,7 @@ discard block |
||
| 1549 | 1549 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1550 | 1550 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1551 | 1551 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1552 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1552 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1553 | 1553 | return isset($this->$name); |
| 1554 | 1554 | case 'accepted_charset_encodings': |
| 1555 | 1555 | // manually implement the 'protected property' behaviour |
@@ -1561,7 +1561,7 @@ discard block |
||
| 1561 | 1561 | } |
| 1562 | 1562 | } |
| 1563 | 1563 | if ($canAccess) { |
| 1564 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1564 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1565 | 1565 | return isset($this->accepted_compression); |
| 1566 | 1566 | } |
| 1567 | 1567 | // break through voluntarily |
@@ -1581,7 +1581,7 @@ discard block |
||
| 1581 | 1581 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1582 | 1582 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1583 | 1583 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1584 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1584 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1585 | 1585 | unset($this->$name); |
| 1586 | 1586 | break; |
| 1587 | 1587 | case 'accepted_charset_encodings': |
@@ -1594,16 +1594,16 @@ discard block |
||
| 1594 | 1594 | } |
| 1595 | 1595 | } |
| 1596 | 1596 | if ($canAccess) { |
| 1597 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1597 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1598 | 1598 | unset($this->accepted_compression); |
| 1599 | 1599 | } else { |
| 1600 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1600 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1601 | 1601 | } |
| 1602 | 1602 | break; |
| 1603 | 1603 | default: |
| 1604 | 1604 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1605 | 1605 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1606 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1606 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1607 | 1607 | } |
| 1608 | 1608 | } |
| 1609 | 1609 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
| 2 | +require_once __DIR__."/client/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
| 10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
| 13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
| 16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 17 | 17 | |
| 18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
| 19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 20 | 20 | |
| 21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
| 22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 23 | 23 | |
| 24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
| 25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
| 27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 28 | 28 | |
| 29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
| 30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 31 | -output("(value of base64 string is: '" . $v->scalarVal() . "')<BR><BR>"); |
|
| 30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 31 | +output("(value of base64 string is: '".$v->scalarVal()."')<BR><BR>"); |
|
| 32 | 32 | |
| 33 | 33 | $v = new PhpXmlRpc\Value( |
| 34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ), |
| 42 | 42 | "array" |
| 43 | 43 | ); |
| 44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 45 | 45 | |
| 46 | 46 | $v = new PhpXmlRpc\Value( |
| 47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | ), |
| 62 | 62 | "struct" |
| 63 | 63 | ); |
| 64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 65 | 65 | |
| 66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
| 67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 68 | 68 | |
| 69 | 69 | class MyClass |
| 70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
| 76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
| 77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
| 78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
| 79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 80 | 80 | |
| 81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
| 82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
| 83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
| 85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
| 87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 88 | 88 | |
| 89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
| 90 | 90 | // The greek word 'kosme' |
| 91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
| 92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
| 92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
| 94 | 94 | if (function_exists('mb_convert_encoding')) { |
| 95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
| 95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
| 99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 100 | 100 | $req->method('examples.getStateName'); |
| 101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
| 102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
| 102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
| 103 | 103 | |
| 104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
| 105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
| 106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
| 106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
| 107 | 107 | |
| 108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
| 109 | 109 | $t = time(); |
| 110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 111 | 111 | output("Now is $t --> $date\n"); |
| 112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
| 112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
| 113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 114 | 114 | output("That is to say $date --> $tb\n"); |
| 115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
| 116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
| 115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
| 116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
| 117 | 117 | output("</pre>\n"); |
| 118 | 118 | |
| 119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
| 120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
| 121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
| 122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 123 | 123 | |
| 124 | 124 | output('</body></html>'); |
