gggeek /
phpxmlrpc
@@ -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 | } |
@@ -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 the code-generation capabilities of the library: create all that is required to expose as xml-rpc methods |
@@ -38,33 +38,33 @@ discard block |
||
| 38 | 38 | // generate a file with a class definition |
| 39 | 39 | |
| 40 | 40 | // the generated code does not have an autoloader included - we need to add in one |
| 41 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 41 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 42 | 42 | |
| 43 | 43 | file_put_contents($targetClassFile, |
| 44 | - "<?php\n\n" . |
|
| 45 | - "require_once '$autoloader';\n\n" . |
|
| 44 | + "<?php\n\n". |
|
| 45 | + "require_once '$autoloader';\n\n". |
|
| 46 | 46 | "class MyServerClass\n{\n\n" |
| 47 | 47 | ) || die('uh oh'); |
| 48 | 48 | |
| 49 | 49 | // we mangle a bit the code we get from wrapPhpClass to turn it into a php class definition instead of a bunch of functions |
| 50 | 50 | |
| 51 | -foreach($code as $methodName => $methodDef) { |
|
| 52 | - file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh'); |
|
| 53 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
| 51 | +foreach ($code as $methodName => $methodDef) { |
|
| 52 | + file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh'); |
|
| 53 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
| 54 | 54 | unset($code[$methodName]['source']); |
| 55 | 55 | } |
| 56 | 56 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
| 57 | 57 | |
| 58 | 58 | // generate separate files with the xml-rpc server instantiation and its dispatch map |
| 59 | 59 | |
| 60 | -file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n"); |
|
| 60 | +file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n"); |
|
| 61 | 61 | |
| 62 | 62 | file_put_contents($targetControllerFile, |
| 63 | - "<?php\n\n" . |
|
| 63 | + "<?php\n\n". |
|
| 64 | 64 | |
| 65 | - "require_once '$autoloader';\n\n" . |
|
| 65 | + "require_once '$autoloader';\n\n". |
|
| 66 | 66 | |
| 67 | - "require_once '$targetClassFile';\n\n" . |
|
| 67 | + "require_once '$targetClassFile';\n\n". |
|
| 68 | 68 | |
| 69 | 69 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
| 70 | 70 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -74,12 +74,12 @@ discard block |
||
| 74 | 74 | // Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm); |
| 75 | 75 | // Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm); |
| 76 | 76 | |
| 77 | - "\$dm = require_once '$targetDispatchMapFile';\n" . |
|
| 78 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n\n" . |
|
| 79 | - '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" . |
|
| 80 | - '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" . |
|
| 81 | - '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n\n" . |
|
| 82 | - '$s->service();' . "\n" |
|
| 77 | + "\$dm = require_once '$targetDispatchMapFile';\n". |
|
| 78 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n\n". |
|
| 79 | + '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n". |
|
| 80 | + '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n". |
|
| 81 | + '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n\n". |
|
| 82 | + '$s->service();'."\n" |
|
| 83 | 83 | ) || die('uh oh'); |
| 84 | 84 | |
| 85 | 85 | // test that everything worked by running it in realtime (note that this script will return an xml-rpc error message if |
@@ -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 | |
@@ -326,10 +326,10 @@ discard block |
||
| 326 | 326 | $server = $parts['host']; |
| 327 | 327 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 328 | 328 | if (isset($parts['query'])) { |
| 329 | - $path .= '?' . $parts['query']; |
|
| 329 | + $path .= '?'.$parts['query']; |
|
| 330 | 330 | } |
| 331 | 331 | if (isset($parts['fragment'])) { |
| 332 | - $path .= '#' . $parts['fragment']; |
|
| 332 | + $path .= '#'.$parts['fragment']; |
|
| 333 | 333 | } |
| 334 | 334 | if (isset($parts['port'])) { |
| 335 | 335 | $port = $parts['port']; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | } |
| 347 | 347 | if ($path == '' || $path[0] != '/') { |
| 348 | - $this->path = '/' . $path; |
|
| 348 | + $this->path = '/'.$path; |
|
| 349 | 349 | } else { |
| 350 | 350 | $this->path = $path; |
| 351 | 351 | } |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | //$this->accepted_charset_encodings = $ch->knownCharsets(); |
| 378 | 378 | |
| 379 | 379 | // initialize user_agent string |
| 380 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 380 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | /** |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | public function setSSLVerifyPeer($i) |
| 551 | 551 | { |
| 552 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 552 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 553 | 553 | |
| 554 | 554 | $this->verifypeer = $i; |
| 555 | 555 | return $this; |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | */ |
| 567 | 567 | public function setSSLVerifyHost($i) |
| 568 | 568 | { |
| 569 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 569 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 570 | 570 | |
| 571 | 571 | $this->verifyhost = $i; |
| 572 | 572 | return $this; |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | */ |
| 582 | 582 | public function setSSLVersion($i) |
| 583 | 583 | { |
| 584 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 584 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 585 | 585 | |
| 586 | 586 | $this->sslversion = $i; |
| 587 | 587 | return $this; |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | */ |
| 647 | 647 | public function setRequestCompression($compMethod) |
| 648 | 648 | { |
| 649 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 649 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 650 | 650 | |
| 651 | 651 | $this->request_compression = $compMethod; |
| 652 | 652 | return $this; |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | */ |
| 697 | 697 | public function setCurlOptions($options) |
| 698 | 698 | { |
| 699 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 699 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 700 | 700 | |
| 701 | 701 | $this->extracurlopts = $options; |
| 702 | 702 | return $this; |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | public function setUseCurl($useCurlMode) |
| 711 | 711 | { |
| 712 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 712 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 713 | 713 | |
| 714 | 714 | $this->use_curl = $useCurlMode; |
| 715 | 715 | return $this; |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | */ |
| 728 | 728 | public function setUserAgent($agentString) |
| 729 | 729 | { |
| 730 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 730 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 731 | 731 | |
| 732 | 732 | $this->user_agent = $agentString; |
| 733 | 733 | return $this; |
@@ -758,12 +758,12 @@ discard block |
||
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - $url = $this->method . '://' . $this->server; |
|
| 761 | + $url = $this->method.'://'.$this->server; |
|
| 762 | 762 | if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) || |
| 763 | 763 | ($this->port == 443 && in_array($this->method, array('https', 'h2')))) { |
| 764 | - return $url . $this->path; |
|
| 764 | + return $url.$this->path; |
|
| 765 | 765 | } else { |
| 766 | - return $url . ':' . $this->port . $this->path; |
|
| 766 | + return $url.':'.$this->port.$this->path; |
|
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | public function send($req, $timeout = 0, $method = '') |
| 804 | 804 | { |
| 805 | 805 | if ($method !== '' || $timeout !== 0) { |
| 806 | - $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated'); |
|
| 806 | + $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated'); |
|
| 807 | 807 | } |
| 808 | 808 | |
| 809 | 809 | // if user does not specify http protocol, use native method of this client |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | $payload = $a; |
| 922 | 922 | $encodingHdr = "Content-Encoding: gzip\r\n"; |
| 923 | 923 | } else { |
| 924 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 924 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 925 | 925 | } |
| 926 | 926 | } else if (function_exists('gzcompress')) { |
| 927 | 927 | $a = @gzcompress($payload); |
@@ -929,14 +929,14 @@ discard block |
||
| 929 | 929 | $payload = $a; |
| 930 | 930 | $encodingHdr = "Content-Encoding: deflate\r\n"; |
| 931 | 931 | } else { |
| 932 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 932 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 933 | 933 | } |
| 934 | 934 | } else { |
| 935 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 935 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 936 | 936 | } |
| 937 | 937 | } else { |
| 938 | 938 | if ($opts['request_compression'] != '') { |
| 939 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 939 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 940 | 940 | } |
| 941 | 941 | } |
| 942 | 942 | |
@@ -944,16 +944,16 @@ discard block |
||
| 944 | 944 | $credentials = ''; |
| 945 | 945 | if ($opts['username'] != '') { |
| 946 | 946 | if ($opts['authtype'] != 1) { |
| 947 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 947 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 948 | 948 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 949 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0'); |
|
| 949 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0'); |
|
| 950 | 950 | } |
| 951 | - $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n"; |
|
| 951 | + $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n"; |
|
| 952 | 952 | } |
| 953 | 953 | |
| 954 | 954 | $acceptedEncoding = ''; |
| 955 | 955 | if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) { |
| 956 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n"; |
|
| 956 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n"; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | if ($port == 0) { |
@@ -969,15 +969,15 @@ discard block |
||
| 969 | 969 | $connectPort = $opts['proxyport']; |
| 970 | 970 | $transport = 'tcp'; |
| 971 | 971 | /// @todo check: should we not use https in some cases? |
| 972 | - $uri = 'http://' . $server . ':' . $port . $path; |
|
| 972 | + $uri = 'http://'.$server.':'.$port.$path; |
|
| 973 | 973 | if ($opts['proxy_user'] != '') { |
| 974 | 974 | if ($opts['proxy_authtype'] != 1) { |
| 975 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 975 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 976 | 976 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 977 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 977 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 978 | 978 | } |
| 979 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' . |
|
| 980 | - $opts['proxy_pass']) . "\r\n"; |
|
| 979 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'. |
|
| 980 | + $opts['proxy_pass'])."\r\n"; |
|
| 981 | 981 | } |
| 982 | 982 | } else { |
| 983 | 983 | $connectServer = $server; |
@@ -993,32 +993,32 @@ discard block |
||
| 993 | 993 | $version = ''; |
| 994 | 994 | foreach ($opts['cookies'] as $name => $cookie) { |
| 995 | 995 | /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments |
| 996 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 996 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 997 | 997 | } |
| 998 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 998 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | // omit port if default |
| 1002 | 1002 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 1003 | 1003 | $port = ''; |
| 1004 | 1004 | } else { |
| 1005 | - $port = ':' . $port; |
|
| 1006 | - } |
|
| 1007 | - |
|
| 1008 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 1009 | - 'User-Agent: ' . $opts['user_agent'] . "\r\n" . |
|
| 1010 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 1011 | - $credentials . |
|
| 1012 | - $proxyCredentials . |
|
| 1013 | - $acceptedEncoding . |
|
| 1014 | - $encodingHdr . |
|
| 1015 | - 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" . |
|
| 1016 | - $cookieHeader . |
|
| 1017 | - 'Content-Type: ' . $req->getContentType() . "\r\nContent-Length: " . |
|
| 1018 | - strlen($payload) . "\r\n\r\n" . |
|
| 1005 | + $port = ':'.$port; |
|
| 1006 | + } |
|
| 1007 | + |
|
| 1008 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 1009 | + 'User-Agent: '.$opts['user_agent']."\r\n". |
|
| 1010 | + 'Host: '.$server.$port."\r\n". |
|
| 1011 | + $credentials. |
|
| 1012 | + $proxyCredentials. |
|
| 1013 | + $acceptedEncoding. |
|
| 1014 | + $encodingHdr. |
|
| 1015 | + 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n". |
|
| 1016 | + $cookieHeader. |
|
| 1017 | + 'Content-Type: '.$req->getContentType()."\r\nContent-Length: ". |
|
| 1018 | + strlen($payload)."\r\n\r\n". |
|
| 1019 | 1019 | $payload; |
| 1020 | 1020 | |
| 1021 | - if ($opts['debug'] > 1) { |
|
| 1021 | + if ($opts['debug']>1) { |
|
| 1022 | 1022 | $this->getLogger()->debug("---SENDING---\n$op\n---END---"); |
| 1023 | 1023 | } |
| 1024 | 1024 | |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | |
| 1052 | 1052 | $context = stream_context_create($contextOptions); |
| 1053 | 1053 | |
| 1054 | - if ($opts['timeout'] <= 0) { |
|
| 1054 | + if ($opts['timeout']<=0) { |
|
| 1055 | 1055 | $connectTimeout = ini_get('default_socket_timeout'); |
| 1056 | 1056 | } else { |
| 1057 | 1057 | $connectTimeout = $opts['timeout']; |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 1064 | 1064 | STREAM_CLIENT_CONNECT, $context); |
| 1065 | 1065 | if ($fp) { |
| 1066 | - if ($opts['timeout'] > 0) { |
|
| 1066 | + if ($opts['timeout']>0) { |
|
| 1067 | 1067 | stream_set_timeout($fp, $opts['timeout'], 0); |
| 1068 | 1068 | } |
| 1069 | 1069 | } else { |
@@ -1072,8 +1072,8 @@ discard block |
||
| 1072 | 1072 | $this->errstr = $err['message']; |
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 1076 | - $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 1075 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 1076 | + $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 1077 | 1077 | |
| 1078 | 1078 | return $r; |
| 1079 | 1079 | } |
@@ -1140,19 +1140,19 @@ discard block |
||
| 1140 | 1140 | $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']); |
| 1141 | 1141 | |
| 1142 | 1142 | if (!$curl) { |
| 1143 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1143 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1144 | 1144 | ': error during curl initialization. Check php error log for details'); |
| 1145 | 1145 | } |
| 1146 | 1146 | |
| 1147 | 1147 | $result = curl_exec($curl); |
| 1148 | 1148 | |
| 1149 | - if ($opts['debug'] > 1) { |
|
| 1149 | + if ($opts['debug']>1) { |
|
| 1150 | 1150 | $message = "---CURL INFO---\n"; |
| 1151 | 1151 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1152 | 1152 | if (is_array($val)) { |
| 1153 | 1153 | $val = implode("\n", $val); |
| 1154 | 1154 | } |
| 1155 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1155 | + $message .= $name.': '.$val."\n"; |
|
| 1156 | 1156 | } |
| 1157 | 1157 | $message .= '---END---'; |
| 1158 | 1158 | $this->getLogger()->debug($message); |
@@ -1162,8 +1162,8 @@ discard block |
||
| 1162 | 1162 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1163 | 1163 | |
| 1164 | 1164 | $this->errstr = 'no response'; |
| 1165 | - $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1166 | - ': ' . curl_error($curl)); |
|
| 1165 | + $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1166 | + ': '.curl_error($curl)); |
|
| 1167 | 1167 | curl_close($curl); |
| 1168 | 1168 | if ($opts['keepalive']) { |
| 1169 | 1169 | $this->xmlrpc_curl_handle = null; |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | $payload = $a; |
| 1222 | 1222 | $encodingHdr = 'Content-Encoding: gzip'; |
| 1223 | 1223 | } else { |
| 1224 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 1224 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 1225 | 1225 | } |
| 1226 | 1226 | } else if (function_exists('gzcompress')) { |
| 1227 | 1227 | $a = @gzcompress($payload); |
@@ -1229,14 +1229,14 @@ discard block |
||
| 1229 | 1229 | $payload = $a; |
| 1230 | 1230 | $encodingHdr = 'Content-Encoding: deflate'; |
| 1231 | 1231 | } else { |
| 1232 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 1232 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 1233 | 1233 | } |
| 1234 | 1234 | } else { |
| 1235 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 1235 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 1236 | 1236 | } |
| 1237 | 1237 | } else { |
| 1238 | 1238 | if ($opts['request_compression'] != '') { |
| 1239 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 1239 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 1240 | 1240 | } |
| 1241 | 1241 | } |
| 1242 | 1242 | |
@@ -1250,12 +1250,12 @@ discard block |
||
| 1250 | 1250 | // http, https |
| 1251 | 1251 | $protocol = $method; |
| 1252 | 1252 | if (strpos($protocol, ':') !== false) { |
| 1253 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1253 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1254 | 1254 | return false; |
| 1255 | 1255 | } |
| 1256 | 1256 | } |
| 1257 | 1257 | } |
| 1258 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $path); |
|
| 1258 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$path); |
|
| 1259 | 1259 | if (!$curl) { |
| 1260 | 1260 | return false; |
| 1261 | 1261 | } |
@@ -1269,7 +1269,7 @@ discard block |
||
| 1269 | 1269 | // results into variable |
| 1270 | 1270 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1271 | 1271 | |
| 1272 | - if ($opts['debug'] > 1) { |
|
| 1272 | + if ($opts['debug']>1) { |
|
| 1273 | 1273 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1274 | 1274 | /// @todo redirect curlopt_stderr to some stream which can be piped to the logger |
| 1275 | 1275 | } |
@@ -1294,7 +1294,7 @@ discard block |
||
| 1294 | 1294 | } |
| 1295 | 1295 | } |
| 1296 | 1296 | // extra headers |
| 1297 | - $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings'])); |
|
| 1297 | + $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])); |
|
| 1298 | 1298 | // if no keepalive is wanted, let the server know it in advance |
| 1299 | 1299 | if (!$opts['keepalive']) { |
| 1300 | 1300 | $headers[] = 'Connection: close'; |
@@ -1311,7 +1311,7 @@ discard block |
||
| 1311 | 1311 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1312 | 1312 | // timeout is borked |
| 1313 | 1313 | if ($opts['timeout']) { |
| 1314 | - curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout'] - 1); |
|
| 1314 | + curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout']-1); |
|
| 1315 | 1315 | } |
| 1316 | 1316 | |
| 1317 | 1317 | switch ($method) { |
@@ -1325,7 +1325,7 @@ discard block |
||
| 1325 | 1325 | if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) { |
| 1326 | 1326 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1327 | 1327 | } else { |
| 1328 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1328 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1329 | 1329 | curl_close($curl); |
| 1330 | 1330 | return false; |
| 1331 | 1331 | } |
@@ -1336,11 +1336,11 @@ discard block |
||
| 1336 | 1336 | } |
| 1337 | 1337 | |
| 1338 | 1338 | if ($opts['username'] && $opts['password']) { |
| 1339 | - curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']); |
|
| 1339 | + curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']); |
|
| 1340 | 1340 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1341 | 1341 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1342 | 1342 | } elseif ($opts['authtype'] != 1) { |
| 1343 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1343 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1344 | 1344 | curl_close($curl); |
| 1345 | 1345 | return false; |
| 1346 | 1346 | } |
@@ -1385,13 +1385,13 @@ discard block |
||
| 1385 | 1385 | if ($opts['proxyport'] == 0) { |
| 1386 | 1386 | $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1387 | 1387 | } |
| 1388 | - curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']); |
|
| 1388 | + curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']); |
|
| 1389 | 1389 | if ($opts['proxy_user']) { |
| 1390 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']); |
|
| 1390 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']); |
|
| 1391 | 1391 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1392 | 1392 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1393 | 1393 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1394 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1394 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1395 | 1395 | curl_close($curl); |
| 1396 | 1396 | return false; |
| 1397 | 1397 | } |
@@ -1403,7 +1403,7 @@ discard block |
||
| 1403 | 1403 | if (count($opts['cookies'])) { |
| 1404 | 1404 | $cookieHeader = ''; |
| 1405 | 1405 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1406 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1406 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1407 | 1407 | } |
| 1408 | 1408 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1409 | 1409 | } |
@@ -1412,7 +1412,7 @@ discard block |
||
| 1412 | 1412 | curl_setopt($curl, $opt, $val); |
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | - if ($opts['debug'] > 1) { |
|
| 1415 | + if ($opts['debug']>1) { |
|
| 1416 | 1416 | $this->getLogger()->debug("---SENDING---\n$payload\n---END---"); |
| 1417 | 1417 | } |
| 1418 | 1418 | |
@@ -1513,7 +1513,7 @@ discard block |
||
| 1513 | 1513 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1514 | 1514 | $numParams = $req->getNumParams(); |
| 1515 | 1515 | $params = array(); |
| 1516 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1516 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1517 | 1517 | $params[$i] = $req->getParam($i); |
| 1518 | 1518 | } |
| 1519 | 1519 | $call['params'] = new Value($params, 'array'); |
@@ -1535,7 +1535,7 @@ discard block |
||
| 1535 | 1535 | $response = array(); |
| 1536 | 1536 | |
| 1537 | 1537 | if ($this->return_type == 'xml') { |
| 1538 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1538 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1539 | 1539 | $response[] = new Response($rets, 0, '', 'xml', $result->httpResponse()); |
| 1540 | 1540 | } |
| 1541 | 1541 | |
@@ -1543,21 +1543,21 @@ discard block |
||
| 1543 | 1543 | if (!is_array($rets)) { |
| 1544 | 1544 | // bad return type from system.multicall |
| 1545 | 1545 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1546 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1546 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1547 | 1547 | } |
| 1548 | 1548 | $numRets = count($rets); |
| 1549 | 1549 | if ($numRets != count($reqs)) { |
| 1550 | 1550 | // wrong number of return values. |
| 1551 | 1551 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1552 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1552 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1553 | 1553 | $result->httpResponse()); |
| 1554 | 1554 | } |
| 1555 | 1555 | |
| 1556 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1556 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1557 | 1557 | $val = $rets[$i]; |
| 1558 | 1558 | if (!is_array($val)) { |
| 1559 | 1559 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1560 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1560 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1561 | 1561 | 'phpvals', $result->httpResponse()); |
| 1562 | 1562 | } |
| 1563 | 1563 | switch (count($val)) { |
@@ -1565,7 +1565,7 @@ discard block |
||
| 1565 | 1565 | if (!isset($val[0])) { |
| 1566 | 1566 | // Bad value |
| 1567 | 1567 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1568 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1568 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1569 | 1569 | 'phpvals', $result->httpResponse()); |
| 1570 | 1570 | } |
| 1571 | 1571 | // Normal return value |
@@ -1577,20 +1577,20 @@ discard block |
||
| 1577 | 1577 | if (!is_int($code)) { |
| 1578 | 1578 | /// @todo should we check that it is != 0? |
| 1579 | 1579 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1580 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1580 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1581 | 1581 | 'phpvals', $result->httpResponse()); |
| 1582 | 1582 | } |
| 1583 | 1583 | $str = @$val['faultString']; |
| 1584 | 1584 | if (!is_string($str)) { |
| 1585 | 1585 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1586 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1586 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1587 | 1587 | 'phpvals', $result->httpResponse()); |
| 1588 | 1588 | } |
| 1589 | 1589 | $response[$i] = new Response(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1590 | 1590 | break; |
| 1591 | 1591 | default: |
| 1592 | 1592 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1593 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1593 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1594 | 1594 | 'phpvals', $result->httpResponse()); |
| 1595 | 1595 | } |
| 1596 | 1596 | } |
@@ -1599,14 +1599,14 @@ discard block |
||
| 1599 | 1599 | // return type == 'xmlrpcvals' |
| 1600 | 1600 | if ($rets->kindOf() != 'array') { |
| 1601 | 1601 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1602 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1602 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1603 | 1603 | $result->httpResponse()); |
| 1604 | 1604 | } |
| 1605 | 1605 | $numRets = $rets->count(); |
| 1606 | 1606 | if ($numRets != count($reqs)) { |
| 1607 | 1607 | // wrong number of return values. |
| 1608 | 1608 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1609 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1609 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1610 | 1610 | $result->httpResponse()); |
| 1611 | 1611 | } |
| 1612 | 1612 | |
@@ -1615,7 +1615,7 @@ discard block |
||
| 1615 | 1615 | case 'array': |
| 1616 | 1616 | if ($val->count() != 1) { |
| 1617 | 1617 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1618 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1618 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1619 | 1619 | 'phpvals', $result->httpResponse()); |
| 1620 | 1620 | } |
| 1621 | 1621 | // Normal return value |
@@ -1624,28 +1624,28 @@ discard block |
||
| 1624 | 1624 | case 'struct': |
| 1625 | 1625 | if ($val->count() != 2) { |
| 1626 | 1626 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1627 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1627 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1628 | 1628 | 'phpvals', $result->httpResponse()); |
| 1629 | 1629 | } |
| 1630 | 1630 | /** @var Value $code */ |
| 1631 | 1631 | $code = $val['faultCode']; |
| 1632 | 1632 | if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') { |
| 1633 | 1633 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1634 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1634 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1635 | 1635 | 'xmlrpcvals', $result->httpResponse()); |
| 1636 | 1636 | } |
| 1637 | 1637 | /** @var Value $str */ |
| 1638 | 1638 | $str = $val['faultString']; |
| 1639 | 1639 | if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') { |
| 1640 | 1640 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1641 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1641 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1642 | 1642 | 'xmlrpcvals', $result->httpResponse()); |
| 1643 | 1643 | } |
| 1644 | 1644 | $response[] = new Response(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse()); |
| 1645 | 1645 | break; |
| 1646 | 1646 | default: |
| 1647 | 1647 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1648 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1648 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1649 | 1649 | 'xmlrpcvals', $result->httpResponse()); |
| 1650 | 1650 | } |
| 1651 | 1651 | } |
@@ -1678,7 +1678,7 @@ discard block |
||
| 1678 | 1678 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 1679 | 1679 | $method = 'http') |
| 1680 | 1680 | { |
| 1681 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1681 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1682 | 1682 | |
| 1683 | 1683 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 1684 | 1684 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -1714,7 +1714,7 @@ discard block |
||
| 1714 | 1714 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 1715 | 1715 | $sslVersion = 0) |
| 1716 | 1716 | { |
| 1717 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1717 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1718 | 1718 | |
| 1719 | 1719 | return $this->sendPayloadCURL($req, $server, $port, $timeout, $username, |
| 1720 | 1720 | $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort, |
@@ -1927,7 +1927,7 @@ discard block |
||
| 1927 | 1927 | public function &__get($name) |
| 1928 | 1928 | { |
| 1929 | 1929 | if (in_array($name, static::$options)) { |
| 1930 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1930 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1931 | 1931 | return $this->$name; |
| 1932 | 1932 | } |
| 1933 | 1933 | |
@@ -1938,12 +1938,12 @@ discard block |
||
| 1938 | 1938 | case 'server': |
| 1939 | 1939 | case 'port': |
| 1940 | 1940 | case 'path': |
| 1941 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1941 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1942 | 1942 | return $this->$name; |
| 1943 | 1943 | default: |
| 1944 | 1944 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1945 | 1945 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1946 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1946 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1947 | 1947 | $result = null; |
| 1948 | 1948 | return $result; |
| 1949 | 1949 | } |
@@ -1952,7 +1952,7 @@ discard block |
||
| 1952 | 1952 | public function __set($name, $value) |
| 1953 | 1953 | { |
| 1954 | 1954 | if (in_array($name, static::$options)) { |
| 1955 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 1955 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 1956 | 1956 | $this->$name = $value; |
| 1957 | 1957 | return; |
| 1958 | 1958 | } |
@@ -1964,20 +1964,20 @@ discard block |
||
| 1964 | 1964 | case 'server': |
| 1965 | 1965 | case 'port': |
| 1966 | 1966 | case 'path': |
| 1967 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 1967 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 1968 | 1968 | $this->$name = $value; |
| 1969 | 1969 | return; |
| 1970 | 1970 | default: |
| 1971 | 1971 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1972 | 1972 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1973 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1973 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1974 | 1974 | } |
| 1975 | 1975 | } |
| 1976 | 1976 | |
| 1977 | 1977 | public function __isset($name) |
| 1978 | 1978 | { |
| 1979 | 1979 | if (in_array($name, static::$options)) { |
| 1980 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 1980 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 1981 | 1981 | return isset($this->$name); |
| 1982 | 1982 | } |
| 1983 | 1983 | |
@@ -1988,7 +1988,7 @@ discard block |
||
| 1988 | 1988 | case 'server': |
| 1989 | 1989 | case 'port': |
| 1990 | 1990 | case 'path': |
| 1991 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 1991 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 1992 | 1992 | return isset($this->$name); |
| 1993 | 1993 | default: |
| 1994 | 1994 | return false; |
@@ -1998,7 +1998,7 @@ discard block |
||
| 1998 | 1998 | public function __unset($name) |
| 1999 | 1999 | { |
| 2000 | 2000 | if (in_array($name, static::$options)) { |
| 2001 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2001 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2002 | 2002 | unset($this->$name); |
| 2003 | 2003 | return; |
| 2004 | 2004 | } |
@@ -2010,13 +2010,13 @@ discard block |
||
| 2010 | 2010 | case 'server': |
| 2011 | 2011 | case 'port': |
| 2012 | 2012 | case 'path': |
| 2013 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2013 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2014 | 2014 | unset($this->$name); |
| 2015 | 2015 | return; |
| 2016 | 2016 | default: |
| 2017 | 2017 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2018 | 2018 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2019 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2019 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2020 | 2020 | } |
| 2021 | 2021 | } |
| 2022 | 2022 | } |
@@ -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 | } |
