gggeek /
phpxmlrpc
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | if ($response->faultCode()) { |
| 29 | 29 | throw new HttpException(502, $response->faultString()); |
| 30 | 30 | } else { |
| 31 | - return new Response("<html><body>State number $stateNo is: " . $response->value()->scalarVal() . '</body></html>'); |
|
| 31 | + return new Response("<html><body>State number $stateNo is: ".$response->value()->scalarVal().'</body></html>'); |
|
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $val = reset($ar); |
| 130 | 130 | $typ = key($ar); |
| 131 | 131 | |
| 132 | - return '<value>' . $this->serializeData($typ, $val) . "</value>\n"; |
|
| 132 | + return '<value>'.$this->serializeData($typ, $val)."</value>\n"; |
|
| 133 | 133 | //} |
| 134 | 134 | } |
| 135 | 135 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | // preserve back compatibility |
| 149 | 149 | |
| 150 | 150 | if (is_array($b)) { |
| 151 | - foreach($b as $id => $cont) { |
|
| 151 | + foreach ($b as $id => $cont) { |
|
| 152 | 152 | $b[$id] = $cont->scalarVal(); |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -156,10 +156,10 @@ discard block |
||
| 156 | 156 | // add support for structures directly encoding php objects |
| 157 | 157 | if (is_object($b)) { |
| 158 | 158 | $t = get_object_vars($b); |
| 159 | - foreach($t as $id => $cont) { |
|
| 159 | + foreach ($t as $id => $cont) { |
|
| 160 | 160 | $t[$id] = $cont->scalarVal(); |
| 161 | 161 | } |
| 162 | - foreach($t as $id => $cont) { |
|
| 162 | + foreach ($t as $id => $cont) { |
|
| 163 | 163 | @$b->$id = $cont; |
| 164 | 164 | } |
| 165 | 165 | } |
@@ -201,17 +201,17 @@ discard block |
||
| 201 | 201 | /* Expose as global functions the ones which are now class methods */ |
| 202 | 202 | |
| 203 | 203 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 204 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 204 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 205 | 205 | { |
| 206 | 206 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | -function iso8601_encode($timeT, $utc=0) |
|
| 209 | +function iso8601_encode($timeT, $utc = 0) |
|
| 210 | 210 | { |
| 211 | 211 | return Date::iso8601Encode($timeT, $utc); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function iso8601_decode($iDate, $utc=0) |
|
| 214 | +function iso8601_decode($iDate, $utc = 0) |
|
| 215 | 215 | { |
| 216 | 216 | return Date::iso8601Decode($iDate, $utc); |
| 217 | 217 | } |
@@ -221,25 +221,25 @@ discard block |
||
| 221 | 221 | return Http::decodeChunked($buffer); |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 224 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 225 | 225 | { |
| 226 | 226 | $encoder = new Encoder(); |
| 227 | 227 | return $encoder->decode($xmlrpcVal, $options); |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 230 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 231 | 231 | { |
| 232 | 232 | $encoder = new Encoder(); |
| 233 | 233 | return $encoder->encode($phpVal, $options); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 236 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 237 | 237 | { |
| 238 | 238 | $encoder = new Encoder(); |
| 239 | 239 | return $encoder->decodeXml($xmlVal, $options); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 242 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 243 | 243 | { |
| 244 | 244 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 245 | 245 | } |
@@ -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 | use PhpXmlRpc\Encoder; |
| 5 | 5 | use PhpXmlRpc\Client; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $handles = array(); |
| 34 | 34 | $curl = curl_multi_init(); |
| 35 | 35 | |
| 36 | - foreach($requests as $k => $req) { |
|
| 36 | + foreach ($requests as $k => $req) { |
|
| 37 | 37 | $req->setDebug($this->debug); |
| 38 | 38 | $handle = $this->createCurlHandle($req, $method, $this->server, $this->port, $this->path, $opts); |
| 39 | 39 | curl_multi_add_handle($curl, $handle); |
@@ -43,20 +43,20 @@ discard block |
||
| 43 | 43 | $running = 0; |
| 44 | 44 | do { |
| 45 | 45 | curl_multi_exec($curl, $running); |
| 46 | - } while($running > 0); |
|
| 46 | + } while ($running>0); |
|
| 47 | 47 | |
| 48 | 48 | $responses = array(); |
| 49 | 49 | $errors = array(); |
| 50 | - foreach($handles as $k => $h) { |
|
| 50 | + foreach ($handles as $k => $h) { |
|
| 51 | 51 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
| 52 | 52 | |
| 53 | - if ($this->debug > 1) { |
|
| 53 | + if ($this->debug>1) { |
|
| 54 | 54 | $message = "---CURL INFO---\n"; |
| 55 | 55 | foreach (curl_getinfo($h) as $name => $val) { |
| 56 | 56 | if (is_array($val)) { |
| 57 | 57 | $val = implode("\n", $val); |
| 58 | 58 | } |
| 59 | - $message .= $name . ': ' . $val . "\n"; |
|
| 59 | + $message .= $name.': '.$val."\n"; |
|
| 60 | 60 | } |
| 61 | 61 | $message .= '---END---'; |
| 62 | 62 | $this->getLogger()->debugMessage($message); |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | curl_multi_close($curl); |
| 73 | 73 | |
| 74 | - foreach($responses as $k => $resp) { |
|
| 74 | + foreach ($responses as $k => $resp) { |
|
| 75 | 75 | if (!$resp) { |
| 76 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . $errors[$k]); |
|
| 76 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.$errors[$k]); |
|
| 77 | 77 | } else { |
| 78 | 78 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
| 79 | 79 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $value = $encoder->encode($data, array('auto_dates')); |
| 94 | 94 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 95 | 95 | $reqs = array(); |
| 96 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 96 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 97 | 97 | $reqs[] = $req; |
| 98 | 98 | } |
| 99 | 99 | |
@@ -102,40 +102,40 @@ discard block |
||
| 102 | 102 | // avoid storing http info in the responses, to make the checksums comparable |
| 103 | 103 | $client->setDebug(-1); |
| 104 | 104 | |
| 105 | -echo "Making $num_tests calls to method interopEchoTests.echoValue on server " . XMLRPCSERVER . " ...\n"; |
|
| 105 | +echo "Making $num_tests calls to method interopEchoTests.echoValue on server ".XMLRPCSERVER." ...\n"; |
|
| 106 | 106 | flush(); |
| 107 | 107 | |
| 108 | -$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 108 | +$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 109 | 109 | $t = microtime(true); |
| 110 | 110 | $resp = $client->send($reqs); |
| 111 | -$t = microtime(true) - $t; |
|
| 112 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 113 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 111 | +$t = microtime(true)-$t; |
|
| 112 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 113 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 114 | 114 | flush(); |
| 115 | 115 | |
| 116 | 116 | if (strpos(XMLRPCSERVER, 'http://') === 0) { |
| 117 | - $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
| 117 | + $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
| 118 | 118 | $t = microtime(true); |
| 119 | 119 | $resp = $client->send($reqs); |
| 120 | - $t = microtime(true) - $t; |
|
| 121 | - echo "Sequential send, curl (w. keepalive): " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 122 | - echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 120 | + $t = microtime(true)-$t; |
|
| 121 | + echo "Sequential send, curl (w. keepalive): ".sprintf('%.3f', $t)." secs.\n"; |
|
| 122 | + echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 123 | 123 | flush(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $t = microtime(true); |
| 127 | 127 | $resp = $client->sendParallel($reqs); |
| 128 | -$t = microtime(true) - $t; |
|
| 129 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 130 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 128 | +$t = microtime(true)-$t; |
|
| 129 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 130 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 131 | 131 | flush(); |
| 132 | 132 | |
| 133 | 133 | $client->setOption(Client::OPT_NO_MULTICALL, false); |
| 134 | 134 | // make sure we don't reuse the keepalive handle |
| 135 | -$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
| 135 | +$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
| 136 | 136 | $t = microtime(true); |
| 137 | 137 | $resp = $client->send($reqs); |
| 138 | -$t = microtime(true) - $t; |
|
| 139 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 140 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 138 | +$t = microtime(true)-$t; |
|
| 139 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 140 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 141 | 141 | flush(); |
@@ -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 | |
@@ -338,10 +338,10 @@ discard block |
||
| 338 | 338 | $server = $parts['host']; |
| 339 | 339 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 340 | 340 | if (isset($parts['query'])) { |
| 341 | - $path .= '?' . $parts['query']; |
|
| 341 | + $path .= '?'.$parts['query']; |
|
| 342 | 342 | } |
| 343 | 343 | if (isset($parts['fragment'])) { |
| 344 | - $path .= '#' . $parts['fragment']; |
|
| 344 | + $path .= '#'.$parts['fragment']; |
|
| 345 | 345 | } |
| 346 | 346 | if (isset($parts['port'])) { |
| 347 | 347 | $port = $parts['port']; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | if ($path == '' || $path[0] != '/') { |
| 360 | - $this->path = '/' . $path; |
|
| 360 | + $this->path = '/'.$path; |
|
| 361 | 361 | } else { |
| 362 | 362 | $this->path = $path; |
| 363 | 363 | } |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | //$this->accepted_charset_encodings = $ch->knownCharsets(); |
| 390 | 390 | |
| 391 | 391 | // initialize user_agent string |
| 392 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 392 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | */ |
| 562 | 562 | public function setSSLVerifyPeer($i) |
| 563 | 563 | { |
| 564 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 564 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 565 | 565 | |
| 566 | 566 | $this->verifypeer = $i; |
| 567 | 567 | return $this; |
@@ -578,7 +578,7 @@ discard block |
||
| 578 | 578 | */ |
| 579 | 579 | public function setSSLVerifyHost($i) |
| 580 | 580 | { |
| 581 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 581 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 582 | 582 | |
| 583 | 583 | $this->verifyhost = $i; |
| 584 | 584 | return $this; |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | */ |
| 597 | 597 | public function setSSLVersion($i) |
| 598 | 598 | { |
| 599 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 599 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 600 | 600 | |
| 601 | 601 | $this->sslversion = $i; |
| 602 | 602 | return $this; |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | */ |
| 662 | 662 | public function setRequestCompression($compMethod) |
| 663 | 663 | { |
| 664 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 664 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 665 | 665 | |
| 666 | 666 | $this->request_compression = $compMethod; |
| 667 | 667 | return $this; |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | */ |
| 712 | 712 | public function setCurlOptions($options) |
| 713 | 713 | { |
| 714 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 714 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 715 | 715 | |
| 716 | 716 | $this->extracurlopts = $options; |
| 717 | 717 | return $this; |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | */ |
| 726 | 726 | public function setUseCurl($useCurlMode) |
| 727 | 727 | { |
| 728 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 728 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 729 | 729 | |
| 730 | 730 | $this->use_curl = $useCurlMode; |
| 731 | 731 | return $this; |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | */ |
| 743 | 743 | public function setUserAgent($agentString) |
| 744 | 744 | { |
| 745 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 745 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 746 | 746 | |
| 747 | 747 | $this->user_agent = $agentString; |
| 748 | 748 | return $this; |
@@ -774,12 +774,12 @@ discard block |
||
| 774 | 774 | } |
| 775 | 775 | } |
| 776 | 776 | |
| 777 | - $url = $this->method . '://' . $this->server; |
|
| 777 | + $url = $this->method.'://'.$this->server; |
|
| 778 | 778 | if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) || |
| 779 | 779 | ($this->port == 443 && in_array($this->method, array('https', 'h2')))) { |
| 780 | - return $url . $this->path; |
|
| 780 | + return $url.$this->path; |
|
| 781 | 781 | } else { |
| 782 | - return $url . ':' . $this->port . $this->path; |
|
| 782 | + return $url.':'.$this->port.$this->path; |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | public function send($req, $timeout = 0, $method = '') |
| 823 | 823 | { |
| 824 | 824 | if ($method !== '' || $timeout !== 0) { |
| 825 | - $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated'); |
|
| 825 | + $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated'); |
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | // if user does not specify http protocol, use native method of this client |
@@ -946,7 +946,7 @@ discard block |
||
| 946 | 946 | $payload = $a; |
| 947 | 947 | $encodingHdr = "Content-Encoding: gzip\r\n"; |
| 948 | 948 | } else { |
| 949 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 949 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 950 | 950 | } |
| 951 | 951 | } else if (function_exists('gzcompress')) { |
| 952 | 952 | $a = @gzcompress($payload); |
@@ -954,14 +954,14 @@ discard block |
||
| 954 | 954 | $payload = $a; |
| 955 | 955 | $encodingHdr = "Content-Encoding: deflate\r\n"; |
| 956 | 956 | } else { |
| 957 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 957 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 958 | 958 | } |
| 959 | 959 | } else { |
| 960 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 960 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 961 | 961 | } |
| 962 | 962 | } else { |
| 963 | 963 | if ($opts['request_compression'] != '') { |
| 964 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 964 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 965 | 965 | } |
| 966 | 966 | } |
| 967 | 967 | |
@@ -969,16 +969,16 @@ discard block |
||
| 969 | 969 | $credentials = ''; |
| 970 | 970 | if ($opts['username'] != '') { |
| 971 | 971 | if ($opts['authtype'] != 1) { |
| 972 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 972 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 973 | 973 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 974 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0'); |
|
| 974 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0'); |
|
| 975 | 975 | } |
| 976 | - $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n"; |
|
| 976 | + $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n"; |
|
| 977 | 977 | } |
| 978 | 978 | |
| 979 | 979 | $acceptedEncoding = ''; |
| 980 | 980 | if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) { |
| 981 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n"; |
|
| 981 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n"; |
|
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | if ($port == 0) { |
@@ -999,21 +999,21 @@ discard block |
||
| 999 | 999 | } elseif ($method === 'h2') { |
| 1000 | 1000 | $protocol = 'https'; |
| 1001 | 1001 | } else if (strpos($protocol, ':') !== false) { |
| 1002 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
|
| 1003 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'] . |
|
| 1002 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
|
| 1003 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option']. |
|
| 1004 | 1004 | " attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
| 1005 | 1005 | } |
| 1006 | 1006 | /// @todo this does not work atm (tested at least with an http proxy forwarding to an https server) - we |
| 1007 | 1007 | /// should implement the CONNECT protocol |
| 1008 | - $uri = $protocol . '://' . $server . ':' . $port . $path; |
|
| 1008 | + $uri = $protocol.'://'.$server.':'.$port.$path; |
|
| 1009 | 1009 | if ($opts['proxy_user'] != '') { |
| 1010 | 1010 | if ($opts['proxy_authtype'] != 1) { |
| 1011 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 1011 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 1012 | 1012 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1013 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with socket transport'); |
|
| 1013 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with socket transport'); |
|
| 1014 | 1014 | } |
| 1015 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' . |
|
| 1016 | - $opts['proxy_pass']) . "\r\n"; |
|
| 1015 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'. |
|
| 1016 | + $opts['proxy_pass'])."\r\n"; |
|
| 1017 | 1017 | } |
| 1018 | 1018 | } else { |
| 1019 | 1019 | $connectServer = $server; |
@@ -1030,14 +1030,14 @@ discard block |
||
| 1030 | 1030 | $version = ''; |
| 1031 | 1031 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1032 | 1032 | /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments |
| 1033 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 1033 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 1034 | 1034 | } |
| 1035 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 1035 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 1036 | 1036 | } |
| 1037 | 1037 | |
| 1038 | 1038 | $extraHeaders = ''; |
| 1039 | 1039 | if (is_array($this->extra_headers) && $this->extra_headers) { |
| 1040 | - $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n"; |
|
| 1040 | + $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n"; |
|
| 1041 | 1041 | } |
| 1042 | 1042 | |
| 1043 | 1043 | // omit port if default |
@@ -1045,24 +1045,24 @@ discard block |
||
| 1045 | 1045 | if (($port == 80 && in_array($method, array('http', 'http10', 'http11'))) || ($port == 443 && $method == 'https')) { |
| 1046 | 1046 | $port = ''; |
| 1047 | 1047 | } else { |
| 1048 | - $port = ':' . $port; |
|
| 1049 | - } |
|
| 1050 | - |
|
| 1051 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 1052 | - 'User-Agent: ' . $opts['user_agent'] . "\r\n" . |
|
| 1053 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 1054 | - $credentials . |
|
| 1055 | - $proxyCredentials . |
|
| 1056 | - $acceptedEncoding . |
|
| 1057 | - $encodingHdr . |
|
| 1058 | - 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" . |
|
| 1059 | - $cookieHeader . |
|
| 1060 | - 'Content-Type: ' . $req->getContentType() . "\r\n" . |
|
| 1061 | - $extraHeaders . |
|
| 1062 | - 'Content-Length: ' . strlen($payload) . "\r\n\r\n" . |
|
| 1048 | + $port = ':'.$port; |
|
| 1049 | + } |
|
| 1050 | + |
|
| 1051 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 1052 | + 'User-Agent: '.$opts['user_agent']."\r\n". |
|
| 1053 | + 'Host: '.$server.$port."\r\n". |
|
| 1054 | + $credentials. |
|
| 1055 | + $proxyCredentials. |
|
| 1056 | + $acceptedEncoding. |
|
| 1057 | + $encodingHdr. |
|
| 1058 | + 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n". |
|
| 1059 | + $cookieHeader. |
|
| 1060 | + 'Content-Type: '.$req->getContentType()."\r\n". |
|
| 1061 | + $extraHeaders. |
|
| 1062 | + 'Content-Length: '.strlen($payload)."\r\n\r\n". |
|
| 1063 | 1063 | $payload; |
| 1064 | 1064 | |
| 1065 | - if ($opts['debug'] > 1) { |
|
| 1065 | + if ($opts['debug']>1) { |
|
| 1066 | 1066 | $this->getLogger()->debug("---SENDING---\n$op\n---END---"); |
| 1067 | 1067 | } |
| 1068 | 1068 | |
@@ -1091,13 +1091,13 @@ discard block |
||
| 1091 | 1091 | /// https://www.php.net/manual/en/function.stream-socket-enable-crypto.php |
| 1092 | 1092 | /// https://www.php.net/manual/en/migration56.openssl.php, |
| 1093 | 1093 | /// https://wiki.php.net/rfc/improved-tls-constants |
| 1094 | - switch($opts['sslversion']) { |
|
| 1094 | + switch ($opts['sslversion']) { |
|
| 1095 | 1095 | case 1: // TLSv1x |
| 1096 | 1096 | if (version_compare(PHP_VERSION, '7.2.0', '>=')) { |
| 1097 | 1097 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLS_CLIENT; |
| 1098 | 1098 | } else { |
| 1099 | 1099 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1100 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-any only is supported with PHP 7.2 or later'); |
|
| 1100 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-any only is supported with PHP 7.2 or later'); |
|
| 1101 | 1101 | } |
| 1102 | 1102 | break; |
| 1103 | 1103 | case 2: // SSLv2 |
@@ -1120,12 +1120,12 @@ discard block |
||
| 1120 | 1120 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT; |
| 1121 | 1121 | } else { |
| 1122 | 1122 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1123 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1123 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1124 | 1124 | } |
| 1125 | 1125 | break; |
| 1126 | 1126 | default: |
| 1127 | 1127 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1128 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version'); |
|
| 1128 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version'); |
|
| 1129 | 1129 | } |
| 1130 | 1130 | } |
| 1131 | 1131 | } |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | |
| 1139 | 1139 | $context = stream_context_create($contextOptions); |
| 1140 | 1140 | |
| 1141 | - if ($opts['timeout'] <= 0) { |
|
| 1141 | + if ($opts['timeout']<=0) { |
|
| 1142 | 1142 | $connectTimeout = ini_get('default_socket_timeout'); |
| 1143 | 1143 | } else { |
| 1144 | 1144 | $connectTimeout = $opts['timeout']; |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 1158 | 1158 | STREAM_CLIENT_CONNECT, $context); |
| 1159 | 1159 | if ($fp) { |
| 1160 | - if ($opts['timeout'] > 0) { |
|
| 1160 | + if ($opts['timeout']>0) { |
|
| 1161 | 1161 | stream_set_timeout($fp, $opts['timeout'], 0); |
| 1162 | 1162 | } |
| 1163 | 1163 | } else { |
@@ -1166,8 +1166,8 @@ discard block |
||
| 1166 | 1166 | $this->errstr = $err['message']; |
| 1167 | 1167 | } |
| 1168 | 1168 | |
| 1169 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 1170 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 1169 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 1170 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 1171 | 1171 | } |
| 1172 | 1172 | |
| 1173 | 1173 | /// @todo from here onwards, we can inject the results of stream_get_meta_data in the response. We could |
@@ -1250,19 +1250,19 @@ discard block |
||
| 1250 | 1250 | $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']); |
| 1251 | 1251 | |
| 1252 | 1252 | if (!$curl) { |
| 1253 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1253 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1254 | 1254 | ': error during curl initialization. Check php error log for details'); |
| 1255 | 1255 | } |
| 1256 | 1256 | |
| 1257 | 1257 | $result = curl_exec($curl); |
| 1258 | 1258 | |
| 1259 | - if ($opts['debug'] > 1) { |
|
| 1259 | + if ($opts['debug']>1) { |
|
| 1260 | 1260 | $message = "---CURL INFO---\n"; |
| 1261 | 1261 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1262 | 1262 | if (is_array($val)) { |
| 1263 | 1263 | $val = implode("\n", $val); |
| 1264 | 1264 | } |
| 1265 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1265 | + $message .= $name.': '.$val."\n"; |
|
| 1266 | 1266 | } |
| 1267 | 1267 | $message .= '---END---'; |
| 1268 | 1268 | $this->getLogger()->debug($message); |
@@ -1272,21 +1272,21 @@ discard block |
||
| 1272 | 1272 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1273 | 1273 | |
| 1274 | 1274 | $this->errstr = 'no response'; |
| 1275 | - $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1276 | - ': ' . curl_error($curl)); |
|
| 1277 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1275 | + $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1276 | + ': '.curl_error($curl)); |
|
| 1277 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1278 | 1278 | if ($opts['keepalive']) { |
| 1279 | 1279 | $this->xmlrpc_curl_handle = null; |
| 1280 | 1280 | } |
| 1281 | 1281 | } else { |
| 1282 | 1282 | if (!$opts['keepalive']) { |
| 1283 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1283 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1284 | 1284 | } |
| 1285 | 1285 | $resp = $req->parseResponse($result, true, $opts['return_type']); |
| 1286 | 1286 | if ($opts['keepalive']) { |
| 1287 | 1287 | /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls |
| 1288 | 1288 | if ($resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) { |
| 1289 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1289 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1290 | 1290 | $this->xmlrpc_curl_handle = null; |
| 1291 | 1291 | } |
| 1292 | 1292 | } |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | $payload = $a; |
| 1332 | 1332 | $encodingHdr = 'Content-Encoding: gzip'; |
| 1333 | 1333 | } else { |
| 1334 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 1334 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 1335 | 1335 | } |
| 1336 | 1336 | } else if (function_exists('gzcompress')) { |
| 1337 | 1337 | $a = @gzcompress($payload); |
@@ -1339,14 +1339,14 @@ discard block |
||
| 1339 | 1339 | $payload = $a; |
| 1340 | 1340 | $encodingHdr = 'Content-Encoding: deflate'; |
| 1341 | 1341 | } else { |
| 1342 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 1342 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 1343 | 1343 | } |
| 1344 | 1344 | } else { |
| 1345 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 1345 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 1346 | 1346 | } |
| 1347 | 1347 | } else { |
| 1348 | 1348 | if ($opts['request_compression'] != '') { |
| 1349 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 1349 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 1350 | 1350 | } |
| 1351 | 1351 | } |
| 1352 | 1352 | |
@@ -1360,12 +1360,12 @@ discard block |
||
| 1360 | 1360 | // http, https |
| 1361 | 1361 | $protocol = $method; |
| 1362 | 1362 | if (strpos($protocol, ':') !== false) { |
| 1363 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1363 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1364 | 1364 | return false; |
| 1365 | 1365 | } |
| 1366 | 1366 | } |
| 1367 | 1367 | } |
| 1368 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $path); |
|
| 1368 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$path); |
|
| 1369 | 1369 | if (!$curl) { |
| 1370 | 1370 | return false; |
| 1371 | 1371 | } |
@@ -1379,7 +1379,7 @@ discard block |
||
| 1379 | 1379 | // results into variable |
| 1380 | 1380 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1381 | 1381 | |
| 1382 | - if ($opts['debug'] > 1) { |
|
| 1382 | + if ($opts['debug']>1) { |
|
| 1383 | 1383 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1384 | 1384 | /// @todo redirect curlopt_stderr to some stream which can be piped to the logger |
| 1385 | 1385 | } |
@@ -1404,7 +1404,7 @@ discard block |
||
| 1404 | 1404 | } |
| 1405 | 1405 | } |
| 1406 | 1406 | // extra headers |
| 1407 | - $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings'])); |
|
| 1407 | + $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])); |
|
| 1408 | 1408 | // if no keepalive is wanted, let the server know it in advance |
| 1409 | 1409 | if (!$opts['keepalive']) { |
| 1410 | 1410 | $headers[] = 'Connection: close'; |
@@ -1441,8 +1441,8 @@ discard block |
||
| 1441 | 1441 | if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) { |
| 1442 | 1442 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1443 | 1443 | } else { |
| 1444 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1445 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1444 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1445 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1446 | 1446 | return false; |
| 1447 | 1447 | } |
| 1448 | 1448 | break; |
@@ -1452,12 +1452,12 @@ discard block |
||
| 1452 | 1452 | } |
| 1453 | 1453 | |
| 1454 | 1454 | if ($opts['username'] && $opts['password']) { |
| 1455 | - curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']); |
|
| 1455 | + curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']); |
|
| 1456 | 1456 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1457 | 1457 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1458 | 1458 | } elseif ($opts['authtype'] != 1) { |
| 1459 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1460 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1459 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1460 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1461 | 1461 | return false; |
| 1462 | 1462 | } |
| 1463 | 1463 | } |
@@ -1501,14 +1501,14 @@ discard block |
||
| 1501 | 1501 | if ($opts['proxyport'] == 0) { |
| 1502 | 1502 | $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1503 | 1503 | } |
| 1504 | - curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']); |
|
| 1504 | + curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']); |
|
| 1505 | 1505 | if ($opts['proxy_user']) { |
| 1506 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']); |
|
| 1506 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']); |
|
| 1507 | 1507 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1508 | 1508 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1509 | 1509 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1510 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1511 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1510 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1511 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1512 | 1512 | return false; |
| 1513 | 1513 | } |
| 1514 | 1514 | } |
@@ -1519,7 +1519,7 @@ discard block |
||
| 1519 | 1519 | if (count($opts['cookies'])) { |
| 1520 | 1520 | $cookieHeader = ''; |
| 1521 | 1521 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1522 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1522 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1523 | 1523 | } |
| 1524 | 1524 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1525 | 1525 | } |
@@ -1528,7 +1528,7 @@ discard block |
||
| 1528 | 1528 | curl_setopt($curl, $opt, $val); |
| 1529 | 1529 | } |
| 1530 | 1530 | |
| 1531 | - if ($opts['debug'] > 1) { |
|
| 1531 | + if ($opts['debug']>1) { |
|
| 1532 | 1532 | $this->getLogger()->debug("---SENDING---\n$payload\n---END---"); |
| 1533 | 1533 | } |
| 1534 | 1534 | |
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1630 | 1630 | $numParams = $req->getNumParams(); |
| 1631 | 1631 | $params = array(); |
| 1632 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1632 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1633 | 1633 | $params[$i] = $req->getParam($i); |
| 1634 | 1634 | } |
| 1635 | 1635 | $call['params'] = new Value($params, 'array'); |
@@ -1651,7 +1651,7 @@ discard block |
||
| 1651 | 1651 | $response = array(); |
| 1652 | 1652 | |
| 1653 | 1653 | if ($this->return_type == 'xml') { |
| 1654 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1654 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1655 | 1655 | $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse()); |
| 1656 | 1656 | } |
| 1657 | 1657 | |
@@ -1659,21 +1659,21 @@ discard block |
||
| 1659 | 1659 | if (!is_array($rets)) { |
| 1660 | 1660 | // bad return type from system.multicall |
| 1661 | 1661 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1662 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1662 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1663 | 1663 | } |
| 1664 | 1664 | $numRets = count($rets); |
| 1665 | 1665 | if ($numRets != count($reqs)) { |
| 1666 | 1666 | // wrong number of return values. |
| 1667 | 1667 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1668 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1668 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1669 | 1669 | $result->httpResponse()); |
| 1670 | 1670 | } |
| 1671 | 1671 | |
| 1672 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1672 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1673 | 1673 | $val = $rets[$i]; |
| 1674 | 1674 | if (!is_array($val)) { |
| 1675 | 1675 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1676 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1676 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1677 | 1677 | 'phpvals', $result->httpResponse()); |
| 1678 | 1678 | } |
| 1679 | 1679 | switch (count($val)) { |
@@ -1681,7 +1681,7 @@ discard block |
||
| 1681 | 1681 | if (!isset($val[0])) { |
| 1682 | 1682 | // Bad value |
| 1683 | 1683 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1684 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1684 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1685 | 1685 | 'phpvals', $result->httpResponse()); |
| 1686 | 1686 | } |
| 1687 | 1687 | // Normal return value |
@@ -1693,20 +1693,20 @@ discard block |
||
| 1693 | 1693 | if (!is_int($code)) { |
| 1694 | 1694 | /// @todo should we check that it is != 0? |
| 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 | 'phpvals', $result->httpResponse()); |
| 1698 | 1698 | } |
| 1699 | 1699 | $str = @$val['faultString']; |
| 1700 | 1700 | if (!is_string($str)) { |
| 1701 | 1701 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1702 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1702 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1703 | 1703 | 'phpvals', $result->httpResponse()); |
| 1704 | 1704 | } |
| 1705 | 1705 | $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1706 | 1706 | break; |
| 1707 | 1707 | default: |
| 1708 | 1708 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1709 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1709 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1710 | 1710 | 'phpvals', $result->httpResponse()); |
| 1711 | 1711 | } |
| 1712 | 1712 | } |
@@ -1715,14 +1715,14 @@ discard block |
||
| 1715 | 1715 | // return type == 'xmlrpcvals' |
| 1716 | 1716 | if ($rets->kindOf() != 'array') { |
| 1717 | 1717 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1718 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1718 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1719 | 1719 | $result->httpResponse()); |
| 1720 | 1720 | } |
| 1721 | 1721 | $numRets = $rets->count(); |
| 1722 | 1722 | if ($numRets != count($reqs)) { |
| 1723 | 1723 | // wrong number of return values. |
| 1724 | 1724 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1725 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1725 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1726 | 1726 | $result->httpResponse()); |
| 1727 | 1727 | } |
| 1728 | 1728 | |
@@ -1731,7 +1731,7 @@ discard block |
||
| 1731 | 1731 | case 'array': |
| 1732 | 1732 | if ($val->count() != 1) { |
| 1733 | 1733 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1734 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1734 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1735 | 1735 | 'phpvals', $result->httpResponse()); |
| 1736 | 1736 | } |
| 1737 | 1737 | // Normal return value |
@@ -1740,28 +1740,28 @@ discard block |
||
| 1740 | 1740 | case 'struct': |
| 1741 | 1741 | if ($val->count() != 2) { |
| 1742 | 1742 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1743 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1743 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1744 | 1744 | 'phpvals', $result->httpResponse()); |
| 1745 | 1745 | } |
| 1746 | 1746 | /** @var Value $code */ |
| 1747 | 1747 | $code = $val['faultCode']; |
| 1748 | 1748 | if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') { |
| 1749 | 1749 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1750 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1750 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1751 | 1751 | 'xmlrpcvals', $result->httpResponse()); |
| 1752 | 1752 | } |
| 1753 | 1753 | /** @var Value $str */ |
| 1754 | 1754 | $str = $val['faultString']; |
| 1755 | 1755 | if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') { |
| 1756 | 1756 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1757 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1757 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1758 | 1758 | 'xmlrpcvals', $result->httpResponse()); |
| 1759 | 1759 | } |
| 1760 | 1760 | $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse()); |
| 1761 | 1761 | break; |
| 1762 | 1762 | default: |
| 1763 | 1763 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1764 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1764 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1765 | 1765 | 'xmlrpcvals', $result->httpResponse()); |
| 1766 | 1766 | } |
| 1767 | 1767 | } |
@@ -1796,7 +1796,7 @@ discard block |
||
| 1796 | 1796 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 1797 | 1797 | $method = 'http') |
| 1798 | 1798 | { |
| 1799 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1799 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1800 | 1800 | |
| 1801 | 1801 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 1802 | 1802 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -1834,7 +1834,7 @@ discard block |
||
| 1834 | 1834 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 1835 | 1835 | $sslVersion = 0) |
| 1836 | 1836 | { |
| 1837 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1837 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1838 | 1838 | |
| 1839 | 1839 | return $this->sendPayloadCURL($req, $server, $port, $timeout, $username, |
| 1840 | 1840 | $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort, |
@@ -2047,7 +2047,7 @@ discard block |
||
| 2047 | 2047 | public function &__get($name) |
| 2048 | 2048 | { |
| 2049 | 2049 | if (in_array($name, static::$options)) { |
| 2050 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 2050 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 2051 | 2051 | return $this->$name; |
| 2052 | 2052 | } |
| 2053 | 2053 | |
@@ -2058,12 +2058,12 @@ discard block |
||
| 2058 | 2058 | case 'server': |
| 2059 | 2059 | case 'port': |
| 2060 | 2060 | case 'path': |
| 2061 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 2061 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 2062 | 2062 | return $this->$name; |
| 2063 | 2063 | default: |
| 2064 | 2064 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2065 | 2065 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2066 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2066 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2067 | 2067 | $result = null; |
| 2068 | 2068 | return $result; |
| 2069 | 2069 | } |
@@ -2072,7 +2072,7 @@ discard block |
||
| 2072 | 2072 | public function __set($name, $value) |
| 2073 | 2073 | { |
| 2074 | 2074 | if (in_array($name, static::$options)) { |
| 2075 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2075 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2076 | 2076 | $this->$name = $value; |
| 2077 | 2077 | return; |
| 2078 | 2078 | } |
@@ -2084,20 +2084,20 @@ discard block |
||
| 2084 | 2084 | case 'server': |
| 2085 | 2085 | case 'port': |
| 2086 | 2086 | case 'path': |
| 2087 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2087 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2088 | 2088 | $this->$name = $value; |
| 2089 | 2089 | return; |
| 2090 | 2090 | default: |
| 2091 | 2091 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2092 | 2092 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2093 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2093 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2094 | 2094 | } |
| 2095 | 2095 | } |
| 2096 | 2096 | |
| 2097 | 2097 | public function __isset($name) |
| 2098 | 2098 | { |
| 2099 | 2099 | if (in_array($name, static::$options)) { |
| 2100 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2100 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2101 | 2101 | return isset($this->$name); |
| 2102 | 2102 | } |
| 2103 | 2103 | |
@@ -2108,7 +2108,7 @@ discard block |
||
| 2108 | 2108 | case 'server': |
| 2109 | 2109 | case 'port': |
| 2110 | 2110 | case 'path': |
| 2111 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2111 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2112 | 2112 | return isset($this->$name); |
| 2113 | 2113 | default: |
| 2114 | 2114 | return false; |
@@ -2118,7 +2118,7 @@ discard block |
||
| 2118 | 2118 | public function __unset($name) |
| 2119 | 2119 | { |
| 2120 | 2120 | if (in_array($name, static::$options)) { |
| 2121 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2121 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2122 | 2122 | unset($this->$name); |
| 2123 | 2123 | return; |
| 2124 | 2124 | } |
@@ -2130,13 +2130,13 @@ discard block |
||
| 2130 | 2130 | case 'server': |
| 2131 | 2131 | case 'port': |
| 2132 | 2132 | case 'path': |
| 2133 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2133 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2134 | 2134 | unset($this->$name); |
| 2135 | 2135 | return; |
| 2136 | 2136 | default: |
| 2137 | 2137 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2138 | 2138 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2139 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2139 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2140 | 2140 | } |
| 2141 | 2141 | } |
| 2142 | 2142 | } |
@@ -1274,19 +1274,25 @@ discard block |
||
| 1274 | 1274 | $this->errstr = 'no response'; |
| 1275 | 1275 | $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
| 1276 | 1276 | ': ' . curl_error($curl)); |
| 1277 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1277 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1278 | + curl_close($curl); |
|
| 1279 | + } |
|
| 1278 | 1280 | if ($opts['keepalive']) { |
| 1279 | 1281 | $this->xmlrpc_curl_handle = null; |
| 1280 | 1282 | } |
| 1281 | 1283 | } else { |
| 1282 | 1284 | if (!$opts['keepalive']) { |
| 1283 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1285 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1286 | + curl_close($curl); |
|
| 1287 | + } |
|
| 1284 | 1288 | } |
| 1285 | 1289 | $resp = $req->parseResponse($result, true, $opts['return_type']); |
| 1286 | 1290 | if ($opts['keepalive']) { |
| 1287 | 1291 | /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls |
| 1288 | 1292 | if ($resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) { |
| 1289 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1293 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1294 | + curl_close($curl); |
|
| 1295 | + } |
|
| 1290 | 1296 | $this->xmlrpc_curl_handle = null; |
| 1291 | 1297 | } |
| 1292 | 1298 | } |
@@ -1442,7 +1448,9 @@ discard block |
||
| 1442 | 1448 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1443 | 1449 | } else { |
| 1444 | 1450 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
| 1445 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1451 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1452 | + curl_close($curl); |
|
| 1453 | + } |
|
| 1446 | 1454 | return false; |
| 1447 | 1455 | } |
| 1448 | 1456 | break; |
@@ -1457,7 +1465,9 @@ discard block |
||
| 1457 | 1465 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1458 | 1466 | } elseif ($opts['authtype'] != 1) { |
| 1459 | 1467 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
| 1460 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1468 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1469 | + curl_close($curl); |
|
| 1470 | + } |
|
| 1461 | 1471 | return false; |
| 1462 | 1472 | } |
| 1463 | 1473 | } |
@@ -1508,7 +1518,9 @@ discard block |
||
| 1508 | 1518 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1509 | 1519 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1510 | 1520 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
| 1511 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1521 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1522 | + curl_close($curl); |
|
| 1523 | + } |
|
| 1512 | 1524 | return false; |
| 1513 | 1525 | } |
| 1514 | 1526 | } |
@@ -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 | } |
@@ -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,12 +434,12 @@ 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 | 440 | /// @todo allow the user to easily subclass this in a way which allows the resp. headers to be already sent |
| 441 | 441 | /// by now without flagging it as an error. Possibly check for presence of Content-Type header |
| 442 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 442 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | print $payload; |
@@ -528,9 +528,9 @@ discard block |
||
| 528 | 528 | $numParams = count($in); |
| 529 | 529 | } |
| 530 | 530 | foreach ($sigs as $curSig) { |
| 531 | - if (count($curSig) == $numParams + 1) { |
|
| 531 | + if (count($curSig) == $numParams+1) { |
|
| 532 | 532 | $itsOK = 1; |
| 533 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 533 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 534 | 534 | if (is_object($in)) { |
| 535 | 535 | $p = $in->getParam($n); |
| 536 | 536 | if ($p->kindOf() == 'scalar') { |
@@ -543,10 +543,10 @@ discard block |
||
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | // param index is $n+1, as first member of sig is return type |
| 546 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 546 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 547 | 547 | $itsOK = 0; |
| 548 | - $pno = $n + 1; |
|
| 549 | - $wanted = $curSig[$n + 1]; |
|
| 548 | + $pno = $n+1; |
|
| 549 | + $wanted = $curSig[$n+1]; |
|
| 550 | 550 | $got = $pt; |
| 551 | 551 | break; |
| 552 | 552 | } |
@@ -573,10 +573,10 @@ discard block |
||
| 573 | 573 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 574 | 574 | // (this is true even when in CLI mode) |
| 575 | 575 | if (count($_SERVER) == 0) { |
| 576 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 576 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | - if ($this->debug > 1) { |
|
| 579 | + if ($this->debug>1) { |
|
| 580 | 580 | if (function_exists('getallheaders')) { |
| 581 | 581 | $this->debugMsg(''); // empty line |
| 582 | 582 | foreach (getallheaders() as $name => $val) { |
@@ -601,13 +601,13 @@ discard block |
||
| 601 | 601 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 602 | 602 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 603 | 603 | $data = $degzdata; |
| 604 | - if ($this->debug > 1) { |
|
| 605 | - $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 604 | + if ($this->debug>1) { |
|
| 605 | + $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 606 | 606 | } |
| 607 | 607 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 608 | 608 | $data = $degzdata; |
| 609 | - if ($this->debug > 1) { |
|
| 610 | - $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 609 | + if ($this->debug>1) { |
|
| 610 | + $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 611 | 611 | } |
| 612 | 612 | } else { |
| 613 | 613 | $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | if ($reqEncoding == 'ISO-8859-1') { |
| 696 | 696 | $data = utf8_encode($data); |
| 697 | 697 | } else { |
| 698 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
| 698 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
| 699 | 699 | } |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches); |
| 730 | 730 | return new static::$responseClass( |
| 731 | 731 | 0, |
| 732 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 732 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 733 | 733 | $_xh['isf_reason']); |
| 734 | 734 | } elseif ($_xh['isf']) { |
| 735 | 735 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs. |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | return new static::$responseClass( |
| 738 | 738 | 0, |
| 739 | 739 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 740 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']); |
|
| 740 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']); |
|
| 741 | 741 | } else { |
| 742 | 742 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
| 743 | 743 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -747,8 +747,8 @@ discard block |
||
| 747 | 747 | ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 748 | 748 | ) |
| 749 | 749 | ) { |
| 750 | - if ($this->debug > 1) { |
|
| 751 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++"); |
|
| 750 | + if ($this->debug>1) { |
|
| 751 | + $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++"); |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']); |
@@ -756,12 +756,12 @@ discard block |
||
| 756 | 756 | // build a Request object with data parsed from xml and add parameters in |
| 757 | 757 | $req = new Request($_xh['method']); |
| 758 | 758 | /// @todo for more speed, we could just pass in the array to the constructor (and loose the type validation)... |
| 759 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
| 759 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
| 760 | 760 | $req->addParam($_xh['params'][$i]); |
| 761 | 761 | } |
| 762 | 762 | |
| 763 | - if ($this->debug > 1) { |
|
| 764 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 763 | + if ($this->debug>1) { |
|
| 764 | + $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | return $this->execute($req); |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | return new static::$responseClass( |
| 812 | 812 | 0, |
| 813 | 813 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 814 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 814 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 815 | 815 | ); |
| 816 | 816 | } |
| 817 | 817 | } |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | // build string representation of function 'name' |
| 827 | 827 | if (is_array($func)) { |
| 828 | 828 | if (is_object($func[0])) { |
| 829 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 829 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 830 | 830 | } else { |
| 831 | 831 | $funcName = implode('::', $func); |
| 832 | 832 | } |
@@ -838,16 +838,16 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | // verify that function to be invoked is in fact callable |
| 840 | 840 | if (!is_callable($func)) { |
| 841 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 841 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 842 | 842 | return new static::$responseClass( |
| 843 | 843 | 0, |
| 844 | 844 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 845 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 845 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 846 | 846 | ); |
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | if (isset($dmap[$methodName]['exception_handling'])) { |
| 850 | - $exception_handling = (int)$dmap[$methodName]['exception_handling']; |
|
| 850 | + $exception_handling = (int) $dmap[$methodName]['exception_handling']; |
|
| 851 | 851 | } else { |
| 852 | 852 | $exception_handling = $this->exception_handling; |
| 853 | 853 | } |
@@ -868,14 +868,14 @@ discard block |
||
| 868 | 868 | $r = call_user_func($func, $req); |
| 869 | 869 | } |
| 870 | 870 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 871 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 871 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 872 | 872 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 873 | 873 | $r = new static::$responseClass($r); |
| 874 | 874 | } else { |
| 875 | 875 | $r = new static::$responseClass( |
| 876 | 876 | 0, |
| 877 | 877 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 878 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 878 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 879 | 879 | ); |
| 880 | 880 | } |
| 881 | 881 | } |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
| 891 | 891 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
| 892 | 892 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 893 | - $r = new static::$responseClass(0, (int)$r['faultCode'], (string)$r['faultString']); |
|
| 893 | + $r = new static::$responseClass(0, (int) $r['faultCode'], (string) $r['faultString']); |
|
| 894 | 894 | } else { |
| 895 | 895 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
| 896 | 896 | // return type correctly |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | */ |
| 1022 | 1022 | protected function debugMsg($string) |
| 1023 | 1023 | { |
| 1024 | - $this->debug_info .= $string . "\n"; |
|
| 1024 | + $this->debug_info .= $string."\n"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | /** |
@@ -1313,7 +1313,7 @@ discard block |
||
| 1313 | 1313 | $i++; // for error message, we count params from 1 |
| 1314 | 1314 | return static::_xmlrpcs_multicall_error(new static::$responseClass(0, |
| 1315 | 1315 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1316 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1316 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1317 | 1317 | } |
| 1318 | 1318 | } |
| 1319 | 1319 | |
@@ -1394,7 +1394,7 @@ discard block |
||
| 1394 | 1394 | } |
| 1395 | 1395 | } else { |
| 1396 | 1396 | $numCalls = count($req); |
| 1397 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1397 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1398 | 1398 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1399 | 1399 | } |
| 1400 | 1400 | } |
@@ -1422,7 +1422,7 @@ discard block |
||
| 1422 | 1422 | // From PHP 8.4 the E_STRICT constant has been deprecated and will emit deprecation notices. |
| 1423 | 1423 | // PHP core and core extensions since PHP 8.0 and later do not emit E_STRICT notices at all. |
| 1424 | 1424 | // On PHP 7 series before PHP 7.4, some functions conditionally emit E_STRICT notices. |
| 1425 | - if (PHP_VERSION_ID >= 70400) { |
|
| 1425 | + if (PHP_VERSION_ID>=70400) { |
|
| 1426 | 1426 | static::error_occurred($errString); |
| 1427 | 1427 | } elseif ($errCode != E_STRICT) { |
| 1428 | 1428 | static::error_occurred($errString); |
@@ -1463,12 +1463,12 @@ discard block |
||
| 1463 | 1463 | */ |
| 1464 | 1464 | protected function xml_header($charsetEncoding = '') |
| 1465 | 1465 | { |
| 1466 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1466 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1467 | 1467 | |
| 1468 | 1468 | if ($charsetEncoding != '') { |
| 1469 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 1469 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 1470 | 1470 | } else { |
| 1471 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 1471 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 1472 | 1472 | } |
| 1473 | 1473 | } |
| 1474 | 1474 | |
@@ -1484,7 +1484,7 @@ discard block |
||
| 1484 | 1484 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1485 | 1485 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1486 | 1486 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1487 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1487 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1488 | 1488 | return $this->$name; |
| 1489 | 1489 | case 'accepted_charset_encodings': |
| 1490 | 1490 | // manually implement the 'protected property' behaviour |
@@ -1496,16 +1496,16 @@ discard block |
||
| 1496 | 1496 | } |
| 1497 | 1497 | } |
| 1498 | 1498 | if ($canAccess) { |
| 1499 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1499 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1500 | 1500 | return $this->accepted_compression; |
| 1501 | 1501 | } else { |
| 1502 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1502 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | break; |
| 1505 | 1505 | default: |
| 1506 | 1506 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1507 | 1507 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1508 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1508 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1509 | 1509 | $result = null; |
| 1510 | 1510 | return $result; |
| 1511 | 1511 | } |
@@ -1522,7 +1522,7 @@ discard block |
||
| 1522 | 1522 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1523 | 1523 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1524 | 1524 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1525 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1525 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1526 | 1526 | $this->$name = $value; |
| 1527 | 1527 | break; |
| 1528 | 1528 | case 'accepted_charset_encodings': |
@@ -1535,16 +1535,16 @@ discard block |
||
| 1535 | 1535 | } |
| 1536 | 1536 | } |
| 1537 | 1537 | if ($canAccess) { |
| 1538 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1538 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1539 | 1539 | $this->accepted_compression = $value; |
| 1540 | 1540 | } else { |
| 1541 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1541 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1542 | 1542 | } |
| 1543 | 1543 | break; |
| 1544 | 1544 | default: |
| 1545 | 1545 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1546 | 1546 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1547 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1547 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1548 | 1548 | } |
| 1549 | 1549 | } |
| 1550 | 1550 | |
@@ -1559,7 +1559,7 @@ discard block |
||
| 1559 | 1559 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1560 | 1560 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1561 | 1561 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1562 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1562 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1563 | 1563 | return isset($this->$name); |
| 1564 | 1564 | case 'accepted_charset_encodings': |
| 1565 | 1565 | // manually implement the 'protected property' behaviour |
@@ -1571,7 +1571,7 @@ discard block |
||
| 1571 | 1571 | } |
| 1572 | 1572 | } |
| 1573 | 1573 | if ($canAccess) { |
| 1574 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1574 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1575 | 1575 | return isset($this->accepted_compression); |
| 1576 | 1576 | } |
| 1577 | 1577 | // break through voluntarily |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1592 | 1592 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1593 | 1593 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1594 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1594 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1595 | 1595 | unset($this->$name); |
| 1596 | 1596 | break; |
| 1597 | 1597 | case 'accepted_charset_encodings': |
@@ -1604,16 +1604,16 @@ discard block |
||
| 1604 | 1604 | } |
| 1605 | 1605 | } |
| 1606 | 1606 | if ($canAccess) { |
| 1607 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1607 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1608 | 1608 | unset($this->accepted_compression); |
| 1609 | 1609 | } else { |
| 1610 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1610 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1611 | 1611 | } |
| 1612 | 1612 | break; |
| 1613 | 1613 | default: |
| 1614 | 1614 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1615 | 1615 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1616 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1616 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1617 | 1617 | } |
| 1618 | 1618 | } |
| 1619 | 1619 | } |
