gggeek /
phpxmlrpc
@@ -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 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param array $extraOptions |
| 42 | 42 | * @return array|false |
| 43 | 43 | */ |
| 44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
| 44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
| 45 | 45 | { |
| 46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 47 | 47 | if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * @param array $extraOptions |
| 65 | 65 | * @return array|false |
| 66 | 66 | */ |
| 67 | -function wrap_php_class($className, $extraOptions=array()) |
|
| 67 | +function wrap_php_class($className, $extraOptions = array()) |
|
| 68 | 68 | { |
| 69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 70 | 70 | $fix = false; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $fix = true; |
| 75 | 75 | } |
| 76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
| 77 | - foreach($wrapped as $name => $value) { |
|
| 77 | + foreach ($wrapped as $name => $value) { |
|
| 78 | 78 | if ($fix) { |
| 79 | 79 | eval($value['source']); |
| 80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
| 94 | 94 | * @return array|callable|false |
| 95 | 95 | */ |
| 96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
| 96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
| 97 | 97 | { |
| 98 | 98 | if (!is_array($extraOptions)) |
| 99 | 99 | { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param array $extraOptions |
| 129 | 129 | * @return mixed |
| 130 | 130 | */ |
| 131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
| 131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
| 132 | 132 | { |
| 133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
| 149 | 149 | { |
| 150 | 150 | $code = "function $xmlrpcFuncName ("; |
| 151 | - if ($clientCopyMode < 2) { |
|
| 151 | + if ($clientCopyMode<2) { |
|
| 152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
| 153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
| 154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | if ($mDesc != '') { |
| 164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
| 165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 166 | 166 | } else { |
| 167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
| 168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 172 | 172 | $plist = array(); |
| 173 | 173 | $pCount = count($mSig); |
| 174 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 174 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 175 | 175 | $plist[] = "\$p$i"; |
| 176 | 176 | $pType = $mSig[$i]; |
| 177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
| 190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
| 191 | 191 | } |
| 192 | - if ($clientCopyMode < 2) { |
|
| 192 | + if ($clientCopyMode<2) { |
|
| 193 | 193 | $plist[] = '$debug=0'; |
| 194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 195 | 195 | } |
| 196 | 196 | $plist = implode(', ', $plist); |
| 197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 198 | 198 | |
| 199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 200 | 200 | if ($decodeFault) { |
| 201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 203 | 203 | } else { |
| 204 | 204 | $respCode = var_export($faultResponse, true); |
| 205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $innerCode .= "if (\$res->faultCode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 216 | 216 | |
| 217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
| 218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * @deprecated |
| 222 | 222 | */ |
| 223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
| 223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
| 224 | 224 | { |
| 225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
| 226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 227 | 227 | |
| 228 | 228 | // copy all client fields to the client that will be generated runtime |
| 229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -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 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $message); |
|
| 17 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$message); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] . |
|
| 38 | - ' is only supposed to be called by ' . $expectedCaller); |
|
| 37 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function']. |
|
| 38 | + ' is only supposed to be called by '.$expectedCaller); |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -231,22 +231,22 @@ discard block |
||
| 231 | 231 | $msg[0]->setPayload($payload); |
| 232 | 232 | } else { |
| 233 | 233 | $msg[0]->setPayload( |
| 234 | - $msg[0]->xml_header($inputcharset) . |
|
| 235 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 236 | - $payload . |
|
| 237 | - "</params>\n" . $msg[0]->xml_footer() |
|
| 234 | + $msg[0]->xml_header($inputcharset). |
|
| 235 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 236 | + $payload. |
|
| 237 | + "</params>\n".$msg[0]->xml_footer() |
|
| 238 | 238 | ); |
| 239 | 239 | } |
| 240 | - $actionname = 'Execution of method ' . $method; |
|
| 240 | + $actionname = 'Execution of method '.$method; |
|
| 241 | 241 | break; |
| 242 | 242 | default: // give a warning |
| 243 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 243 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 248 | 248 | // this gives good user feedback for long-running methods... |
| 249 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 249 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 250 | 250 | flush(); |
| 251 | 251 | |
| 252 | 252 | $response = null; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | - $time = microtime(true) - $time; |
|
| 266 | + $time = microtime(true)-$time; |
|
| 267 | 267 | if ($debug) { |
| 268 | 268 | echo "</div>\n"; |
| 269 | 269 | } |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | // call failed! echo out error msg! |
| 274 | 274 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 275 | 275 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 276 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 277 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 276 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 277 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 278 | 278 | echo(date("d/M/Y:H:i:s\n")); |
| 279 | 279 | } else { |
| 280 | 280 | // call succeeded: parse results |
@@ -290,36 +290,36 @@ discard block |
||
| 290 | 290 | $max = $v->count(); |
| 291 | 291 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 292 | 292 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 293 | - foreach($v as $i => $rec) { |
|
| 293 | + foreach ($v as $i => $rec) { |
|
| 294 | 294 | if ($i % 2) { |
| 295 | 295 | $class = ' class="oddrow"'; |
| 296 | 296 | } else { |
| 297 | 297 | $class = ' class="evenrow"'; |
| 298 | 298 | } |
| 299 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 300 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 299 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 300 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 323 | 323 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 324 | 324 | //echo("</tr>\n"); |
| 325 | 325 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $r2 = $resp[1]->value(); |
| 347 | 347 | |
| 348 | 348 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 349 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 349 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 350 | 350 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 351 | 351 | if ($desc == "") { |
| 352 | 352 | $desc = "-"; |
@@ -356,24 +356,24 @@ discard block |
||
| 356 | 356 | if ($r2->kindOf() != "array") { |
| 357 | 357 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 358 | 358 | } else { |
| 359 | - foreach($r2 as $i => $x) { |
|
| 359 | + foreach ($r2 as $i => $x) { |
|
| 360 | 360 | $payload = ""; |
| 361 | 361 | $alt_payload = ""; |
| 362 | - if ($i + 1 % 2) { |
|
| 362 | + if ($i+1 % 2) { |
|
| 363 | 363 | $class = ' class="oddrow"'; |
| 364 | 364 | } else { |
| 365 | 365 | $class = ' class="evenrow"'; |
| 366 | 366 | } |
| 367 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 367 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 368 | 368 | if ($x->kindOf() == "array") { |
| 369 | 369 | $ret = $x[0]; |
| 370 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 371 | - if ($x->count() > 1) { |
|
| 372 | - foreach($x as $k => $y) { |
|
| 370 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 371 | + if ($x->count()>1) { |
|
| 372 | + foreach ($x as $k => $y) { |
|
| 373 | 373 | if ($k == 0) continue; |
| 374 | 374 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 375 | if ($wstype == 1) { |
| 376 | - switch($y->scalarval()) { |
|
| 376 | + switch ($y->scalarval()) { |
|
| 377 | 377 | case 'string': |
| 378 | 378 | case 'dateTime.iso8601': |
| 379 | 379 | case 'base64': |
@@ -406,22 +406,22 @@ discard block |
||
| 406 | 406 | } else { |
| 407 | 407 | $type = $y->scalarval(); |
| 408 | 408 | $payload .= '<param><value>'; |
| 409 | - switch($type) { |
|
| 409 | + switch ($type) { |
|
| 410 | 410 | case 'undefined': |
| 411 | 411 | break; |
| 412 | 412 | case 'null'; |
| 413 | 413 | $type = 'nil'; |
| 414 | 414 | // fall thru intentionally |
| 415 | 415 | default: |
| 416 | - $payload .= '<' . |
|
| 417 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 418 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 416 | + $payload .= '<'. |
|
| 417 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 418 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 419 | 419 | '>'; |
| 420 | 420 | } |
| 421 | 421 | $payload .= "</value></param>\n"; |
| 422 | 422 | } |
| 423 | 423 | $alt_payload .= $y->scalarval(); |
| 424 | - if ($k < $x->count() - 1) { |
|
| 424 | + if ($k<$x->count()-1) { |
|
| 425 | 425 | $alt_payload .= ';'; |
| 426 | 426 | if ($wstype == 1) { |
| 427 | 427 | $payload .= ', '; |
@@ -437,63 +437,63 @@ discard block |
||
| 437 | 437 | echo '</td>'; |
| 438 | 438 | // button to test this method |
| 439 | 439 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 440 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 441 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 440 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 441 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 464 | 464 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 465 | 465 | //if ($wstype != 1) { |
| 466 | 466 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 467 | 467 | //} |
| 468 | 468 | echo "</form></td>\n"; |
| 469 | 469 | |
| 470 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 471 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 494 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 495 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 496 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 470 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 471 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 494 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 495 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 496 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 497 | 497 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 498 | 498 | echo "</form></td></tr>\n"; |
| 499 | 499 | } |
@@ -505,14 +505,14 @@ discard block |
||
| 505 | 505 | case 'wrap': |
| 506 | 506 | $r1 = $resp[0]->value(); |
| 507 | 507 | $r2 = $resp[1]->value(); |
| 508 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 508 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 509 | 509 | echo "Error: signature unknown\n"; |
| 510 | 510 | } else { |
| 511 | 511 | $mdesc = $r1->scalarval(); |
| 512 | 512 | $encoder = new PhpXmlRpc\Encoder(); |
| 513 | 513 | $msig = $encoder->decode($r2); |
| 514 | 514 | $msig = $msig[$methodsig]; |
| 515 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 515 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 516 | 516 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 517 | 517 | $clientcookies == '') { |
| 518 | 518 | $opts = 1; // simple client copy in stub code |
@@ -533,12 +533,12 @@ discard block |
||
| 533 | 533 | $client, |
| 534 | 534 | $method, |
| 535 | 535 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 536 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 536 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 537 | 537 | ); |
| 538 | 538 | //if ($code) |
| 539 | 539 | //{ |
| 540 | 540 | echo "<div id=\"phpcode\">\n"; |
| 541 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 541 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 542 | 542 | echo "\n</div>"; |
| 543 | 543 | //} |
| 544 | 544 | //else |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | break; |
| 550 | 550 | |
| 551 | 551 | case 'execute': |
| 552 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 552 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 553 | 553 | break; |
| 554 | 554 | |
| 555 | 555 | default: // give a warning |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 5 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Tests which involve interaction with the server - carried out via the client. |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | // (but only if not called from subclass objects / multitests) |
| 30 | 30 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
| 31 | 31 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 32 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 32 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 33 | 33 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 34 | 34 | self::$failed_tests[$trace[$i]['function']] = true; |
| 35 | 35 | break; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | parent::set_up(); |
| 46 | 46 | |
| 47 | 47 | $server = explode(':', $this->args['HTTPSERVER']); |
| 48 | - if (count($server) > 1) { |
|
| 48 | + if (count($server)>1) { |
|
| 49 | 49 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
| 50 | 50 | } else { |
| 51 | 51 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -75,9 +75,9 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | $this->validateResponse($r); |
| 77 | 77 | if (is_array($errorCode)) { |
| 78 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 78 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 79 | 79 | } else { |
| 80 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 80 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 81 | 81 | } |
| 82 | 82 | if (!$r->faultCode()) { |
| 83 | 83 | if ($returnResponse) { |
@@ -104,20 +104,20 @@ discard block |
||
| 104 | 104 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 105 | 105 | parse_str($query, $vars); |
| 106 | 106 | $query = http_build_query(array_merge($vars, $data)); |
| 107 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 107 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | public function testString() |
| 111 | 111 | { |
| 112 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 113 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 114 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 115 | - " also don't want to miss out on \$item[0]. " . |
|
| 116 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 117 | - "a simple CR here" . chr(13) . |
|
| 118 | - "a simple LF here" . chr(10) . |
|
| 119 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 120 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 112 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 113 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 114 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 115 | + " also don't want to miss out on \$item[0]. ". |
|
| 116 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 117 | + "a simple CR here".chr(13). |
|
| 118 | + "a simple LF here".chr(10). |
|
| 119 | + "and then LFCR".chr(10).chr(13). |
|
| 120 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 121 | 121 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 122 | 122 | new xmlrpcval($sendString, 'string'), |
| 123 | 123 | )); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | public function testLatin1String() |
| 139 | 139 | { |
| 140 | 140 | $sendString = |
| 141 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 141 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 142 | 142 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 143 | 143 | $sendString. |
| 144 | 144 | '</value></param></params></methodCall>'; |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | public function testUtf8Method() |
| 248 | 248 | { |
| 249 | 249 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 250 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 250 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 251 | 251 | new xmlrpcval('hello') |
| 252 | 252 | )); |
| 253 | 253 | $v = $this->send($m); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | )); |
| 269 | 269 | $v = $this->send($m); |
| 270 | 270 | if ($v) { |
| 271 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 271 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | )); |
| 281 | 281 | $v = $this->send($m); |
| 282 | 282 | if ($v) { |
| 283 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 283 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | if ($v) { |
| 320 | 320 | $sz = $v->arraysize(); |
| 321 | 321 | $got = ''; |
| 322 | - for ($i = 0; $i < $sz; $i++) { |
|
| 322 | + for ($i = 0; $i<$sz; $i++) { |
|
| 323 | 323 | $b = $v->arraymem($i); |
| 324 | 324 | if ($b->scalarval()) { |
| 325 | 325 | $got .= '1'; |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $got = ''; |
| 367 | 367 | $expected = '37210'; |
| 368 | 368 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 369 | - foreach($expect_array as $val) { |
|
| 369 | + foreach ($expect_array as $val) { |
|
| 370 | 370 | $b = $v->structmem($val); |
| 371 | 371 | $got .= $b->scalarVal(); |
| 372 | 372 | } |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | { |
| 869 | 869 | // make a 'deep client copy' as the original one might have many properties set |
| 870 | 870 | // also for speed only wrap one method of the whole server |
| 871 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 871 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 872 | 872 | if ($class == '') { |
| 873 | 873 | $this->fail('Registration of remote server failed'); |
| 874 | 874 | } else { |
@@ -907,9 +907,9 @@ discard block |
||
| 907 | 907 | $cookies = array( |
| 908 | 908 | //'c1' => array(), |
| 909 | 909 | 'c2' => array('value' => 'c2'), |
| 910 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 911 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 912 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 910 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 911 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 912 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 913 | 913 | ); |
| 914 | 914 | $cookiesval = php_xmlrpc_encode($cookies); |
| 915 | 915 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -957,10 +957,10 @@ discard block |
||
| 957 | 957 | $m = new xmlrpcmsg('tests.getcookies', array()); |
| 958 | 958 | foreach ($cookies as $cookie => $val) { |
| 959 | 959 | $this->client->setCookie($cookie, $val); |
| 960 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 960 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 961 | 961 | } |
| 962 | 962 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 963 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 963 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 964 | 964 | if (!$r->faultCode()) { |
| 965 | 965 | $v = $r->value(); |
| 966 | 966 | $v = php_xmlrpc_decode($v); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 79 | 79 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 80 | 80 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 81 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 81 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -165,34 +165,34 @@ discard block |
||
| 165 | 165 | public function serialize($charsetEncoding = '') |
| 166 | 166 | { |
| 167 | 167 | if ($charsetEncoding != '') { |
| 168 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 168 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 169 | 169 | } else { |
| 170 | 170 | $this->content_type = 'text/xml'; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 174 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 174 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 175 | 175 | } else { |
| 176 | 176 | $result = "<methodResponse>\n"; |
| 177 | 177 | } |
| 178 | 178 | if ($this->errno) { |
| 179 | 179 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 180 | - $result .= "<fault>\n" . |
|
| 181 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 182 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 183 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 180 | + $result .= "<fault>\n". |
|
| 181 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 182 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 183 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 184 | 184 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 185 | 185 | } else { |
| 186 | 186 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 187 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 187 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 188 | 188 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 189 | - $result .= "<params>\n<param>\n" . |
|
| 190 | - $this->val . |
|
| 189 | + $result .= "<params>\n<param>\n". |
|
| 190 | + $this->val. |
|
| 191 | 191 | "</param>\n</params>"; |
| 192 | 192 | } else if ($this->valtyp == 'phpvals') { |
| 193 | 193 | $encoder = new Encoder(); |
| 194 | 194 | $val = $encoder->encode($this->val); |
| 195 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 195 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 196 | 196 | } else { |
| 197 | 197 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 198 | 198 | } |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | public function xml_header($charsetEncoding = '') |
| 212 | 212 | { |
| 213 | 213 | if ($charsetEncoding != '') { |
| 214 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 214 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 215 | 215 | } else { |
| 216 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 216 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | case 'errstr': |
| 230 | 230 | case 'payload': |
| 231 | 231 | case 'content_type': |
| 232 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 232 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 233 | 233 | return $this->$name; |
| 234 | 234 | case 'hdrs': |
| 235 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 235 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 236 | 236 | return $this->httpResponse['headers']; |
| 237 | 237 | case '_cookies': |
| 238 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 238 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 239 | 239 | return $this->httpResponse['cookies']; |
| 240 | 240 | case 'raw_data': |
| 241 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return $this->httpResponse['raw_data']; |
| 243 | 243 | default: |
| 244 | 244 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 245 | 245 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 246 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 246 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 247 | 247 | $result = null; |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -258,25 +258,25 @@ discard block |
||
| 258 | 258 | case 'errstr': |
| 259 | 259 | case 'payload': |
| 260 | 260 | case 'content_type': |
| 261 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 261 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 262 | 262 | $this->$name = $value; |
| 263 | 263 | break; |
| 264 | 264 | case 'hdrs': |
| 265 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 265 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 266 | 266 | $this->httpResponse['headers'] = $value; |
| 267 | 267 | break; |
| 268 | 268 | case '_cookies': |
| 269 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 269 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 270 | 270 | $this->httpResponse['cookies'] = $value; |
| 271 | 271 | break; |
| 272 | 272 | case 'raw_data': |
| 273 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 273 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 274 | 274 | $this->httpResponse['raw_data'] = $value; |
| 275 | 275 | break; |
| 276 | 276 | default: |
| 277 | 277 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 278 | 278 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 279 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 279 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | case 'errstr': |
| 290 | 290 | case 'payload': |
| 291 | 291 | case 'content_type': |
| 292 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 292 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 293 | 293 | return isset($this->$name); |
| 294 | 294 | case 'hdrs': |
| 295 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 295 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 296 | 296 | return isset($this->httpResponse['headers']); |
| 297 | 297 | case '_cookies': |
| 298 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 298 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 299 | 299 | return isset($this->httpResponse['cookies']); |
| 300 | 300 | case 'raw_data': |
| 301 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 301 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 302 | 302 | return isset($this->httpResponse['raw_data']); |
| 303 | 303 | default: |
| 304 | 304 | return false; |
@@ -314,25 +314,25 @@ discard block |
||
| 314 | 314 | case 'errstr': |
| 315 | 315 | case 'payload': |
| 316 | 316 | case 'content_type': |
| 317 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 317 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 318 | 318 | unset($this->$name); |
| 319 | 319 | break; |
| 320 | 320 | case 'hdrs': |
| 321 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 321 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 322 | 322 | unset($this->httpResponse['headers']); |
| 323 | 323 | break; |
| 324 | 324 | case '_cookies': |
| 325 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 325 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 326 | 326 | unset($this->httpResponse['cookies']); |
| 327 | 327 | break; |
| 328 | 328 | case 'raw_data': |
| 329 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 329 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 330 | 330 | unset($this->httpResponse['raw_data']); |
| 331 | 331 | break; |
| 332 | 332 | default: |
| 333 | 333 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 334 | 334 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 335 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 335 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->me['struct'] = $val; |
| 99 | 99 | break; |
| 100 | 100 | default: |
| 101 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 101 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | if ($typeOf !== 1) { |
| 131 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 131 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 132 | 132 | return 0; |
| 133 | 133 | } |
| 134 | 134 | |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | switch ($this->mytype) { |
| 147 | 147 | case 1: |
| 148 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 148 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 149 | 149 | return 0; |
| 150 | 150 | case 3: |
| 151 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 151 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 152 | 152 | return 0; |
| 153 | 153 | case 2: |
| 154 | 154 | // we're adding a scalar value to an array here |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | return 1; |
| 194 | 194 | } else { |
| 195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 196 | 196 | return 0; |
| 197 | 197 | } |
| 198 | 198 | } |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | return 1; |
| 225 | 225 | } else { |
| 226 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 226 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 227 | 227 | return 0; |
| 228 | 228 | } |
| 229 | 229 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $val = reset($this->me); |
| 289 | 289 | $typ = key($this->me); |
| 290 | 290 | |
| 291 | - return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 291 | + return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |
@@ -311,19 +311,19 @@ discard block |
||
| 311 | 311 | case 1: |
| 312 | 312 | switch ($typ) { |
| 313 | 313 | case static::$xmlrpcBase64: |
| 314 | - $rs = "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 314 | + $rs = "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 315 | 315 | break; |
| 316 | 316 | case static::$xmlrpcBoolean: |
| 317 | - $rs = "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 317 | + $rs = "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 318 | 318 | break; |
| 319 | 319 | case static::$xmlrpcString: |
| 320 | 320 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 321 | - $rs = "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 321 | + $rs = "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 322 | 322 | break; |
| 323 | 323 | case static::$xmlrpcInt: |
| 324 | 324 | case static::$xmlrpcI4: |
| 325 | 325 | case static::$xmlrpcI8: |
| 326 | - $rs = "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 326 | + $rs = "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 327 | 327 | break; |
| 328 | 328 | case static::$xmlrpcDouble: |
| 329 | 329 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -331,16 +331,16 @@ discard block |
||
| 331 | 331 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
| 332 | 332 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 333 | 333 | // but there is of course no limit in the number of decimal places to be used... |
| 334 | - $rs = "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 334 | + $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 335 | 335 | break; |
| 336 | 336 | case static::$xmlrpcDateTime: |
| 337 | 337 | if (is_string($val)) { |
| 338 | 338 | $rs = "<{$typ}>{$val}</{$typ}>"; |
| 339 | 339 | // DateTimeInterface is not present in php 5.4... |
| 340 | 340 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 341 | - $rs = "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 341 | + $rs = "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 342 | 342 | } elseif (is_int($val)) { |
| 343 | - $rs = "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 343 | + $rs = "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 344 | 344 | } else { |
| 345 | 345 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 346 | 346 | $rs = "<{$typ}>{$val}</{$typ}>"; |
@@ -362,14 +362,14 @@ discard block |
||
| 362 | 362 | case 3: |
| 363 | 363 | // struct |
| 364 | 364 | if ($this->_php_class) { |
| 365 | - $rs = '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 365 | + $rs = '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 366 | 366 | } else { |
| 367 | 367 | $rs = "<struct>\n"; |
| 368 | 368 | } |
| 369 | 369 | $charsetEncoder = $this->getCharsetEncoder(); |
| 370 | 370 | /** @var Value $val2 */ |
| 371 | 371 | foreach ($val as $key2 => $val2) { |
| 372 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 372 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 373 | 373 | $rs .= $val2->serialize($charsetEncoding); |
| 374 | 374 | $rs .= "</member>\n"; |
| 375 | 375 | } |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | */ |
| 584 | 584 | public function structMemExists($key) |
| 585 | 585 | { |
| 586 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 586 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 587 | 587 | |
| 588 | 588 | return array_key_exists($key, $this->me['struct']); |
| 589 | 589 | } |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | */ |
| 600 | 600 | public function structMem($key) |
| 601 | 601 | { |
| 602 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 602 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 603 | 603 | |
| 604 | 604 | return $this->me['struct'][$key]; |
| 605 | 605 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | */ |
| 613 | 613 | public function structReset() |
| 614 | 614 | { |
| 615 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 615 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 616 | 616 | |
| 617 | 617 | reset($this->me['struct']); |
| 618 | 618 | } |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | */ |
| 627 | 627 | public function structEach() |
| 628 | 628 | { |
| 629 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 629 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 630 | 630 | |
| 631 | 631 | $key = key($this->me['struct']); |
| 632 | 632 | $value = current($this->me['struct']); |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | */ |
| 646 | 646 | public function arrayMem($key) |
| 647 | 647 | { |
| 648 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 648 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 649 | 649 | |
| 650 | 650 | return $this->me['array'][$key]; |
| 651 | 651 | } |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | */ |
| 660 | 660 | public function arraySize() |
| 661 | 661 | { |
| 662 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 662 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 663 | 663 | |
| 664 | 664 | return count($this->me['array']); |
| 665 | 665 | } |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | */ |
| 674 | 674 | public function structSize() |
| 675 | 675 | { |
| 676 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 676 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 677 | 677 | |
| 678 | 678 | return count($this->me['struct']); |
| 679 | 679 | } |
@@ -685,12 +685,12 @@ discard block |
||
| 685 | 685 | case 'me': |
| 686 | 686 | case 'mytype': |
| 687 | 687 | case '_php_class': |
| 688 | - $this->logDeprecation('Getting property Value::' . $name . ' is deprecated'); |
|
| 688 | + $this->logDeprecation('Getting property Value::'.$name.' is deprecated'); |
|
| 689 | 689 | return $this->$name; |
| 690 | 690 | default: |
| 691 | 691 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 692 | 692 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 693 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 693 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 694 | 694 | $result = null; |
| 695 | 695 | return $result; |
| 696 | 696 | } |
@@ -702,13 +702,13 @@ discard block |
||
| 702 | 702 | case 'me': |
| 703 | 703 | case 'mytype': |
| 704 | 704 | case '_php_class': |
| 705 | - $this->logDeprecation('Setting property Value::' . $name . ' is deprecated'); |
|
| 705 | + $this->logDeprecation('Setting property Value::'.$name.' is deprecated'); |
|
| 706 | 706 | $this->$name = $value; |
| 707 | 707 | break; |
| 708 | 708 | default: |
| 709 | 709 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 710 | 710 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 711 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 711 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 712 | 712 | } |
| 713 | 713 | } |
| 714 | 714 | |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | case 'me': |
| 719 | 719 | case 'mytype': |
| 720 | 720 | case '_php_class': |
| 721 | - $this->logDeprecation('Checking property Value::' . $name . ' is deprecated'); |
|
| 721 | + $this->logDeprecation('Checking property Value::'.$name.' is deprecated'); |
|
| 722 | 722 | return isset($this->$name); |
| 723 | 723 | default: |
| 724 | 724 | return false; |
@@ -731,13 +731,13 @@ discard block |
||
| 731 | 731 | case 'me': |
| 732 | 732 | case 'mytype': |
| 733 | 733 | case '_php_class': |
| 734 | - $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated'); |
|
| 734 | + $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated'); |
|
| 735 | 735 | unset($this->$name); |
| 736 | 736 | break; |
| 737 | 737 | default: |
| 738 | 738 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 739 | 739 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 740 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 740 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 741 | 741 | } |
| 742 | 742 | } |
| 743 | 743 | } |
