gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | use PhpXmlRpc\Encoder; |
| 5 | 5 | use PhpXmlRpc\Client; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $handles = array(); |
| 27 | 27 | $curl = curl_multi_init(); |
| 28 | 28 | |
| 29 | - foreach($requests as $k => $req) { |
|
| 29 | + foreach ($requests as $k => $req) { |
|
| 30 | 30 | $req->setDebug($this->debug); |
| 31 | 31 | |
| 32 | 32 | $handle = $this->prepareCurlHandle( |
@@ -59,19 +59,19 @@ discard block |
||
| 59 | 59 | $running = 0; |
| 60 | 60 | do { |
| 61 | 61 | curl_multi_exec($curl, $running); |
| 62 | - } while($running > 0); |
|
| 62 | + } while ($running>0); |
|
| 63 | 63 | |
| 64 | 64 | $responses = array(); |
| 65 | - foreach($handles as $k => $h) { |
|
| 65 | + foreach ($handles as $k => $h) { |
|
| 66 | 66 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
| 67 | 67 | |
| 68 | - if ($this->debug > 1) { |
|
| 68 | + if ($this->debug>1) { |
|
| 69 | 69 | $message = "---CURL INFO---\n"; |
| 70 | 70 | foreach (curl_getinfo($h) as $name => $val) { |
| 71 | 71 | if (is_array($val)) { |
| 72 | 72 | $val = implode("\n", $val); |
| 73 | 73 | } |
| 74 | - $message .= $name . ': ' . $val . "\n"; |
|
| 74 | + $message .= $name.': '.$val."\n"; |
|
| 75 | 75 | } |
| 76 | 76 | $message .= '---END---'; |
| 77 | 77 | $this->getLogger()->debugMessage($message); |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | curl_multi_close($curl); |
| 84 | 84 | |
| 85 | - foreach($responses as $k => $resp) { |
|
| 85 | + foreach ($responses as $k => $resp) { |
|
| 86 | 86 | if (!$resp) { |
| 87 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 87 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 88 | 88 | } else { |
| 89 | 89 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
| 90 | 90 | } |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | $value = $encoder->encode($data, array('auto_dates')); |
| 102 | 102 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 103 | 103 | $reqs = array(); |
| 104 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 104 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 105 | 105 | $reqs[] = $req; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | $client = new ParallelClient(XMLRPCSERVER); |
| 109 | -$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 109 | +$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 110 | 110 | |
| 111 | 111 | // a minimal benchmark - use 3 strategies to execute the same 25 calls: sequentially, using parallel http requests, and |
| 112 | 112 | // using a single system.multiCall request |
@@ -116,18 +116,18 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | $t = microtime(true); |
| 118 | 118 | $resp = $client->send($reqs); |
| 119 | -$t = microtime(true) - $t; |
|
| 120 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 119 | +$t = microtime(true)-$t; |
|
| 120 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 121 | 121 | flush(); |
| 122 | 122 | |
| 123 | 123 | $t = microtime(true); |
| 124 | 124 | $resp = $client->sendParallel($reqs); |
| 125 | -$t = microtime(true) - $t; |
|
| 126 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 125 | +$t = microtime(true)-$t; |
|
| 126 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 127 | 127 | flush(); |
| 128 | 128 | |
| 129 | 129 | $client->setOption(Client::OPT_NO_MULTICALL, false); |
| 130 | 130 | $t = microtime(true); |
| 131 | 131 | $resp = $client->send($reqs); |
| 132 | -$t = microtime(true) - $t; |
|
| 133 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 132 | +$t = microtime(true)-$t; |
|
| 133 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
|
@@ -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->server . $client->path . "</h3>\n"); |
|
| 28 | +output("<h3>methods available at http://".$client->server.$client->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 | } |
@@ -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 - Getstatename demo</title></head> |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | $stateNo = ""; |
| 18 | 18 | |
| 19 | 19 | if (isset($_POST['stateno']) && $_POST['stateno'] != "") { |
| 20 | - $stateNo = (integer)$_POST['stateno']; |
|
| 20 | + $stateNo = (integer) $_POST['stateno']; |
|
| 21 | 21 | $method = 'examples.getStateName'; |
| 22 | 22 | $arguments = array( |
| 23 | 23 | new Value($stateNo, Value::$xmlrpcInt), |
| 24 | 24 | ); |
| 25 | 25 | $req = new Request($method, $arguments); |
| 26 | - output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . |
|
| 26 | + output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()). |
|
| 27 | 27 | "\n\n</pre>Debug info of server data follows...\n\n"); |
| 28 | 28 | $client = new Client(XMLRPCSERVER); |
| 29 | 29 | $client->setOption(Client::OPT_DEBUG, 1); |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | $val = $resp->value(); |
| 33 | 33 | // NB: we are _assuming_ that the server did return a scalar xml-rpc value here. |
| 34 | 34 | // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'` |
| 35 | - output('<br/>State number <b>' . $stateNo . '</b> is <b>' |
|
| 36 | - . htmlspecialchars($val->scalarval()) . '</b><br/><br/>'); |
|
| 35 | + output('<br/>State number <b>'.$stateNo.'</b> is <b>' |
|
| 36 | + . htmlspecialchars($val->scalarval()).'</b><br/><br/>'); |
|
| 37 | 37 | } else { |
| 38 | 38 | output('An error occurred: '); |
| 39 | - output('<pre>Code: ' . htmlspecialchars($resp->faultCode()) |
|
| 40 | - . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>"); |
|
| 39 | + output('<pre>Code: '.htmlspecialchars($resp->faultCode()) |
|
| 40 | + . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>"); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -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,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | require_once __DIR__.'/methodProviders/CommentManager.php'; |
| 5 | 5 | |
@@ -25,33 +25,33 @@ discard block |
||
| 25 | 25 | // generate a file with a class definition |
| 26 | 26 | |
| 27 | 27 | // the generated code does not have an autoloader included - we need to add in one |
| 28 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 28 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 29 | 29 | |
| 30 | 30 | file_put_contents($targetClassFile, |
| 31 | - "<?php\n\n" . |
|
| 32 | - "require_once '$autoloader';\n\n" . |
|
| 31 | + "<?php\n\n". |
|
| 32 | + "require_once '$autoloader';\n\n". |
|
| 33 | 33 | "class MyServerClass\n{\n\n" |
| 34 | 34 | ) || die('uh oh'); |
| 35 | 35 | |
| 36 | 36 | // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions |
| 37 | 37 | |
| 38 | -foreach($code as $methodName => $methodDef) { |
|
| 39 | - file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh'); |
|
| 40 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
| 38 | +foreach ($code as $methodName => $methodDef) { |
|
| 39 | + file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh'); |
|
| 40 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
| 41 | 41 | unset($code[$methodName]['source']); |
| 42 | 42 | } |
| 43 | 43 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
| 44 | 44 | |
| 45 | 45 | // generate separate files with the xml-rpc server instantiation and its dispatch map |
| 46 | 46 | |
| 47 | -file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n"); |
|
| 47 | +file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n"); |
|
| 48 | 48 | |
| 49 | 49 | file_put_contents($targetControllerFile, |
| 50 | - "<?php\n\n" . |
|
| 50 | + "<?php\n\n". |
|
| 51 | 51 | |
| 52 | - "require_once '$autoloader';\n\n" . |
|
| 52 | + "require_once '$autoloader';\n\n". |
|
| 53 | 53 | |
| 54 | - "require_once '$targetClassFile';\n\n" . |
|
| 54 | + "require_once '$targetClassFile';\n\n". |
|
| 55 | 55 | |
| 56 | 56 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
| 57 | 57 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | // Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm); |
| 62 | 62 | // Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm); |
| 63 | 63 | |
| 64 | - "\$dm = require_once '$targetDispatchMapFile';\n" . |
|
| 65 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" . |
|
| 66 | - '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" . |
|
| 67 | - '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" . |
|
| 68 | - '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n" . |
|
| 69 | - '$s->service();' . "\n" |
|
| 64 | + "\$dm = require_once '$targetDispatchMapFile';\n". |
|
| 65 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n". |
|
| 66 | + '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n". |
|
| 67 | + '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n". |
|
| 68 | + '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n". |
|
| 69 | + '$s->service();'."\n" |
|
| 70 | 70 | ) || die('uh oh'); |
| 71 | 71 | |
| 72 | 72 | // test that everything worked by running it in realtime (note that this will return an xml-rpc error message if run |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 74 | 74 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 75 | 75 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 76 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 76 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -152,33 +152,33 @@ discard block |
||
| 152 | 152 | public function serialize($charsetEncoding = '') |
| 153 | 153 | { |
| 154 | 154 | if ($charsetEncoding != '') { |
| 155 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 155 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 156 | 156 | } else { |
| 157 | 157 | $this->content_type = 'text/xml'; |
| 158 | 158 | } |
| 159 | 159 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 160 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 160 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 161 | 161 | } else { |
| 162 | 162 | $result = "<methodResponse>\n"; |
| 163 | 163 | } |
| 164 | 164 | if ($this->errno) { |
| 165 | 165 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 166 | - $result .= "<fault>\n" . |
|
| 167 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 168 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 169 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 166 | + $result .= "<fault>\n". |
|
| 167 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 168 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 169 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 170 | 170 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 171 | 171 | } else { |
| 172 | 172 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 173 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 173 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 174 | 174 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 175 | - $result .= "<params>\n<param>\n" . |
|
| 176 | - $this->val . |
|
| 175 | + $result .= "<params>\n<param>\n". |
|
| 176 | + $this->val. |
|
| 177 | 177 | "</param>\n</params>"; |
| 178 | 178 | } else if ($this->valtyp == 'phpvals') { |
| 179 | 179 | $encoder = new Encoder(); |
| 180 | 180 | $val = $encoder->encode($this->val); |
| 181 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 181 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 182 | 182 | } else { |
| 183 | 183 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 184 | 184 | } |
@@ -196,18 +196,18 @@ discard block |
||
| 196 | 196 | { |
| 197 | 197 | switch ($name) { |
| 198 | 198 | case 'hdrs': |
| 199 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 199 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 200 | 200 | return $this->httpResponse['headers']; |
| 201 | 201 | case '_cookies': |
| 202 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 202 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 203 | 203 | return $this->httpResponse['cookies']; |
| 204 | 204 | case 'raw_data': |
| 205 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 205 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 206 | 206 | return $this->httpResponse['raw_data']; |
| 207 | 207 | default: |
| 208 | 208 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 209 | 209 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 210 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 210 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 211 | 211 | return null; |
| 212 | 212 | } |
| 213 | 213 | } |
@@ -216,21 +216,21 @@ discard block |
||
| 216 | 216 | { |
| 217 | 217 | switch ($name) { |
| 218 | 218 | case 'hdrs': |
| 219 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 219 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 220 | 220 | $this->httpResponse['headers'] = $value; |
| 221 | 221 | break; |
| 222 | 222 | case '_cookies': |
| 223 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 223 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 224 | 224 | $this->httpResponse['cookies'] = $value; |
| 225 | 225 | break; |
| 226 | 226 | case 'raw_data': |
| 227 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 227 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 228 | 228 | $this->httpResponse['raw_data'] = $value; |
| 229 | 229 | break; |
| 230 | 230 | default: |
| 231 | 231 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 232 | 232 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 233 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 233 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | |
@@ -238,13 +238,13 @@ discard block |
||
| 238 | 238 | { |
| 239 | 239 | switch ($name) { |
| 240 | 240 | case 'hdrs': |
| 241 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return isset($this->httpResponse['headers']); |
| 243 | 243 | case '_cookies': |
| 244 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 244 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 245 | 245 | return isset($this->httpResponse['cookies']); |
| 246 | 246 | case 'raw_data': |
| 247 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 247 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 248 | 248 | return isset($this->httpResponse['raw_data']); |
| 249 | 249 | default: |
| 250 | 250 | return false; |
@@ -255,21 +255,21 @@ discard block |
||
| 255 | 255 | { |
| 256 | 256 | switch ($name) { |
| 257 | 257 | case 'hdrs': |
| 258 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 258 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 259 | 259 | unset($this->httpResponse['headers']); |
| 260 | 260 | break; |
| 261 | 261 | case '_cookies': |
| 262 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 262 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 263 | 263 | unset($this->httpResponse['cookies']); |
| 264 | 264 | break; |
| 265 | 265 | case 'raw_data': |
| 266 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 266 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 267 | 267 | unset($this->httpResponse['raw_data']); |
| 268 | 268 | break; |
| 269 | 269 | default: |
| 270 | 270 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 271 | 271 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 272 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 272 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $this->me['struct'] = $val; |
| 97 | 97 | break; |
| 98 | 98 | default: |
| 99 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 99 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ($typeOf !== 1) { |
| 129 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 129 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 130 | 130 | return 0; |
| 131 | 131 | } |
| 132 | 132 | |
@@ -143,10 +143,10 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | switch ($this->mytype) { |
| 145 | 145 | case 1: |
| 146 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 146 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 147 | 147 | return 0; |
| 148 | 148 | case 3: |
| 149 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 149 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 150 | 150 | return 0; |
| 151 | 151 | case 2: |
| 152 | 152 | // we're adding a scalar value to an array here |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | return 1; |
| 192 | 192 | } else { |
| 193 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 193 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 194 | 194 | return 0; |
| 195 | 195 | } |
| 196 | 196 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | return 1; |
| 223 | 223 | } else { |
| 224 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 224 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 225 | 225 | return 0; |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -265,19 +265,19 @@ discard block |
||
| 265 | 265 | case 1: |
| 266 | 266 | switch ($typ) { |
| 267 | 267 | case static::$xmlrpcBase64: |
| 268 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 268 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 269 | 269 | break; |
| 270 | 270 | case static::$xmlrpcBoolean: |
| 271 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 271 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 272 | 272 | break; |
| 273 | 273 | case static::$xmlrpcString: |
| 274 | 274 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 275 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 275 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 276 | 276 | break; |
| 277 | 277 | case static::$xmlrpcInt: |
| 278 | 278 | case static::$xmlrpcI4: |
| 279 | 279 | case static::$xmlrpcI8: |
| 280 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 280 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 281 | 281 | break; |
| 282 | 282 | case static::$xmlrpcDouble: |
| 283 | 283 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -285,16 +285,16 @@ discard block |
||
| 285 | 285 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
| 286 | 286 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 287 | 287 | // but there is of course no limit in the number of decimal places to be used... |
| 288 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 288 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 289 | 289 | break; |
| 290 | 290 | case static::$xmlrpcDateTime: |
| 291 | 291 | if (is_string($val)) { |
| 292 | 292 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 293 | 293 | // DateTimeInterface is not present in php 5.4... |
| 294 | 294 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 295 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 295 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 296 | 296 | } elseif (is_int($val)) { |
| 297 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 297 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 298 | 298 | } else { |
| 299 | 299 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 300 | 300 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -316,14 +316,14 @@ discard block |
||
| 316 | 316 | case 3: |
| 317 | 317 | // struct |
| 318 | 318 | if ($this->_php_class) { |
| 319 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 319 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 320 | 320 | } else { |
| 321 | 321 | $rs .= "<struct>\n"; |
| 322 | 322 | } |
| 323 | 323 | $charsetEncoder = $this->getCharsetEncoder(); |
| 324 | 324 | /** @var Value $val2 */ |
| 325 | 325 | foreach ($val as $key2 => $val2) { |
| 326 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 326 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 327 | 327 | //$rs.=$this->serializeval($val2); |
| 328 | 328 | $rs .= $val2->serialize($charsetEncoding); |
| 329 | 329 | $rs .= "</member>\n"; |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $val = reset($this->me); |
| 359 | 359 | $typ = key($this->me); |
| 360 | 360 | |
| 361 | - return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 361 | + return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | /** |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | */ |
| 374 | 374 | public function structMemExists($key) |
| 375 | 375 | { |
| 376 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 376 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 377 | 377 | |
| 378 | 378 | return array_key_exists($key, $this->me['struct']); |
| 379 | 379 | } |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | */ |
| 390 | 390 | public function structMem($key) |
| 391 | 391 | { |
| 392 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 392 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 393 | 393 | |
| 394 | 394 | return $this->me['struct'][$key]; |
| 395 | 395 | } |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | */ |
| 403 | 403 | public function structReset() |
| 404 | 404 | { |
| 405 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 405 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 406 | 406 | |
| 407 | 407 | reset($this->me['struct']); |
| 408 | 408 | } |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | */ |
| 418 | 418 | public function structEach() |
| 419 | 419 | { |
| 420 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 420 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 421 | 421 | |
| 422 | 422 | return @each($this->me['struct']); |
| 423 | 423 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | */ |
| 463 | 463 | public function arrayMem($key) |
| 464 | 464 | { |
| 465 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 465 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 466 | 466 | |
| 467 | 467 | return $this->me['array'][$key]; |
| 468 | 468 | } |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | */ |
| 477 | 477 | public function arraySize() |
| 478 | 478 | { |
| 479 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 479 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 480 | 480 | |
| 481 | 481 | return count($this->me['array']); |
| 482 | 482 | } |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | */ |
| 491 | 491 | public function structSize() |
| 492 | 492 | { |
| 493 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 493 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 494 | 494 | |
| 495 | 495 | return count($this->me['struct']); |
| 496 | 496 | } |
@@ -14,6 +14,6 @@ |
||
| 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 | } |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | // q: can php be built without ctype? should we use a regexp? |
| 184 | 184 | if (is_string($key) && !ctype_digit($key)) { |
| 185 | 185 | /// @todo on invalid options, throw/error-out instead of logging an error message? |
| 186 | - switch($key) { |
|
| 186 | + switch ($key) { |
|
| 187 | 187 | case 'target_charset': |
| 188 | 188 | if (function_exists('mb_convert_encoding')) { |
| 189 | 189 | $this->current_parsing_options['target_charset'] = $val; |
| 190 | 190 | } else { |
| 191 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
| 191 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
| 192 | 192 | } |
| 193 | 193 | break; |
| 194 | 194 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | if (is_callable($val)) { |
| 197 | 197 | $this->current_parsing_options['methodname_callback'] = $val; |
| 198 | 198 | } else { |
| 199 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
| 199 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
| 200 | 200 | } |
| 201 | 201 | break; |
| 202 | 202 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | break; |
| 208 | 208 | |
| 209 | 209 | default: |
| 210 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
| 210 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
| 211 | 211 | } |
| 212 | 212 | unset($mergedOptions[$key]); |
| 213 | 213 | } |
@@ -253,10 +253,10 @@ discard block |
||
| 253 | 253 | |
| 254 | 254 | try { |
| 255 | 255 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
| 256 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 256 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 257 | 257 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 258 | 258 | // error handling: xml not well formed |
| 259 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 259 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 260 | 260 | $errCode = xml_get_error_code($parser); |
| 261 | 261 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 262 | 262 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $this->_xh['isf_reason'] = $errStr; |
| 266 | 266 | } |
| 267 | 267 | // no need to parse further if we already have a fatal error |
| 268 | - if ($this->_xh['isf'] >= 2) { |
|
| 268 | + if ($this->_xh['isf']>=2) { |
|
| 269 | 269 | break; |
| 270 | 270 | } |
| 271 | 271 | } |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 304 | 304 | { |
| 305 | 305 | // if invalid xml-rpc already detected, skip all processing |
| 306 | - if ($this->_xh['isf'] >= 2) { |
|
| 306 | + if ($this->_xh['isf']>=2) { |
|
| 307 | 307 | return; |
| 308 | 308 | } |
| 309 | 309 | |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | if ($acceptSingleVals === false) { |
| 318 | 318 | $accept = $this->current_parsing_options['accept']; |
| 319 | 319 | } else { |
| 320 | - $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated'); |
|
| 320 | + $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated'); |
|
| 321 | 321 | $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE; |
| 322 | 322 | } |
| 323 | 323 | if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) || |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $this->_xh['rt'] = strtolower($name); |
| 328 | 328 | } else { |
| 329 | 329 | $this->_xh['isf'] = 2; |
| 330 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 330 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 331 | 331 | |
| 332 | 332 | return; |
| 333 | 333 | } |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | |
| 430 | 430 | case 'MEMBER': |
| 431 | 431 | // set member name to null, in case we do not find in the xml later on |
| 432 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null; |
|
| 432 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null; |
|
| 433 | 433 | //$this->_xh['ac']=''; |
| 434 | 434 | // Drop trough intentionally |
| 435 | 435 | |
@@ -510,7 +510,7 @@ discard block |
||
| 510 | 510 | */ |
| 511 | 511 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 512 | 512 | { |
| 513 | - if ($this->_xh['isf'] >= 2) { |
|
| 513 | + if ($this->_xh['isf']>=2) { |
|
| 514 | 514 | return; |
| 515 | 515 | } |
| 516 | 516 | |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - if ($rebuildXmlrpcvals > 0) { |
|
| 535 | + if ($rebuildXmlrpcvals>0) { |
|
| 536 | 536 | // build the xml-rpc val out of the data received, and substitute it |
| 537 | 537 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 538 | 538 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -540,15 +540,15 @@ discard block |
||
| 540 | 540 | $temp->_php_class = $this->_xh['php_class']; |
| 541 | 541 | } |
| 542 | 542 | $this->_xh['value'] = $temp; |
| 543 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 543 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 544 | 544 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 545 | - $this->_xh['value'] = (object)array( |
|
| 545 | + $this->_xh['value'] = (object) array( |
|
| 546 | 546 | 'xmlrpc_type' => 'datetime', |
| 547 | 547 | 'scalar' => $this->_xh['value'], |
| 548 | 548 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 549 | 549 | ); |
| 550 | 550 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 551 | - $this->_xh['value'] = (object)array( |
|
| 551 | + $this->_xh['value'] = (object) array( |
|
| 552 | 552 | 'xmlrpc_type' => 'base64', |
| 553 | 553 | 'scalar' => $this->_xh['value'] |
| 554 | 554 | ); |
@@ -563,8 +563,8 @@ discard block |
||
| 563 | 563 | // check if we are inside an array or struct: |
| 564 | 564 | // if value just built is inside an array, let's move it into array on the stack |
| 565 | 565 | $vscount = count($this->_xh['valuestack']); |
| 566 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 567 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 566 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 567 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 568 | 568 | } |
| 569 | 569 | break; |
| 570 | 570 | |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | // log if receiving something strange, even though we set the value to false anyway |
| 592 | 592 | /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL |
| 593 | 593 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) { |
| 594 | - if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' . |
|
| 594 | + if (!$this->handleParsingError('invalid data received in BOOLEAN value: '. |
|
| 595 | 595 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 596 | 596 | return; |
| 597 | 597 | } |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | $this->_xh['vt'] = strtolower($name); |
| 612 | 612 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 613 | 613 | if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) { |
| 614 | - if (!$this->handleParsingError('non numeric data received in INT value: ' . |
|
| 614 | + if (!$this->handleParsingError('non numeric data received in INT value: '. |
|
| 615 | 615 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 616 | 616 | return; |
| 617 | 617 | } |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 620 | 620 | } else { |
| 621 | 621 | // it's ok, add it on |
| 622 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 622 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 623 | 623 | } |
| 624 | 624 | break; |
| 625 | 625 | |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | $this->_xh['vt'] = Value::$xmlrpcDouble; |
| 628 | 628 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 629 | 629 | if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) { |
| 630 | - if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' . |
|
| 630 | + if (!$this->handleParsingError('non numeric data received in DOUBLE value: '. |
|
| 631 | 631 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 632 | 632 | return; |
| 633 | 633 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 636 | 636 | } else { |
| 637 | 637 | // it's ok, add it on |
| 638 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 638 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 639 | 639 | } |
| 640 | 640 | break; |
| 641 | 641 | |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 644 | 644 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 645 | 645 | if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) { |
| 646 | - if (!$this->handleParsingError('invalid data received in DATETIME value: ' . |
|
| 646 | + if (!$this->handleParsingError('invalid data received in DATETIME value: '. |
|
| 647 | 647 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 648 | 648 | return; |
| 649 | 649 | } |
@@ -654,9 +654,9 @@ discard block |
||
| 654 | 654 | |
| 655 | 655 | // the default regex used to validate the date string a few lines above should make this case impossible, |
| 656 | 656 | // but one never knows... |
| 657 | - } catch(\Exception $e) { |
|
| 657 | + } catch (\Exception $e) { |
|
| 658 | 658 | // what to do? We can not guarantee that a valid date can be created. We return null... |
| 659 | - if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' . |
|
| 659 | + if (!$this->handleParsingError('invalid data received in DATETIME value. Error '. |
|
| 660 | 660 | $e->getMessage(), __METHOD__)) { |
| 661 | 661 | return; |
| 662 | 662 | } |
@@ -673,14 +673,14 @@ discard block |
||
| 673 | 673 | $v = base64_decode($this->_xh['ac'], true); |
| 674 | 674 | if ($v === false) { |
| 675 | 675 | $this->_xh['isf'] = 2; |
| 676 | - $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']); |
|
| 676 | + $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']); |
|
| 677 | 677 | return; |
| 678 | 678 | } |
| 679 | 679 | } else { |
| 680 | 680 | $v = base64_decode($this->_xh['ac']); |
| 681 | 681 | if ($v === '' && $this->_xh['ac'] !== '') { |
| 682 | 682 | // only the empty string should decode to the empty string |
| 683 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' . |
|
| 683 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '. |
|
| 684 | 684 | $this->truncateValueForLog($this->_xh['ac'])); |
| 685 | 685 | } |
| 686 | 686 | } |
@@ -688,20 +688,20 @@ discard block |
||
| 688 | 688 | break; |
| 689 | 689 | |
| 690 | 690 | case 'NAME': |
| 691 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 691 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 692 | 692 | break; |
| 693 | 693 | |
| 694 | 694 | case 'MEMBER': |
| 695 | 695 | // add to array in the stack the last element built, unless no VALUE or no NAME were found |
| 696 | 696 | if ($this->_xh['vt']) { |
| 697 | 697 | $vscount = count($this->_xh['valuestack']); |
| 698 | - if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) { |
|
| 698 | + if ($this->_xh['valuestack'][$vscount-1]['name'] === null) { |
|
| 699 | 699 | if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) { |
| 700 | 700 | return; |
| 701 | 701 | } |
| 702 | - $this->_xh['valuestack'][$vscount - 1]['name'] = ''; |
|
| 702 | + $this->_xh['valuestack'][$vscount-1]['name'] = ''; |
|
| 703 | 703 | } |
| 704 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 704 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 705 | 705 | } else { |
| 706 | 706 | if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) { |
| 707 | 707 | return; |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | public function xmlrpc_cd($parser, $data) |
| 818 | 818 | { |
| 819 | 819 | // skip processing if xml fault already detected |
| 820 | - if ($this->_xh['isf'] >= 2) { |
|
| 820 | + if ($this->_xh['isf']>=2) { |
|
| 821 | 821 | return; |
| 822 | 822 | } |
| 823 | 823 | |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | public function xmlrpc_dh($parser, $data) |
| 840 | 840 | { |
| 841 | 841 | // skip processing if xml fault already detected |
| 842 | - if ($this->_xh['isf'] >= 2) { |
|
| 842 | + if ($this->_xh['isf']>=2) { |
|
| 843 | 843 | return; |
| 844 | 844 | } |
| 845 | 845 | |
@@ -913,8 +913,8 @@ discard block |
||
| 913 | 913 | // Details: |
| 914 | 914 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 915 | 915 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 916 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 917 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 916 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 917 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 918 | 918 | $xmlChunk, $matches)) { |
| 919 | 919 | return strtoupper(substr($matches[2], 1, -1)); |
| 920 | 920 | } |
@@ -932,7 +932,7 @@ discard block |
||
| 932 | 932 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 933 | 933 | // IANA also likes better US-ASCII, so go with it |
| 934 | 934 | if ($enc == 'ASCII') { |
| 935 | - $enc = 'US-' . $enc; |
|
| 935 | + $enc = 'US-'.$enc; |
|
| 936 | 936 | } |
| 937 | 937 | |
| 938 | 938 | return $enc; |
@@ -969,8 +969,8 @@ discard block |
||
| 969 | 969 | // Details: |
| 970 | 970 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 971 | 971 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 972 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 973 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 972 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 973 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 974 | 974 | $xmlChunk)) { |
| 975 | 975 | return true; |
| 976 | 976 | } |
@@ -990,7 +990,7 @@ discard block |
||
| 990 | 990 | $this->_xh['isf_reason'] = ucfirst($message); |
| 991 | 991 | return false; |
| 992 | 992 | } else { |
| 993 | - $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message); |
|
| 993 | + $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message); |
|
| 994 | 994 | return true; |
| 995 | 995 | } |
| 996 | 996 | } |
@@ -1002,8 +1002,8 @@ discard block |
||
| 1002 | 1002 | */ |
| 1003 | 1003 | protected function truncateValueForLog($data) |
| 1004 | 1004 | { |
| 1005 | - if (strlen($data) > $this->maxLogValueLength) { |
|
| 1006 | - return substr($data, 0, $this->maxLogValueLength - 3) . '...'; |
|
| 1005 | + if (strlen($data)>$this->maxLogValueLength) { |
|
| 1006 | + return substr($data, 0, $this->maxLogValueLength-3).'...'; |
|
| 1007 | 1007 | } |
| 1008 | 1008 | |
| 1009 | 1009 | return $data; |
@@ -1016,13 +1016,13 @@ discard block |
||
| 1016 | 1016 | switch ($name) { |
| 1017 | 1017 | // this should only ever be called by subclasses which overtook `parse()` |
| 1018 | 1018 | case 'accept': |
| 1019 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1019 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1020 | 1020 | $this->current_parsing_options['accept'] = $value; |
| 1021 | 1021 | break; |
| 1022 | 1022 | default: |
| 1023 | 1023 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1024 | 1024 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 1025 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1025 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1026 | 1026 | } |
| 1027 | 1027 | } |
| 1028 | 1028 | |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | { |
| 1031 | 1031 | switch ($name) { |
| 1032 | 1032 | case 'accept': |
| 1033 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1033 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1034 | 1034 | return isset($this->current_parsing_options['accept']); |
| 1035 | 1035 | default: |
| 1036 | 1036 | return false; |
@@ -1042,13 +1042,13 @@ discard block |
||
| 1042 | 1042 | switch ($name) { |
| 1043 | 1043 | // q: does this make sense at all? |
| 1044 | 1044 | case 'accept': |
| 1045 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1045 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1046 | 1046 | unset($this->current_parsing_options['accept']); |
| 1047 | 1047 | break; |
| 1048 | 1048 | default: |
| 1049 | 1049 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1050 | 1050 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 1051 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1051 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1052 | 1052 | } |
| 1053 | 1053 | } |
| 1054 | 1054 | } |
