gggeek /
phpxmlrpc
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | public function testUtf8ToLatin1All() |
| 49 | 49 | { |
| 50 | 50 | $latinString = "\n\r\t"; |
| 51 | - for($i = 32; $i < 127; $i++) { |
|
| 51 | + for ($i = 32; $i<127; $i++) { |
|
| 52 | 52 | $latinString .= chr($i); |
| 53 | 53 | } |
| 54 | - for($i = 160; $i < 256; $i++) { |
|
| 54 | + for ($i = 160; $i<256; $i++) { |
|
| 55 | 55 | $latinString .= chr($i); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -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 - Webservice wrapper demo</title></head> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $client->setOption(\PhpXmlRpc\Client::OPT_RETURN_TYPE, 'phpvals'); // let client give us back php values instead of xmlrpcvals |
| 21 | 21 | $resp = $client->send(new PhpXmlRpc\Request('system.listMethods')); |
| 22 | 22 | if ($resp->faultCode()) { |
| 23 | - output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n"); |
|
| 23 | + output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n"); |
|
| 24 | 24 | } else { |
| 25 | 25 | output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n"); |
| 26 | 26 | flush(); |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | if ($methodName == 'examples.getStateName') { |
| 33 | 33 | $callable = $wrapper->wrapXmlrpcMethod($client, $methodName); |
| 34 | 34 | if ($callable) { |
| 35 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n"); |
|
| 35 | + output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n"); |
|
| 36 | 36 | } else { |
| 37 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n"); |
|
| 37 | + output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n"); |
|
| 38 | 38 | } |
| 39 | 39 | break; |
| 40 | 40 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | protected function tear_down() |
| 34 | 34 | { |
| 35 | - if ($this->args['DEBUG'] > 0) { |
|
| 35 | + if ($this->args['DEBUG']>0) { |
|
| 36 | 36 | return; |
| 37 | 37 | } |
| 38 | 38 | |
@@ -50,16 +50,16 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | public function debug($message, $context = array()) |
| 52 | 52 | { |
| 53 | - $this->buffer .= $message . "\n"; |
|
| 53 | + $this->buffer .= $message."\n"; |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function error($message, $context = array()) |
| 57 | 57 | { |
| 58 | - $this->buffer .= $message . "\n"; |
|
| 58 | + $this->buffer .= $message."\n"; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function warning($message, $context = array()) |
| 62 | 62 | { |
| 63 | - $this->buffer .= $message . "\n"; |
|
| 63 | + $this->buffer .= $message."\n"; |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -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 | /** |
| 5 | 5 | * Demoing how to inject a custom logger for use by the library |
@@ -21,17 +21,17 @@ discard block |
||
| 21 | 21 | // logger API |
| 22 | 22 | public function debug($message, $context = array()) |
| 23 | 23 | { |
| 24 | - $this->debugBuffer .= $message . "\n"; |
|
| 24 | + $this->debugBuffer .= $message."\n"; |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function error($message, $context = array()) |
| 28 | 28 | { |
| 29 | - $this->errorBuffer .= $message . "\n"; |
|
| 29 | + $this->errorBuffer .= $message."\n"; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function warning($message, $context = array()) |
| 33 | 33 | { |
| 34 | - $this->warningBuffer .= $message . "\n"; |
|
| 34 | + $this->warningBuffer .= $message."\n"; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function getDebug() |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $input = array( |
| 64 | 64 | array('name' => 'Dave', 'age' => 24), |
| 65 | - array('name' => 'Edd', 'age' => 45), |
|
| 66 | - array('name' => 'Joe', 'age' => 37), |
|
| 65 | + array('name' => 'Edd', 'age' => 45), |
|
| 66 | + array('name' => 'Joe', 'age' => 37), |
|
| 67 | 67 | array('name' => 'Fred', 'age' => 27), |
| 68 | 68 | ); |
| 69 | 69 | |
@@ -85,6 +85,6 @@ discard block |
||
| 85 | 85 | $response = $client->send($request); |
| 86 | 86 | output("Response received.<br>"); |
| 87 | 87 | |
| 88 | -output("The client error info is:<pre>\n" . $logger->getError() . "\n</pre>"); |
|
| 89 | -output("The client warning info is:<pre>\n" . $logger->getWarning() . "\n</pre>"); |
|
| 90 | -output("The client debug info is:<pre>\n" . $logger->getDebug() . "\n</pre>"); |
|
| 88 | +output("The client error info is:<pre>\n".$logger->getError()."\n</pre>"); |
|
| 89 | +output("The client warning info is:<pre>\n".$logger->getWarning()."\n</pre>"); |
|
| 90 | +output("The client debug info is:<pre>\n".$logger->getDebug()."\n</pre>"); |
|
@@ -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; |
|
| 778 | - if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'http11_only', 'h2c'))) || |
|
| 777 | + $url = $this->method.'://'.$this->server; |
|
| 778 | + if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'http11_only', '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 | |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | public function send($req, $timeout = 0, $method = '') |
| 824 | 824 | { |
| 825 | 825 | if ($method !== '' || $timeout !== 0) { |
| 826 | - $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated'); |
|
| 826 | + $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated'); |
|
| 827 | 827 | } |
| 828 | 828 | |
| 829 | 829 | // if user does not specify http protocol, use native method of this client |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | $payload = $a; |
| 949 | 949 | $encodingHdr = "Content-Encoding: gzip\r\n"; |
| 950 | 950 | } else { |
| 951 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 951 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 952 | 952 | } |
| 953 | 953 | } else if (function_exists('gzcompress')) { |
| 954 | 954 | $a = @gzcompress($payload); |
@@ -956,14 +956,14 @@ discard block |
||
| 956 | 956 | $payload = $a; |
| 957 | 957 | $encodingHdr = "Content-Encoding: deflate\r\n"; |
| 958 | 958 | } else { |
| 959 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 959 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 960 | 960 | } |
| 961 | 961 | } else { |
| 962 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 962 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 963 | 963 | } |
| 964 | 964 | } else { |
| 965 | 965 | if ($opts['request_compression'] != '') { |
| 966 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 966 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 967 | 967 | } |
| 968 | 968 | } |
| 969 | 969 | |
@@ -971,16 +971,16 @@ discard block |
||
| 971 | 971 | $credentials = ''; |
| 972 | 972 | if ($opts['username'] != '') { |
| 973 | 973 | if ($opts['authtype'] != 1) { |
| 974 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 974 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 975 | 975 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 976 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0'); |
|
| 976 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0'); |
|
| 977 | 977 | } |
| 978 | - $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n"; |
|
| 978 | + $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n"; |
|
| 979 | 979 | } |
| 980 | 980 | |
| 981 | 981 | $acceptedEncoding = ''; |
| 982 | 982 | if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) { |
| 983 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n"; |
|
| 983 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n"; |
|
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | if ($port == 0) { |
@@ -1001,21 +1001,21 @@ discard block |
||
| 1001 | 1001 | } elseif ($method === 'h2') { |
| 1002 | 1002 | $protocol = 'https'; |
| 1003 | 1003 | } else if (strpos($protocol, ':') !== false) { |
| 1004 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
|
| 1005 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'] . |
|
| 1004 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
|
| 1005 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option']. |
|
| 1006 | 1006 | " attempted hacking attempt?. The protocol requested for the call is: '$protocol'"); |
| 1007 | 1007 | } |
| 1008 | 1008 | /// @todo this does not work atm (tested at least with an http proxy forwarding to an https server) - we |
| 1009 | 1009 | /// should implement the CONNECT protocol |
| 1010 | - $uri = $protocol . '://' . $server . ':' . $port . $path; |
|
| 1010 | + $uri = $protocol.'://'.$server.':'.$port.$path; |
|
| 1011 | 1011 | if ($opts['proxy_user'] != '') { |
| 1012 | 1012 | if ($opts['proxy_authtype'] != 1) { |
| 1013 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 1013 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 1014 | 1014 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1015 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with socket transport'); |
|
| 1015 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with socket transport'); |
|
| 1016 | 1016 | } |
| 1017 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' . |
|
| 1018 | - $opts['proxy_pass']) . "\r\n"; |
|
| 1017 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'. |
|
| 1018 | + $opts['proxy_pass'])."\r\n"; |
|
| 1019 | 1019 | } |
| 1020 | 1020 | } else { |
| 1021 | 1021 | $connectServer = $server; |
@@ -1032,14 +1032,14 @@ discard block |
||
| 1032 | 1032 | $version = ''; |
| 1033 | 1033 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1034 | 1034 | /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments |
| 1035 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 1035 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 1036 | 1036 | } |
| 1037 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 1037 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | 1040 | $extraHeaders = ''; |
| 1041 | 1041 | if (is_array($this->extra_headers) && $this->extra_headers) { |
| 1042 | - $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n"; |
|
| 1042 | + $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n"; |
|
| 1043 | 1043 | } |
| 1044 | 1044 | |
| 1045 | 1045 | // omit port if default |
@@ -1047,24 +1047,24 @@ discard block |
||
| 1047 | 1047 | if (($port == 80 && in_array($method, array('http', 'http10', 'http11'))) || ($port == 443 && $method == 'https')) { |
| 1048 | 1048 | $port = ''; |
| 1049 | 1049 | } else { |
| 1050 | - $port = ':' . $port; |
|
| 1051 | - } |
|
| 1052 | - |
|
| 1053 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 1054 | - 'User-Agent: ' . $opts['user_agent'] . "\r\n" . |
|
| 1055 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 1056 | - $credentials . |
|
| 1057 | - $proxyCredentials . |
|
| 1058 | - $acceptedEncoding . |
|
| 1059 | - $encodingHdr . |
|
| 1060 | - 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" . |
|
| 1061 | - $cookieHeader . |
|
| 1062 | - 'Content-Type: ' . $req->getContentType() . "\r\n" . |
|
| 1063 | - $extraHeaders . |
|
| 1064 | - 'Content-Length: ' . strlen($payload) . "\r\n\r\n" . |
|
| 1050 | + $port = ':'.$port; |
|
| 1051 | + } |
|
| 1052 | + |
|
| 1053 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 1054 | + 'User-Agent: '.$opts['user_agent']."\r\n". |
|
| 1055 | + 'Host: '.$server.$port."\r\n". |
|
| 1056 | + $credentials. |
|
| 1057 | + $proxyCredentials. |
|
| 1058 | + $acceptedEncoding. |
|
| 1059 | + $encodingHdr. |
|
| 1060 | + 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n". |
|
| 1061 | + $cookieHeader. |
|
| 1062 | + 'Content-Type: '.$req->getContentType()."\r\n". |
|
| 1063 | + $extraHeaders. |
|
| 1064 | + 'Content-Length: '.strlen($payload)."\r\n\r\n". |
|
| 1065 | 1065 | $payload; |
| 1066 | 1066 | |
| 1067 | - if ($opts['debug'] > 1) { |
|
| 1067 | + if ($opts['debug']>1) { |
|
| 1068 | 1068 | $this->getLogger()->debug("---SENDING---\n$op\n---END---"); |
| 1069 | 1069 | } |
| 1070 | 1070 | |
@@ -1093,13 +1093,13 @@ discard block |
||
| 1093 | 1093 | /// https://www.php.net/manual/en/function.stream-socket-enable-crypto.php |
| 1094 | 1094 | /// https://www.php.net/manual/en/migration56.openssl.php, |
| 1095 | 1095 | /// https://wiki.php.net/rfc/improved-tls-constants |
| 1096 | - switch($opts['sslversion']) { |
|
| 1096 | + switch ($opts['sslversion']) { |
|
| 1097 | 1097 | case 1: // TLSv1x |
| 1098 | 1098 | if (version_compare(PHP_VERSION, '7.2.0', '>=')) { |
| 1099 | 1099 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLS_CLIENT; |
| 1100 | 1100 | } else { |
| 1101 | 1101 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1102 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-any only is supported with PHP 7.2 or later'); |
|
| 1102 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-any only is supported with PHP 7.2 or later'); |
|
| 1103 | 1103 | } |
| 1104 | 1104 | break; |
| 1105 | 1105 | case 2: // SSLv2 |
@@ -1122,12 +1122,12 @@ discard block |
||
| 1122 | 1122 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT; |
| 1123 | 1123 | } else { |
| 1124 | 1124 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1125 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1125 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1126 | 1126 | } |
| 1127 | 1127 | break; |
| 1128 | 1128 | default: |
| 1129 | 1129 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1130 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version'); |
|
| 1130 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version'); |
|
| 1131 | 1131 | } |
| 1132 | 1132 | } |
| 1133 | 1133 | } |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | |
| 1141 | 1141 | $context = stream_context_create($contextOptions); |
| 1142 | 1142 | |
| 1143 | - if ($opts['timeout'] <= 0) { |
|
| 1143 | + if ($opts['timeout']<=0) { |
|
| 1144 | 1144 | $connectTimeout = ini_get('default_socket_timeout'); |
| 1145 | 1145 | } else { |
| 1146 | 1146 | $connectTimeout = $opts['timeout']; |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 1160 | 1160 | STREAM_CLIENT_CONNECT, $context); |
| 1161 | 1161 | if ($fp) { |
| 1162 | - if ($opts['timeout'] > 0) { |
|
| 1162 | + if ($opts['timeout']>0) { |
|
| 1163 | 1163 | stream_set_timeout($fp, $opts['timeout'], 0); |
| 1164 | 1164 | } |
| 1165 | 1165 | } else { |
@@ -1168,8 +1168,8 @@ discard block |
||
| 1168 | 1168 | $this->errstr = $err['message']; |
| 1169 | 1169 | } |
| 1170 | 1170 | |
| 1171 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 1172 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 1171 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 1172 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 1173 | 1173 | } |
| 1174 | 1174 | |
| 1175 | 1175 | /// @todo from here onwards, we can inject the results of stream_get_meta_data in the response. We could |
@@ -1252,19 +1252,19 @@ discard block |
||
| 1252 | 1252 | $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']); |
| 1253 | 1253 | |
| 1254 | 1254 | if (!$curl) { |
| 1255 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1255 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1256 | 1256 | ': error during curl initialization. Check php error log for details'); |
| 1257 | 1257 | } |
| 1258 | 1258 | |
| 1259 | 1259 | $result = curl_exec($curl); |
| 1260 | 1260 | |
| 1261 | - if ($opts['debug'] > 1) { |
|
| 1261 | + if ($opts['debug']>1) { |
|
| 1262 | 1262 | $message = "---CURL INFO---\n"; |
| 1263 | 1263 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1264 | 1264 | if (is_array($val)) { |
| 1265 | 1265 | $val = implode("\n", $val); |
| 1266 | 1266 | } |
| 1267 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1267 | + $message .= $name.': '.$val."\n"; |
|
| 1268 | 1268 | } |
| 1269 | 1269 | $message .= '---END---'; |
| 1270 | 1270 | $this->getLogger()->debug($message); |
@@ -1274,21 +1274,21 @@ discard block |
||
| 1274 | 1274 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1275 | 1275 | |
| 1276 | 1276 | $this->errstr = 'no response'; |
| 1277 | - $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1278 | - ': ' . curl_error($curl)); |
|
| 1279 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1277 | + $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1278 | + ': '.curl_error($curl)); |
|
| 1279 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1280 | 1280 | if ($opts['keepalive']) { |
| 1281 | 1281 | $this->xmlrpc_curl_handle = null; |
| 1282 | 1282 | } |
| 1283 | 1283 | } else { |
| 1284 | 1284 | if (!$opts['keepalive']) { |
| 1285 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1285 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1286 | 1286 | } |
| 1287 | 1287 | $resp = $req->parseResponse($result, true, $opts['return_type']); |
| 1288 | 1288 | if ($opts['keepalive']) { |
| 1289 | 1289 | /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls |
| 1290 | 1290 | if (is_object($resp) && $resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) { |
| 1291 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1291 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1292 | 1292 | $this->xmlrpc_curl_handle = null; |
| 1293 | 1293 | } |
| 1294 | 1294 | } |
@@ -1333,7 +1333,7 @@ discard block |
||
| 1333 | 1333 | $payload = $a; |
| 1334 | 1334 | $encodingHdr = 'Content-Encoding: gzip'; |
| 1335 | 1335 | } else { |
| 1336 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 1336 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 1337 | 1337 | } |
| 1338 | 1338 | } else if (function_exists('gzcompress')) { |
| 1339 | 1339 | $a = @gzcompress($payload); |
@@ -1341,14 +1341,14 @@ discard block |
||
| 1341 | 1341 | $payload = $a; |
| 1342 | 1342 | $encodingHdr = 'Content-Encoding: deflate'; |
| 1343 | 1343 | } else { |
| 1344 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 1344 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 1345 | 1345 | } |
| 1346 | 1346 | } else { |
| 1347 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 1347 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 1348 | 1348 | } |
| 1349 | 1349 | } else { |
| 1350 | 1350 | if ($opts['request_compression'] != '') { |
| 1351 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 1351 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 1352 | 1352 | } |
| 1353 | 1353 | } |
| 1354 | 1354 | |
@@ -1362,12 +1362,12 @@ discard block |
||
| 1362 | 1362 | // http, https |
| 1363 | 1363 | $protocol = $method; |
| 1364 | 1364 | if (strpos($protocol, ':') !== false) { |
| 1365 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1365 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1366 | 1366 | return false; |
| 1367 | 1367 | } |
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $path); |
|
| 1370 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$path); |
|
| 1371 | 1371 | if (!$curl) { |
| 1372 | 1372 | return false; |
| 1373 | 1373 | } |
@@ -1381,7 +1381,7 @@ discard block |
||
| 1381 | 1381 | // results into variable |
| 1382 | 1382 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1383 | 1383 | |
| 1384 | - if ($opts['debug'] > 1) { |
|
| 1384 | + if ($opts['debug']>1) { |
|
| 1385 | 1385 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1386 | 1386 | /// @todo redirect curlopt_stderr to some stream which can be piped to the logger |
| 1387 | 1387 | } |
@@ -1406,7 +1406,7 @@ discard block |
||
| 1406 | 1406 | } |
| 1407 | 1407 | } |
| 1408 | 1408 | // extra headers |
| 1409 | - $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings'])); |
|
| 1409 | + $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])); |
|
| 1410 | 1410 | // if no keepalive is wanted, let the server know it in advance |
| 1411 | 1411 | if (!$opts['keepalive']) { |
| 1412 | 1412 | $headers[] = 'Connection: close'; |
@@ -1446,8 +1446,8 @@ discard block |
||
| 1446 | 1446 | if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) { |
| 1447 | 1447 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1448 | 1448 | } else { |
| 1449 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1450 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1449 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1450 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1451 | 1451 | return false; |
| 1452 | 1452 | } |
| 1453 | 1453 | break; |
@@ -1457,12 +1457,12 @@ discard block |
||
| 1457 | 1457 | } |
| 1458 | 1458 | |
| 1459 | 1459 | if ($opts['username'] && $opts['password']) { |
| 1460 | - curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']); |
|
| 1460 | + curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']); |
|
| 1461 | 1461 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1462 | 1462 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1463 | 1463 | } elseif ($opts['authtype'] != 1) { |
| 1464 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1465 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1464 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1465 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1466 | 1466 | return false; |
| 1467 | 1467 | } |
| 1468 | 1468 | } |
@@ -1506,14 +1506,14 @@ discard block |
||
| 1506 | 1506 | if ($opts['proxyport'] == 0) { |
| 1507 | 1507 | $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1508 | 1508 | } |
| 1509 | - curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']); |
|
| 1509 | + curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']); |
|
| 1510 | 1510 | if ($opts['proxy_user']) { |
| 1511 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']); |
|
| 1511 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']); |
|
| 1512 | 1512 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1513 | 1513 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1514 | 1514 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1515 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1516 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1515 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1516 | + if (PHP_MAJOR_VERSION<8) curl_close($curl); |
|
| 1517 | 1517 | return false; |
| 1518 | 1518 | } |
| 1519 | 1519 | } |
@@ -1524,7 +1524,7 @@ discard block |
||
| 1524 | 1524 | if (count($opts['cookies'])) { |
| 1525 | 1525 | $cookieHeader = ''; |
| 1526 | 1526 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1527 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1527 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1528 | 1528 | } |
| 1529 | 1529 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1530 | 1530 | } |
@@ -1533,7 +1533,7 @@ discard block |
||
| 1533 | 1533 | curl_setopt($curl, $opt, $val); |
| 1534 | 1534 | } |
| 1535 | 1535 | |
| 1536 | - if ($opts['debug'] > 1) { |
|
| 1536 | + if ($opts['debug']>1) { |
|
| 1537 | 1537 | $this->getLogger()->debug("---SENDING---\n$payload\n---END---"); |
| 1538 | 1538 | } |
| 1539 | 1539 | |
@@ -1634,7 +1634,7 @@ discard block |
||
| 1634 | 1634 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1635 | 1635 | $numParams = $req->getNumParams(); |
| 1636 | 1636 | $params = array(); |
| 1637 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1637 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1638 | 1638 | $params[$i] = $req->getParam($i); |
| 1639 | 1639 | } |
| 1640 | 1640 | $call['params'] = new Value($params, 'array'); |
@@ -1656,7 +1656,7 @@ discard block |
||
| 1656 | 1656 | $response = array(); |
| 1657 | 1657 | |
| 1658 | 1658 | if ($this->return_type == 'xml') { |
| 1659 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1659 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1660 | 1660 | $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse()); |
| 1661 | 1661 | } |
| 1662 | 1662 | |
@@ -1664,21 +1664,21 @@ discard block |
||
| 1664 | 1664 | if (!is_array($rets)) { |
| 1665 | 1665 | // bad return type from system.multicall |
| 1666 | 1666 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1667 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1667 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1668 | 1668 | } |
| 1669 | 1669 | $numRets = count($rets); |
| 1670 | 1670 | if ($numRets != count($reqs)) { |
| 1671 | 1671 | // wrong number of return values. |
| 1672 | 1672 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1673 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1673 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1674 | 1674 | $result->httpResponse()); |
| 1675 | 1675 | } |
| 1676 | 1676 | |
| 1677 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1677 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1678 | 1678 | $val = $rets[$i]; |
| 1679 | 1679 | if (!is_array($val)) { |
| 1680 | 1680 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1681 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1681 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1682 | 1682 | 'phpvals', $result->httpResponse()); |
| 1683 | 1683 | } |
| 1684 | 1684 | switch (count($val)) { |
@@ -1686,7 +1686,7 @@ discard block |
||
| 1686 | 1686 | if (!isset($val[0])) { |
| 1687 | 1687 | // Bad value |
| 1688 | 1688 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1689 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1689 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1690 | 1690 | 'phpvals', $result->httpResponse()); |
| 1691 | 1691 | } |
| 1692 | 1692 | // Normal return value |
@@ -1698,20 +1698,20 @@ discard block |
||
| 1698 | 1698 | if (!is_int($code)) { |
| 1699 | 1699 | /// @todo should we check that it is != 0? |
| 1700 | 1700 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1701 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1701 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1702 | 1702 | 'phpvals', $result->httpResponse()); |
| 1703 | 1703 | } |
| 1704 | 1704 | $str = @$val['faultString']; |
| 1705 | 1705 | if (!is_string($str)) { |
| 1706 | 1706 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1707 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1707 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1708 | 1708 | 'phpvals', $result->httpResponse()); |
| 1709 | 1709 | } |
| 1710 | 1710 | $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1711 | 1711 | break; |
| 1712 | 1712 | default: |
| 1713 | 1713 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1714 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1714 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1715 | 1715 | 'phpvals', $result->httpResponse()); |
| 1716 | 1716 | } |
| 1717 | 1717 | } |
@@ -1720,14 +1720,14 @@ discard block |
||
| 1720 | 1720 | // return type == 'xmlrpcvals' |
| 1721 | 1721 | if ($rets->kindOf() != 'array') { |
| 1722 | 1722 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1723 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1723 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1724 | 1724 | $result->httpResponse()); |
| 1725 | 1725 | } |
| 1726 | 1726 | $numRets = $rets->count(); |
| 1727 | 1727 | if ($numRets != count($reqs)) { |
| 1728 | 1728 | // wrong number of return values. |
| 1729 | 1729 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1730 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1730 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1731 | 1731 | $result->httpResponse()); |
| 1732 | 1732 | } |
| 1733 | 1733 | |
@@ -1736,7 +1736,7 @@ discard block |
||
| 1736 | 1736 | case 'array': |
| 1737 | 1737 | if ($val->count() != 1) { |
| 1738 | 1738 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1739 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1739 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1740 | 1740 | 'phpvals', $result->httpResponse()); |
| 1741 | 1741 | } |
| 1742 | 1742 | // Normal return value |
@@ -1745,28 +1745,28 @@ discard block |
||
| 1745 | 1745 | case 'struct': |
| 1746 | 1746 | if ($val->count() != 2) { |
| 1747 | 1747 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1748 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1748 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1749 | 1749 | 'phpvals', $result->httpResponse()); |
| 1750 | 1750 | } |
| 1751 | 1751 | /** @var Value $code */ |
| 1752 | 1752 | $code = $val['faultCode']; |
| 1753 | 1753 | if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') { |
| 1754 | 1754 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1755 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1755 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1756 | 1756 | 'xmlrpcvals', $result->httpResponse()); |
| 1757 | 1757 | } |
| 1758 | 1758 | /** @var Value $str */ |
| 1759 | 1759 | $str = $val['faultString']; |
| 1760 | 1760 | if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') { |
| 1761 | 1761 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1762 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1762 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1763 | 1763 | 'xmlrpcvals', $result->httpResponse()); |
| 1764 | 1764 | } |
| 1765 | 1765 | $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse()); |
| 1766 | 1766 | break; |
| 1767 | 1767 | default: |
| 1768 | 1768 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1769 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1769 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1770 | 1770 | 'xmlrpcvals', $result->httpResponse()); |
| 1771 | 1771 | } |
| 1772 | 1772 | } |
@@ -1801,7 +1801,7 @@ discard block |
||
| 1801 | 1801 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 1802 | 1802 | $method = 'http') |
| 1803 | 1803 | { |
| 1804 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1804 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1805 | 1805 | |
| 1806 | 1806 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 1807 | 1807 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -1839,7 +1839,7 @@ discard block |
||
| 1839 | 1839 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 1840 | 1840 | $sslVersion = 0) |
| 1841 | 1841 | { |
| 1842 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1842 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1843 | 1843 | |
| 1844 | 1844 | return $this->sendPayloadCURL($req, $server, $port, $timeout, $username, |
| 1845 | 1845 | $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort, |
@@ -2052,7 +2052,7 @@ discard block |
||
| 2052 | 2052 | public function &__get($name) |
| 2053 | 2053 | { |
| 2054 | 2054 | if (in_array($name, static::$options)) { |
| 2055 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 2055 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 2056 | 2056 | return $this->$name; |
| 2057 | 2057 | } |
| 2058 | 2058 | |
@@ -2063,12 +2063,12 @@ discard block |
||
| 2063 | 2063 | case 'server': |
| 2064 | 2064 | case 'port': |
| 2065 | 2065 | case 'path': |
| 2066 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 2066 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 2067 | 2067 | return $this->$name; |
| 2068 | 2068 | default: |
| 2069 | 2069 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2070 | 2070 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2071 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2071 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2072 | 2072 | $result = null; |
| 2073 | 2073 | return $result; |
| 2074 | 2074 | } |
@@ -2077,7 +2077,7 @@ discard block |
||
| 2077 | 2077 | public function __set($name, $value) |
| 2078 | 2078 | { |
| 2079 | 2079 | if (in_array($name, static::$options)) { |
| 2080 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2080 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2081 | 2081 | $this->$name = $value; |
| 2082 | 2082 | return; |
| 2083 | 2083 | } |
@@ -2089,20 +2089,20 @@ discard block |
||
| 2089 | 2089 | case 'server': |
| 2090 | 2090 | case 'port': |
| 2091 | 2091 | case 'path': |
| 2092 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2092 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2093 | 2093 | $this->$name = $value; |
| 2094 | 2094 | return; |
| 2095 | 2095 | default: |
| 2096 | 2096 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2097 | 2097 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2098 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2098 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2099 | 2099 | } |
| 2100 | 2100 | } |
| 2101 | 2101 | |
| 2102 | 2102 | public function __isset($name) |
| 2103 | 2103 | { |
| 2104 | 2104 | if (in_array($name, static::$options)) { |
| 2105 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2105 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2106 | 2106 | return isset($this->$name); |
| 2107 | 2107 | } |
| 2108 | 2108 | |
@@ -2113,7 +2113,7 @@ discard block |
||
| 2113 | 2113 | case 'server': |
| 2114 | 2114 | case 'port': |
| 2115 | 2115 | case 'path': |
| 2116 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2116 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2117 | 2117 | return isset($this->$name); |
| 2118 | 2118 | default: |
| 2119 | 2119 | return false; |
@@ -2123,7 +2123,7 @@ discard block |
||
| 2123 | 2123 | public function __unset($name) |
| 2124 | 2124 | { |
| 2125 | 2125 | if (in_array($name, static::$options)) { |
| 2126 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2126 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2127 | 2127 | unset($this->$name); |
| 2128 | 2128 | return; |
| 2129 | 2129 | } |
@@ -2135,13 +2135,13 @@ discard block |
||
| 2135 | 2135 | case 'server': |
| 2136 | 2136 | case 'port': |
| 2137 | 2137 | case 'path': |
| 2138 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2138 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2139 | 2139 | unset($this->$name); |
| 2140 | 2140 | return; |
| 2141 | 2141 | default: |
| 2142 | 2142 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2143 | 2143 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2144 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2144 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2145 | 2145 | } |
| 2146 | 2146 | } |
| 2147 | 2147 | } |
@@ -1276,19 +1276,25 @@ discard block |
||
| 1276 | 1276 | $this->errstr = 'no response'; |
| 1277 | 1277 | $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
| 1278 | 1278 | ': ' . curl_error($curl)); |
| 1279 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1279 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1280 | + curl_close($curl); |
|
| 1281 | + } |
|
| 1280 | 1282 | if ($opts['keepalive']) { |
| 1281 | 1283 | $this->xmlrpc_curl_handle = null; |
| 1282 | 1284 | } |
| 1283 | 1285 | } else { |
| 1284 | 1286 | if (!$opts['keepalive']) { |
| 1285 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1287 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1288 | + curl_close($curl); |
|
| 1289 | + } |
|
| 1286 | 1290 | } |
| 1287 | 1291 | $resp = $req->parseResponse($result, true, $opts['return_type']); |
| 1288 | 1292 | if ($opts['keepalive']) { |
| 1289 | 1293 | /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls |
| 1290 | 1294 | if (is_object($resp) && $resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) { |
| 1291 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1295 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1296 | + curl_close($curl); |
|
| 1297 | + } |
|
| 1292 | 1298 | $this->xmlrpc_curl_handle = null; |
| 1293 | 1299 | } |
| 1294 | 1300 | } |
@@ -1447,7 +1453,9 @@ discard block |
||
| 1447 | 1453 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1448 | 1454 | } else { |
| 1449 | 1455 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
| 1450 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1456 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1457 | + curl_close($curl); |
|
| 1458 | + } |
|
| 1451 | 1459 | return false; |
| 1452 | 1460 | } |
| 1453 | 1461 | break; |
@@ -1462,7 +1470,9 @@ discard block |
||
| 1462 | 1470 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1463 | 1471 | } elseif ($opts['authtype'] != 1) { |
| 1464 | 1472 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
| 1465 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1473 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1474 | + curl_close($curl); |
|
| 1475 | + } |
|
| 1466 | 1476 | return false; |
| 1467 | 1477 | } |
| 1468 | 1478 | } |
@@ -1513,7 +1523,9 @@ discard block |
||
| 1513 | 1523 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1514 | 1524 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1515 | 1525 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
| 1516 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
| 1526 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 1527 | + curl_close($curl); |
|
| 1528 | + } |
|
| 1517 | 1529 | return false; |
| 1518 | 1530 | } |
| 1519 | 1531 | } |
