gggeek /
phpxmlrpc
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/parse_args.php'; |
|
| 3 | +include_once __DIR__.'/parse_args.php'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 5 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
| 8 | 8 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function _run($result = NULL) |
| 27 | 27 | { |
| 28 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 28 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 29 | 29 | |
| 30 | 30 | if ($result === NULL) { |
| 31 | 31 | $result = $this->createResult(); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 62 | 62 | { |
| 63 | - $url = $this->baseUrl . $path; |
|
| 63 | + $url = $this->baseUrl.$path; |
|
| 64 | 64 | |
| 65 | 65 | $ch = curl_init($url); |
| 66 | 66 | curl_setopt_array($ch, array( |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
| 80 | 80 | } |
| 81 | - if ($this->args['DEBUG'] > 0) { |
|
| 81 | + if ($this->args['DEBUG']>0) { |
|
| 82 | 82 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 83 | 83 | } |
| 84 | 84 | $page = curl_exec($ch); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $val = reset($ar); |
| 108 | 108 | $typ = key($ar); |
| 109 | 109 | |
| 110 | - return '<value>' . $this->serializedata($typ, $val) . "</value>\n"; |
|
| 110 | + return '<value>'.$this->serializedata($typ, $val)."</value>\n"; |
|
| 111 | 111 | //} |
| 112 | 112 | } |
| 113 | 113 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // preserve back compatibility |
| 127 | 127 | |
| 128 | 128 | if (is_array($b)) { |
| 129 | - foreach($b as $id => $cont) { |
|
| 129 | + foreach ($b as $id => $cont) { |
|
| 130 | 130 | $b[$id] = $cont->scalarval(); |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | // add support for structures directly encoding php objects |
| 135 | 135 | if (is_object($b)) { |
| 136 | 136 | $t = get_object_vars($b); |
| 137 | - foreach($t as $id => $cont) { |
|
| 137 | + foreach ($t as $id => $cont) { |
|
| 138 | 138 | $t[$id] = $cont->scalarval(); |
| 139 | 139 | } |
| 140 | - foreach($t as $id => $cont) { |
|
| 140 | + foreach ($t as $id => $cont) { |
|
| 141 | 141 | @$b->$id = $cont; |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -179,17 +179,17 @@ discard block |
||
| 179 | 179 | /* Expose as global functions the ones which are now class methods */ |
| 180 | 180 | |
| 181 | 181 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 182 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 182 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 183 | 183 | { |
| 184 | 184 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | -function iso8601_encode($timeT, $utc=0) |
|
| 187 | +function iso8601_encode($timeT, $utc = 0) |
|
| 188 | 188 | { |
| 189 | 189 | return Date::iso8601Encode($timeT, $utc); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | -function iso8601_decode($iDate, $utc=0) |
|
| 192 | +function iso8601_decode($iDate, $utc = 0) |
|
| 193 | 193 | { |
| 194 | 194 | return Date::iso8601Decode($iDate, $utc); |
| 195 | 195 | } |
@@ -199,25 +199,25 @@ discard block |
||
| 199 | 199 | return Http::decodeChunked($buffer); |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 202 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 203 | 203 | { |
| 204 | 204 | $encoder = new Encoder(); |
| 205 | 205 | return $encoder->decode($xmlrpcVal, $options); |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 208 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 209 | 209 | { |
| 210 | 210 | $encoder = new Encoder(); |
| 211 | 211 | return $encoder->encode($phpVal, $options); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 214 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 215 | 215 | { |
| 216 | 216 | $encoder = new Encoder(); |
| 217 | 217 | return $encoder->decodeXml($xmlVal, $options); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 220 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 221 | 221 | { |
| 222 | 222 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 223 | 223 | } |
@@ -12,7 +12,12 @@ |
||
| 12 | 12 | <html lang="en"> |
| 13 | 13 | <head> |
| 14 | 14 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 15 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 15 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 16 | + echo 'JSONRPC'; |
|
| 17 | +} else { |
|
| 18 | + echo 'XMLRPC'; |
|
| 19 | +} |
|
| 20 | +?> Debugger</title> |
|
| 16 | 21 | </head> |
| 17 | 22 | <frameset rows="360,*"> |
| 18 | 23 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | if (isset($_GET['run'])) { |
| 5 | 5 | $path = parse_url($_GET['run']); |
| 6 | 6 | if (isset($path['query'])) { |
| 7 | - $query = '?' . $path['query']; |
|
| 7 | + $query = '?'.$path['query']; |
|
| 8 | 8 | } |
| 9 | 9 | } |
| 10 | 10 | |
@@ -176,8 +176,7 @@ |
||
| 176 | 176 | } else { |
| 177 | 177 | $escapedData .= $ch; |
| 178 | 178 | } |
| 179 | - } |
|
| 180 | - else if ($ii < 128) { |
|
| 179 | + } else if ($ii < 128) { |
|
| 181 | 180 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 182 | 181 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 183 | 182 | switch ($ii) { |
@@ -91,14 +91,14 @@ discard block |
||
| 91 | 91 | if (count($this->xml_iso88591_Entities['in'])) { |
| 92 | 92 | return; |
| 93 | 93 | } |
| 94 | - for ($i = 0; $i < 32; $i++) { |
|
| 94 | + for ($i = 0; $i<32; $i++) { |
|
| 95 | 95 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 96 | 96 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 100 | 100 | |
| 101 | - for ($i = 160; $i < 256; $i++) { |
|
| 101 | + for ($i = 160; $i<256; $i++) { |
|
| 102 | 102 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 103 | 103 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 104 | 104 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | break;*/ |
| 127 | 127 | |
| 128 | 128 | default: |
| 129 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
| 129 | + throw new \Exception('Unsupported table: '.$tableName); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $destEncoding = 'US-ASCII'; |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
| 171 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
| 172 | 172 | |
| 173 | 173 | // list ordered with (expected) most common scenarios first |
| 174 | 174 | switch ($conversion) { |
@@ -186,20 +186,20 @@ discard block |
||
| 186 | 186 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
| 187 | 187 | $escapedData = ''; |
| 188 | 188 | // be kind to users creating string xmlrpc values out of different php types |
| 189 | - $data = (string)$data; |
|
| 189 | + $data = (string) $data; |
|
| 190 | 190 | $ns = strlen($data); |
| 191 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
| 191 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
| 192 | 192 | $ch = $data[$nn]; |
| 193 | 193 | $ii = ord($ch); |
| 194 | 194 | // 7 bits in 1 byte: 0bbbbbbb (127) |
| 195 | - if ($ii < 32) { |
|
| 195 | + if ($ii<32) { |
|
| 196 | 196 | if ($conversion == 'UTF-8_US-ASCII') { |
| 197 | 197 | $escapedData .= sprintf('&#%d;', $ii); |
| 198 | 198 | } else { |
| 199 | 199 | $escapedData .= $ch; |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | - else if ($ii < 128) { |
|
| 202 | + else if ($ii<128) { |
|
| 203 | 203 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 204 | 204 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 205 | 205 | switch ($ii) { |
@@ -224,25 +224,25 @@ discard block |
||
| 224 | 224 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
| 225 | 225 | elseif ($ii >> 5 == 6) { |
| 226 | 226 | $b1 = ($ii & 31); |
| 227 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 228 | - $ii = ($b1 * 64) + $b2; |
|
| 227 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 228 | + $ii = ($b1 * 64)+$b2; |
|
| 229 | 229 | $escapedData .= sprintf('&#%d;', $ii); |
| 230 | 230 | $nn += 1; |
| 231 | 231 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
| 232 | 232 | elseif ($ii >> 4 == 14) { |
| 233 | 233 | $b1 = ($ii & 15); |
| 234 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 235 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 236 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
| 234 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 235 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 236 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
| 237 | 237 | $escapedData .= sprintf('&#%d;', $ii); |
| 238 | 238 | $nn += 2; |
| 239 | 239 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
| 240 | 240 | elseif ($ii >> 3 == 30) { |
| 241 | 241 | $b1 = ($ii & 7); |
| 242 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 243 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 244 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
| 245 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
| 242 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 243 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 244 | + $b4 = (ord($data[$nn+3]) & 63); |
|
| 245 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
| 246 | 246 | $escapedData .= sprintf('&#%d;', $ii); |
| 247 | 247 | $nn += 3; |
| 248 | 248 | } |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | default: |
| 293 | 293 | $escapedData = ''; |
| 294 | 294 | /// @todo allow usage of a custom Logger via the DIC(ish) pattern we use in other classes |
| 295 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 295 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | return $escapedData; |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | case 'iso88591': |
| 344 | 344 | return $this->xml_iso88591_Entities; |
| 345 | 345 | default: |
| 346 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
| 346 | + throw new \Exception('Unsupported charset: '.$charset); |
|
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | } |
@@ -591,8 +591,9 @@ |
||
| 591 | 591 | } |
| 592 | 592 | foreach ($parsVariations as $i => $pars) { |
| 593 | 593 | $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 594 | - if ($i < (count($parsVariations) - 1)) |
|
| 595 | - $innerCode .= "else\n"; |
|
| 594 | + if ($i < (count($parsVariations) - 1)) { |
|
| 595 | + $innerCode .= "else\n"; |
|
| 596 | + } |
|
| 596 | 597 | } |
| 597 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
| 598 | 599 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
@@ -182,20 +182,20 @@ discard block |
||
| 182 | 182 | $callable = explode('::', $callable); |
| 183 | 183 | } |
| 184 | 184 | if (is_array($callable)) { |
| 185 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 186 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 185 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 186 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 187 | 187 | return false; |
| 188 | 188 | } |
| 189 | 189 | if (is_string($callable[0])) { |
| 190 | 190 | $plainFuncName = implode('::', $callable); |
| 191 | 191 | } elseif (is_object($callable[0])) { |
| 192 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 192 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 193 | 193 | } |
| 194 | 194 | $exists = method_exists($callable[0], $callable[1]); |
| 195 | 195 | } else if ($callable instanceof \Closure) { |
| 196 | 196 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 197 | 197 | if (!$buildIt) { |
| 198 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 198 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 199 | 199 | return false; |
| 200 | 200 | } |
| 201 | 201 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | if (!$exists) { |
| 210 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 210 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 211 | 211 | return false; |
| 212 | 212 | } |
| 213 | 213 | |
@@ -251,23 +251,23 @@ discard block |
||
| 251 | 251 | if (is_array($callable)) { |
| 252 | 252 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 253 | 253 | if ($func->isPrivate()) { |
| 254 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 254 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 255 | 255 | return false; |
| 256 | 256 | } |
| 257 | 257 | if ($func->isProtected()) { |
| 258 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 258 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 259 | 259 | return false; |
| 260 | 260 | } |
| 261 | 261 | if ($func->isConstructor()) { |
| 262 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 262 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 263 | 263 | return false; |
| 264 | 264 | } |
| 265 | 265 | if ($func->isDestructor()) { |
| 266 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 266 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 267 | 267 | return false; |
| 268 | 268 | } |
| 269 | 269 | if ($func->isAbstract()) { |
| 270 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 270 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 271 | 271 | return false; |
| 272 | 272 | } |
| 273 | 273 | /// @todo add more checks for static vs. nonstatic? |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | if ($func->isInternal()) { |
| 278 | 278 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 279 | 279 | /// reflect internal php functions |
| 280 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 280 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 281 | 281 | return false; |
| 282 | 282 | } |
| 283 | 283 | |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $i = 0; |
| 330 | 330 | foreach ($func->getParameters() as $paramObj) { |
| 331 | 331 | $params[$i] = array(); |
| 332 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 332 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 333 | 333 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 334 | 334 | $i++; |
| 335 | 335 | } |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | // build a signature |
| 394 | 394 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 395 | 395 | $pSig = array($funcDesc['returnsDocs']); |
| 396 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 396 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 397 | 397 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 398 | 398 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 399 | 399 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -752,21 +752,21 @@ discard block |
||
| 752 | 752 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 753 | 753 | { |
| 754 | 754 | $namespace = '\\PhpXmlRpc\\'; |
| 755 | - $reqClass = $namespace . 'Request'; |
|
| 756 | - $valClass = $namespace . 'Value'; |
|
| 757 | - $decoderClass = $namespace . 'Encoder'; |
|
| 755 | + $reqClass = $namespace.'Request'; |
|
| 756 | + $valClass = $namespace.'Value'; |
|
| 757 | + $decoderClass = $namespace.'Encoder'; |
|
| 758 | 758 | |
| 759 | 759 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 760 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 760 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 761 | 761 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 762 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 762 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 763 | 763 | |
| 764 | 764 | $req = new $reqClass('system.methodSignature'); |
| 765 | 765 | $req->addparam(new $valClass($methodName)); |
| 766 | 766 | $client->setDebug($debug); |
| 767 | 767 | $response = $client->send($req, $timeout, $protocol); |
| 768 | 768 | if ($response->faultCode()) { |
| 769 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 769 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 770 | 770 | return false; |
| 771 | 771 | } |
| 772 | 772 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | $mSig = $decoder->decode($mSig); |
| 778 | 778 | } |
| 779 | 779 | |
| 780 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 781 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 780 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 781 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 782 | 782 | return false; |
| 783 | 783 | } |
| 784 | 784 | |
@@ -794,11 +794,11 @@ discard block |
||
| 794 | 794 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 795 | 795 | { |
| 796 | 796 | $namespace = '\\PhpXmlRpc\\'; |
| 797 | - $reqClass = $namespace . 'Request'; |
|
| 798 | - $valClass = $namespace . 'Value'; |
|
| 797 | + $reqClass = $namespace.'Request'; |
|
| 798 | + $valClass = $namespace.'Value'; |
|
| 799 | 799 | |
| 800 | 800 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 801 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 801 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 802 | 802 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 803 | 803 | |
| 804 | 804 | $mDesc = ''; |
@@ -832,10 +832,10 @@ discard block |
||
| 832 | 832 | $clientClone = clone $client; |
| 833 | 833 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 834 | 834 | { |
| 835 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 835 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 836 | 836 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 837 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 838 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 837 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 838 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 839 | 839 | if (isset($extraOptions['return_on_fault'])) { |
| 840 | 840 | $decodeFault = true; |
| 841 | 841 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -844,9 +844,9 @@ discard block |
||
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | $namespace = '\\PhpXmlRpc\\'; |
| 847 | - $reqClass = $namespace . 'Request'; |
|
| 848 | - $encoderClass = $namespace . 'Encoder'; |
|
| 849 | - $valueClass = $namespace . 'Value'; |
|
| 847 | + $reqClass = $namespace.'Request'; |
|
| 848 | + $encoderClass = $namespace.'Encoder'; |
|
| 849 | + $valueClass = $namespace.'Value'; |
|
| 850 | 850 | |
| 851 | 851 | $encoder = new $encoderClass(); |
| 852 | 852 | $encodeOptions = array(); |
@@ -919,13 +919,13 @@ discard block |
||
| 919 | 919 | * @param string $mDesc |
| 920 | 920 | * @return string[] keys: source, docstring |
| 921 | 921 | */ |
| 922 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 922 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 923 | 923 | { |
| 924 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 924 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 925 | 925 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 926 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 927 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 928 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 926 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 927 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 928 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 929 | 929 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 930 | 930 | if (isset($extraOptions['return_on_fault'])) { |
| 931 | 931 | $decodeFault = true; |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $namespace = '\\PhpXmlRpc\\'; |
| 939 | 939 | |
| 940 | 940 | $code = "function $newFuncName ("; |
| 941 | - if ($clientCopyMode < 2) { |
|
| 941 | + if ($clientCopyMode<2) { |
|
| 942 | 942 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 943 | 943 | $verbatimClientCopy = !$clientCopyMode; |
| 944 | 944 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | |
| 954 | 954 | if ($mDesc != '') { |
| 955 | 955 | // take care that PHP comment is not terminated unwillingly by method description |
| 956 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 956 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 957 | 957 | } else { |
| 958 | 958 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 959 | 959 | } |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 963 | 963 | $plist = array(); |
| 964 | 964 | $pCount = count($mSig); |
| 965 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 965 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 966 | 966 | $plist[] = "\$p$i"; |
| 967 | 967 | $pType = $mSig[$i]; |
| 968 | 968 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -978,19 +978,19 @@ discard block |
||
| 978 | 978 | } |
| 979 | 979 | } |
| 980 | 980 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 981 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 981 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 982 | 982 | } |
| 983 | - if ($clientCopyMode < 2) { |
|
| 983 | + if ($clientCopyMode<2) { |
|
| 984 | 984 | $plist[] = '$debug=0'; |
| 985 | 985 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 986 | 986 | } |
| 987 | 987 | $plist = implode(', ', $plist); |
| 988 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 988 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 989 | 989 | |
| 990 | 990 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 991 | 991 | if ($decodeFault) { |
| 992 | 992 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 993 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 993 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 994 | 994 | } else { |
| 995 | 995 | $respCode = var_export($faultResponse, true); |
| 996 | 996 | } |
@@ -1003,7 +1003,7 @@ discard block |
||
| 1003 | 1003 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1006 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1007 | 1007 | |
| 1008 | 1008 | return array('source' => $code, 'docstring' => $mDesc); |
| 1009 | 1009 | } |
@@ -1030,24 +1030,24 @@ discard block |
||
| 1030 | 1030 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1031 | 1031 | { |
| 1032 | 1032 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1033 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1033 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1034 | 1034 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1035 | 1035 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1036 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1037 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1036 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1037 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1038 | 1038 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1039 | 1039 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1040 | 1040 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1041 | 1041 | $namespace = '\\PhpXmlRpc\\'; |
| 1042 | 1042 | |
| 1043 | - $reqClass = $namespace . 'Request'; |
|
| 1044 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1043 | + $reqClass = $namespace.'Request'; |
|
| 1044 | + $decoderClass = $namespace.'Encoder'; |
|
| 1045 | 1045 | |
| 1046 | 1046 | // retrieve the list of methods |
| 1047 | 1047 | $req = new $reqClass('system.listMethods'); |
| 1048 | 1048 | $response = $client->send($req, $timeout, $protocol); |
| 1049 | 1049 | if ($response->faultCode()) { |
| 1050 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1050 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1051 | 1051 | |
| 1052 | 1052 | return false; |
| 1053 | 1053 | } |
@@ -1058,7 +1058,7 @@ discard block |
||
| 1058 | 1058 | $mList = $decoder->decode($mList); |
| 1059 | 1059 | } |
| 1060 | 1060 | if (!is_array($mList) || !count($mList)) { |
| 1061 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1061 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1062 | 1062 | |
| 1063 | 1063 | return false; |
| 1064 | 1064 | } |
@@ -1067,8 +1067,8 @@ discard block |
||
| 1067 | 1067 | if ($newClassName != '') { |
| 1068 | 1068 | $xmlrpcClassName = $newClassName; |
| 1069 | 1069 | } else { |
| 1070 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1071 | - array('_', ''), $client->server) . '_client'; |
|
| 1070 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1071 | + array('_', ''), $client->server).'_client'; |
|
| 1072 | 1072 | } |
| 1073 | 1073 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1074 | 1074 | $xmlrpcClassName .= 'x'; |
@@ -1099,20 +1099,20 @@ discard block |
||
| 1099 | 1099 | if (!$buildIt) { |
| 1100 | 1100 | $source .= $methodWrap['docstring']; |
| 1101 | 1101 | } |
| 1102 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1102 | + $source .= $methodWrap['source']."\n"; |
|
| 1103 | 1103 | } else { |
| 1104 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1104 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | 1107 | } |
| 1108 | 1108 | $source .= "}\n"; |
| 1109 | 1109 | if ($buildIt) { |
| 1110 | 1110 | $allOK = 0; |
| 1111 | - eval($source . '$allOK=1;'); |
|
| 1111 | + eval($source.'$allOK=1;'); |
|
| 1112 | 1112 | if ($allOK) { |
| 1113 | 1113 | return $xmlrpcClassName; |
| 1114 | 1114 | } else { |
| 1115 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1115 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1116 | 1116 | return false; |
| 1117 | 1117 | } |
| 1118 | 1118 | } else { |
@@ -1131,8 +1131,8 @@ discard block |
||
| 1131 | 1131 | */ |
| 1132 | 1132 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1133 | 1133 | { |
| 1134 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1135 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1134 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1135 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1136 | 1136 | |
| 1137 | 1137 | // copy all client fields to the client that will be generated runtime |
| 1138 | 1138 | // (this provides for future expansion or subclassing of client obj) |
@@ -951,9 +951,9 @@ |
||
| 951 | 951 | } |
| 952 | 952 | |
| 953 | 953 | protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 954 | - $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 955 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 956 | - $keyPass = '', $sslVersion = 0) |
|
| 954 | + $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 955 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 956 | + $keyPass = '', $sslVersion = 0) |
|
| 957 | 957 | { |
| 958 | 958 | if ($port == 0) { |
| 959 | 959 | if (in_array($method, array('http', 'http10', 'http11', 'h2c'))) { |
@@ -184,10 +184,10 @@ discard block |
||
| 184 | 184 | $server = $parts['host']; |
| 185 | 185 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 186 | 186 | if (isset($parts['query'])) { |
| 187 | - $path .= '?' . $parts['query']; |
|
| 187 | + $path .= '?'.$parts['query']; |
|
| 188 | 188 | } |
| 189 | 189 | if (isset($parts['fragment'])) { |
| 190 | - $path .= '#' . $parts['fragment']; |
|
| 190 | + $path .= '#'.$parts['fragment']; |
|
| 191 | 191 | } |
| 192 | 192 | if (isset($parts['port'])) { |
| 193 | 193 | $port = $parts['port']; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | if ($path == '' || $path[0] != '/') { |
| 206 | - $this->path = '/' . $path; |
|
| 206 | + $this->path = '/'.$path; |
|
| 207 | 207 | } else { |
| 208 | 208 | $this->path = $path; |
| 209 | 209 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | }*/ |
| 242 | 242 | |
| 243 | 243 | // initialize user_agent string |
| 244 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 244 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | /** |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | */ |
| 634 | 634 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 635 | 635 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 636 | - $method='http') |
|
| 636 | + $method = 'http') |
|
| 637 | 637 | { |
| 638 | 638 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
| 639 | 639 | |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | * @param int $sslVersion |
| 666 | 666 | * @return Response |
| 667 | 667 | */ |
| 668 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 668 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 669 | 669 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 670 | 670 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 671 | 671 | $sslVersion = 0) |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | */ |
| 705 | 705 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 706 | 706 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 707 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 707 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 708 | 708 | $sslVersion = 0) |
| 709 | 709 | { |
| 710 | 710 | /// @todo log a warning if passed an unsupported method |
@@ -740,16 +740,16 @@ discard block |
||
| 740 | 740 | // thanks to Grant Rauscher <[email protected]> for this |
| 741 | 741 | $credentials = ''; |
| 742 | 742 | if ($username != '') { |
| 743 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 743 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 744 | 744 | if ($authType != 1) { |
| 745 | 745 | /// @todo make this a proper error, ie. return a failure |
| 746 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 746 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 747 | 747 | } |
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | $acceptedEncoding = ''; |
| 751 | 751 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 752 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 752 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 753 | 753 | } |
| 754 | 754 | |
| 755 | 755 | $proxyCredentials = ''; |
@@ -761,13 +761,13 @@ discard block |
||
| 761 | 761 | $connectPort = $proxyPort; |
| 762 | 762 | $transport = 'tcp'; |
| 763 | 763 | /// @todo check: should we not use https in some cases? |
| 764 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 764 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 765 | 765 | if ($proxyUsername != '') { |
| 766 | 766 | if ($proxyAuthType != 1) { |
| 767 | 767 | /// @todo make this a proper error, ie. return a failure |
| 768 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 768 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 769 | 769 | } |
| 770 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 770 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 771 | 771 | } |
| 772 | 772 | } else { |
| 773 | 773 | $connectServer = $server; |
@@ -782,45 +782,45 @@ discard block |
||
| 782 | 782 | $version = ''; |
| 783 | 783 | foreach ($this->cookies as $name => $cookie) { |
| 784 | 784 | if ($cookie['version']) { |
| 785 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 786 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 785 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 786 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 787 | 787 | if ($cookie['path']) { |
| 788 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 788 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 789 | 789 | } |
| 790 | 790 | if ($cookie['domain']) { |
| 791 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 791 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 792 | 792 | } |
| 793 | 793 | if ($cookie['port']) { |
| 794 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 794 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 795 | 795 | } |
| 796 | 796 | } else { |
| 797 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 797 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 798 | 798 | } |
| 799 | 799 | } |
| 800 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 800 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | // omit port if default |
| 804 | 804 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 805 | - $port = ''; |
|
| 805 | + $port = ''; |
|
| 806 | 806 | } else { |
| 807 | - $port = ':' . $port; |
|
| 807 | + $port = ':'.$port; |
|
| 808 | 808 | } |
| 809 | 809 | |
| 810 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 811 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 812 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 813 | - $credentials . |
|
| 814 | - $proxyCredentials . |
|
| 815 | - $acceptedEncoding . |
|
| 816 | - $encodingHdr . |
|
| 817 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 818 | - $cookieHeader . |
|
| 819 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 820 | - strlen($payload) . "\r\n\r\n" . |
|
| 810 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 811 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 812 | + 'Host: '.$server.$port."\r\n". |
|
| 813 | + $credentials. |
|
| 814 | + $proxyCredentials. |
|
| 815 | + $acceptedEncoding. |
|
| 816 | + $encodingHdr. |
|
| 817 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 818 | + $cookieHeader. |
|
| 819 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 820 | + strlen($payload)."\r\n\r\n". |
|
| 821 | 821 | $payload; |
| 822 | 822 | |
| 823 | - if ($this->debug > 1) { |
|
| 823 | + if ($this->debug>1) { |
|
| 824 | 824 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
| 825 | 825 | } |
| 826 | 826 | |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | |
| 848 | 848 | $context = stream_context_create($contextOptions); |
| 849 | 849 | |
| 850 | - if ($timeout <= 0) { |
|
| 850 | + if ($timeout<=0) { |
|
| 851 | 851 | $connectTimeout = ini_get('default_socket_timeout'); |
| 852 | 852 | } else { |
| 853 | 853 | $connectTimeout = $timeout; |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 860 | 860 | STREAM_CLIENT_CONNECT, $context); |
| 861 | 861 | if ($fp) { |
| 862 | - if ($timeout > 0) { |
|
| 862 | + if ($timeout>0) { |
|
| 863 | 863 | stream_set_timeout($fp, $timeout, 0); |
| 864 | 864 | } |
| 865 | 865 | } else { |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | $this->errstr = $err['message']; |
| 869 | 869 | } |
| 870 | 870 | |
| 871 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 872 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 871 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 872 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 873 | 873 | |
| 874 | 874 | return $r; |
| 875 | 875 | } |
@@ -957,18 +957,18 @@ discard block |
||
| 957 | 957 | $keyPass, $sslVersion); |
| 958 | 958 | |
| 959 | 959 | if (!$curl) { |
| 960 | - return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details'); |
|
| 960 | + return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details'); |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | 963 | $result = curl_exec($curl); |
| 964 | 964 | |
| 965 | - if ($this->debug > 1) { |
|
| 965 | + if ($this->debug>1) { |
|
| 966 | 966 | $message = "---CURL INFO---\n"; |
| 967 | 967 | foreach (curl_getinfo($curl) as $name => $val) { |
| 968 | 968 | if (is_array($val)) { |
| 969 | 969 | $val = implode("\n", $val); |
| 970 | 970 | } |
| 971 | - $message .= $name . ': ' . $val . "\n"; |
|
| 971 | + $message .= $name.': '.$val."\n"; |
|
| 972 | 972 | } |
| 973 | 973 | $message .= '---END---'; |
| 974 | 974 | $this->getLogger()->debugMessage($message); |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 979 | 979 | |
| 980 | 980 | $this->errstr = 'no response'; |
| 981 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 981 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 982 | 982 | curl_close($curl); |
| 983 | 983 | if ($keepAlive) { |
| 984 | 984 | $this->xmlrpc_curl_handle = null; |
@@ -1048,12 +1048,12 @@ discard block |
||
| 1048 | 1048 | // http, https |
| 1049 | 1049 | $protocol = $method; |
| 1050 | 1050 | if (strpos($protocol, ':') !== false) { |
| 1051 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1051 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1052 | 1052 | return false; |
| 1053 | 1053 | } |
| 1054 | 1054 | } |
| 1055 | 1055 | } |
| 1056 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 1056 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 1057 | 1057 | if (!$curl) { |
| 1058 | 1058 | return false; |
| 1059 | 1059 | } |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | // results into variable |
| 1068 | 1068 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1069 | 1069 | |
| 1070 | - if ($this->debug > 1) { |
|
| 1070 | + if ($this->debug>1) { |
|
| 1071 | 1071 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1072 | 1072 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 1073 | 1073 | } |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | } |
| 1093 | 1093 | } |
| 1094 | 1094 | // extra headers |
| 1095 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 1095 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 1096 | 1096 | // if no keepalive is wanted, let the server know it in advance |
| 1097 | 1097 | if (!$keepAlive) { |
| 1098 | 1098 | $headers[] = 'Connection: close'; |
@@ -1109,7 +1109,7 @@ discard block |
||
| 1109 | 1109 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1110 | 1110 | // timeout is borked |
| 1111 | 1111 | if ($timeout) { |
| 1112 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 1112 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | 1115 | switch ($method) { |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1125 | 1125 | } else { |
| 1126 | 1126 | /// @todo make this a proper error, ie. return a failure |
| 1127 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1127 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1128 | 1128 | } |
| 1129 | 1129 | break; |
| 1130 | 1130 | case 'h2': |
@@ -1133,12 +1133,12 @@ discard block |
||
| 1133 | 1133 | } |
| 1134 | 1134 | |
| 1135 | 1135 | if ($username && $password) { |
| 1136 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 1136 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 1137 | 1137 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1138 | 1138 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 1139 | 1139 | } elseif ($authType != 1) { |
| 1140 | 1140 | /// @todo make this a proper error, ie. return a failure |
| 1141 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1141 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1142 | 1142 | } |
| 1143 | 1143 | } |
| 1144 | 1144 | |
@@ -1181,14 +1181,14 @@ discard block |
||
| 1181 | 1181 | if ($proxyPort == 0) { |
| 1182 | 1182 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1183 | 1183 | } |
| 1184 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1184 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1185 | 1185 | if ($proxyUsername) { |
| 1186 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1186 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1187 | 1187 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1188 | 1188 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1189 | 1189 | } elseif ($proxyAuthType != 1) { |
| 1190 | 1190 | /// @todo make this a proper error, ie. return a failure |
| 1191 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1191 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1192 | 1192 | } |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | if (count($this->cookies)) { |
| 1199 | 1199 | $cookieHeader = ''; |
| 1200 | 1200 | foreach ($this->cookies as $name => $cookie) { |
| 1201 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1201 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1202 | 1202 | } |
| 1203 | 1203 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1204 | 1204 | } |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | curl_setopt($curl, $opt, $val); |
| 1208 | 1208 | } |
| 1209 | 1209 | |
| 1210 | - if ($this->debug > 1) { |
|
| 1210 | + if ($this->debug>1) { |
|
| 1211 | 1211 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 1212 | 1212 | } |
| 1213 | 1213 | |
@@ -1298,7 +1298,7 @@ discard block |
||
| 1298 | 1298 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1299 | 1299 | $numParams = $req->getNumParams(); |
| 1300 | 1300 | $params = array(); |
| 1301 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1301 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1302 | 1302 | $params[$i] = $req->getParam($i); |
| 1303 | 1303 | } |
| 1304 | 1304 | $call['params'] = new Value($params, 'array'); |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | $response = array(); |
| 1321 | 1321 | |
| 1322 | 1322 | if ($this->return_type == 'xml') { |
| 1323 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1323 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1324 | 1324 | $response[] = new Response($rets, 0, '', 'xml', $result->httpResponse()); |
| 1325 | 1325 | } |
| 1326 | 1326 | |
@@ -1328,21 +1328,21 @@ discard block |
||
| 1328 | 1328 | if (!is_array($rets)) { |
| 1329 | 1329 | // bad return type from system.multicall |
| 1330 | 1330 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1331 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1331 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1332 | 1332 | } |
| 1333 | 1333 | $numRets = count($rets); |
| 1334 | 1334 | if ($numRets != count($reqs)) { |
| 1335 | 1335 | // wrong number of return values. |
| 1336 | 1336 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1337 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1337 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1338 | 1338 | $result->httpResponse()); |
| 1339 | 1339 | } |
| 1340 | 1340 | |
| 1341 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1341 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1342 | 1342 | $val = $rets[$i]; |
| 1343 | 1343 | if (!is_array($val)) { |
| 1344 | 1344 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1345 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1345 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1346 | 1346 | 'phpvals', $result->httpResponse()); |
| 1347 | 1347 | } |
| 1348 | 1348 | switch (count($val)) { |
@@ -1350,7 +1350,7 @@ discard block |
||
| 1350 | 1350 | if (!isset($val[0])) { |
| 1351 | 1351 | // Bad value |
| 1352 | 1352 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1353 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1353 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1354 | 1354 | 'phpvals', $result->httpResponse()); |
| 1355 | 1355 | } |
| 1356 | 1356 | // Normal return value |
@@ -1362,20 +1362,20 @@ discard block |
||
| 1362 | 1362 | if (!is_int($code)) { |
| 1363 | 1363 | /// @todo should we check that it is != 0? |
| 1364 | 1364 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1365 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1365 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1366 | 1366 | 'phpvals', $result->httpResponse()); |
| 1367 | 1367 | } |
| 1368 | 1368 | $str = @$val['faultString']; |
| 1369 | 1369 | if (!is_string($str)) { |
| 1370 | 1370 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1371 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1371 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1372 | 1372 | 'phpvals', $result->httpResponse()); |
| 1373 | 1373 | } |
| 1374 | 1374 | $response[$i] = new Response(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1375 | 1375 | break; |
| 1376 | 1376 | default: |
| 1377 | 1377 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1378 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1378 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1379 | 1379 | 'phpvals', $result->httpResponse()); |
| 1380 | 1380 | } |
| 1381 | 1381 | } |
@@ -1384,14 +1384,14 @@ discard block |
||
| 1384 | 1384 | // return type == 'xmlrpcvals' |
| 1385 | 1385 | if ($rets->kindOf() != 'array') { |
| 1386 | 1386 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1387 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1387 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1388 | 1388 | $result->httpResponse()); |
| 1389 | 1389 | } |
| 1390 | 1390 | $numRets = $rets->count(); |
| 1391 | 1391 | if ($numRets != count($reqs)) { |
| 1392 | 1392 | // wrong number of return values. |
| 1393 | 1393 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1394 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1394 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1395 | 1395 | $result->httpResponse()); |
| 1396 | 1396 | } |
| 1397 | 1397 | |
@@ -1400,7 +1400,7 @@ discard block |
||
| 1400 | 1400 | case 'array': |
| 1401 | 1401 | if ($val->count() != 1) { |
| 1402 | 1402 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1403 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1403 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1404 | 1404 | 'phpvals', $result->httpResponse()); |
| 1405 | 1405 | } |
| 1406 | 1406 | // Normal return value |
@@ -1409,28 +1409,28 @@ discard block |
||
| 1409 | 1409 | case 'struct': |
| 1410 | 1410 | if ($val->count() != 2) { |
| 1411 | 1411 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1412 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1412 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1413 | 1413 | 'phpvals', $result->httpResponse()); |
| 1414 | 1414 | } |
| 1415 | 1415 | /** @var Value $code */ |
| 1416 | 1416 | $code = $val['faultCode']; |
| 1417 | 1417 | if ($code->kindOf() != 'scalar' || $code->scalartyp() != 'int') { |
| 1418 | 1418 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1419 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1419 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1420 | 1420 | 'xmlrpcvals', $result->httpResponse()); |
| 1421 | 1421 | } |
| 1422 | 1422 | /** @var Value $str */ |
| 1423 | 1423 | $str = $val['faultString']; |
| 1424 | 1424 | if ($str->kindOf() != 'scalar' || $str->scalartyp() != 'string') { |
| 1425 | 1425 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1426 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1426 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1427 | 1427 | 'xmlrpcvals', $result->httpResponse()); |
| 1428 | 1428 | } |
| 1429 | 1429 | $response[] = new Response(0, $code->scalarval(), $str->scalarval(), 'xmlrpcvals', $result->httpResponse()); |
| 1430 | 1430 | break; |
| 1431 | 1431 | default: |
| 1432 | 1432 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1433 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1433 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1434 | 1434 | 'xmlrpcvals', $result->httpResponse()); |
| 1435 | 1435 | } |
| 1436 | 1436 | } |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | use PhpXmlRpc\Encoder; |
| 20 | 20 | |
| 21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
| 22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 23 | 23 | |
| 24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 24 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 25 | 25 | $args = argParser::getArgs(); |
| 26 | 26 | |
| 27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
| 42 | 42 | trigger_error('ending test that was not started'); |
| 43 | 43 | } |
| 44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 46 | 46 | echo '.'; |
| 47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($is_web) { |
| 78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 79 | 79 | if ($xd) { |
| 80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 81 | 81 | } |
| 82 | 82 | flush(); |
| 83 | 83 | ob_flush(); |
| 84 | 84 | } else { |
| 85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 86 | 86 | if ($xd) { |
| 87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 94 | 94 | $vals = array(); |
| 95 | - for ($j = 0; $j < 10; $j++) { |
|
| 95 | + for ($j = 0; $j<10; $j++) { |
|
| 96 | 96 | $valarray = array(); |
| 97 | 97 | foreach ($data[$j] as $key => $val) { |
| 98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 119 | 119 | $encoder = new Encoder(); |
| 120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
| 122 | 122 | $out = $value->serialize(); |
| 123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | if (function_exists('xmlrpc_set_type')) { |
| 127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 129 | - for ($j = 0; $j < 10; $j++) { |
|
| 128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 129 | + for ($j = 0; $j<10; $j++) { |
|
| 130 | 130 | foreach ($keys as $k) { |
| 131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
| 140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 141 | 141 | $dummy = new Request(''); |
| 142 | 142 | $out = new Response($value); |
| 143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 144 | 144 | |
| 145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 147 | 147 | $response = $dummy->ParseResponse($in, true); |
| 148 | 148 | $value = $response->value(); |
| 149 | 149 | $result = array(); |
| 150 | - foreach($value as $val1) { |
|
| 150 | + foreach ($value as $val1) { |
|
| 151 | 151 | $out = array(); |
| 152 | - foreach($val1 as $name => $val) { |
|
| 152 | + foreach ($val1 as $name => $val) { |
|
| 153 | 153 | $out[$name] = array(); |
| 154 | - foreach($val as $data) { |
|
| 154 | + foreach ($val as $data) { |
|
| 155 | 155 | $out[$name][] = $data->scalarval(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
| 161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 162 | 162 | |
| 163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 165 | 165 | $response = $dummy->ParseResponse($in, true); |
| 166 | 166 | $value = $response->value(); |
| 167 | 167 | $result = array(); |
| 168 | 168 | $l = $value->arraysize(); |
| 169 | - for ($k = 0; $k < $l; $k++) { |
|
| 169 | + for ($k = 0; $k<$l; $k++) { |
|
| 170 | 170 | $val1 = $value->arraymem($k); |
| 171 | 171 | $out = array(); |
| 172 | - foreach($val1 as $name => $val) { |
|
| 172 | + foreach ($val1 as $name => $val) { |
|
| 173 | 173 | $out[$name] = array(); |
| 174 | 174 | $m = $val->arraysize(); |
| 175 | - for ($j = 0; $j < $m; $j++) { |
|
| 175 | + for ($j = 0; $j<$m; $j++) { |
|
| 176 | 176 | $data = $val->arraymem($j); |
| 177 | 177 | $out[$name][] = $data->scalarval(); |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 184 | 184 | |
| 185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 187 | 187 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
| 188 | 188 | $value = $response->value(); |
| 189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | if (function_exists('xmlrpc_decode')) { |
| 193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 195 | 195 | $response = $dummy->ParseResponse($in, true, 'xml'); |
| 196 | 196 | $value = xmlrpc_decode($response->value()); |
| 197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
| 216 | - if (count($server) > 1) { |
|
| 217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
| 216 | + if (count($server)>1) { |
|
| 217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
| 218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 219 | 219 | } else { |
| 220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
| 221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | begin_test($testName, 'http 10'); |
| 231 | 231 | $response = array(); |
| 232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 233 | 233 | $resp = $c->send($req); |
| 234 | 234 | $response[] = $resp->value(); |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $c->keepalive = false; |
| 240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
| 249 | 249 | $response = array(); |
| 250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 251 | 251 | $resp = $c->send($req, 10, 'http11'); |
| 252 | 252 | $response[] = $resp->value(); |
| 253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | begin_test($testName, 'http 10 w. compression'); |
| 271 | 271 | $response = array(); |
| 272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 273 | 273 | $resp = $c->send($req); |
| 274 | 274 | $response[] = $resp->value(); |
| 275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $c->keepalive = false; |
| 280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
| 281 | 281 | $response = array(); |
| 282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 283 | 283 | $resp = $c->send($req, 10, 'http11'); |
| 284 | 284 | $response[] = $resp->value(); |
| 285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $c->keepalive = true; |
| 289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 290 | 290 | $response = array(); |
| 291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 292 | 292 | $resp = $c->send($req, 10, 'http11'); |
| 293 | 293 | $response[] = $resp->value(); |
| 294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
| 310 | 310 | |
| 311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
| 312 | - if (count($server) > 1) { |
|
| 313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 312 | + if (count($server)>1) { |
|
| 313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 315 | 315 | } else { |
| 316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
| 318 | 318 | } |
| 319 | 319 | $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | begin_test($testName, 'https no keep-alive'); |
| 328 | 328 | $c->keepalive = false; |
| 329 | 329 | $response = array(); |
| 330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 331 | 331 | $resp = $c->send($req); |
| 332 | 332 | $response[] = $resp->value(); |
| 333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | begin_test($testName, 'https w. keep-alive'); |
| 337 | 337 | $c->keepalive = true; |
| 338 | 338 | $response = array(); |
| 339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 340 | 340 | $resp = $c->send($req, 10); |
| 341 | 341 | $response[] = $resp->value(); |
| 342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $c->keepalive = false; |
| 358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
| 359 | 359 | $response = array(); |
| 360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 361 | 361 | $resp = $c->send($req); |
| 362 | 362 | $response[] = $resp->value(); |
| 363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $c->keepalive = true; |
| 367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
| 368 | 368 | $response = array(); |
| 369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 370 | 370 | $resp = $c->send($req, 10); |
| 371 | 371 | $response[] = $resp->value(); |
| 372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
| 388 | 388 | |
| 389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
| 390 | - if (count($server) > 1) { |
|
| 391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 390 | + if (count($server)>1) { |
|
| 391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 393 | 393 | } else { |
| 394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
| 396 | 396 | } |
| 397 | 397 | $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | begin_test($testName, 'http2 no keep-alive'); |
| 406 | 406 | $c->keepalive = false; |
| 407 | 407 | $response = array(); |
| 408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 409 | 409 | $resp = $c->send($req); |
| 410 | 410 | $response[] = $resp->value(); |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | begin_test($testName, 'http2 w. keep-alive'); |
| 415 | 415 | $c->keepalive = true; |
| 416 | 416 | $response = array(); |
| 417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 418 | 418 | $resp = $c->send($req, 10); |
| 419 | 419 | $response[] = $resp->value(); |
| 420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $c->keepalive = false; |
| 436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
| 437 | 437 | $response = array(); |
| 438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 439 | 439 | $resp = $c->send($req); |
| 440 | 440 | $response[] = $resp->value(); |
| 441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $c->keepalive = true; |
| 445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
| 446 | 446 | $response = array(); |
| 447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 448 | 448 | $resp = $c->send($req, 10); |
| 449 | 449 | $response[] = $resp->value(); |
| 450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($test_results as $test => $results) { |
| 467 | 467 | echo "\nTEST: $test\n"; |
| 468 | 468 | foreach ($results as $case => $data) { |
| 469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
@@ -2,20 +2,20 @@ |
||
| 2 | 2 | |
| 3 | 3 | use PHPUnit\Runner\Version as PHPUnit_Version; |
| 4 | 4 | |
| 5 | -if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true |
|
| 6 | - && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false |
|
| 5 | +if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true |
|
| 6 | + && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false |
|
| 7 | 7 | ) { |
| 8 | - class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ); |
|
| 8 | + class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage'); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | -if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true |
|
| 12 | - && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false |
|
| 11 | +if (class_exists('PHPUnit_Runner_BaseTestRunner') === true |
|
| 12 | + && class_exists('PHPUnit\Runner\BaseTestRunner') === false |
|
| 13 | 13 | ) { |
| 14 | - class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' ); |
|
| 14 | + class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner'); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | if (class_exists('PHPUnit\Runner\Version') === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) { |
| 18 | - include_once __DIR__ . '/PolyfillTestCase7.php'; |
|
| 18 | + include_once __DIR__.'/PolyfillTestCase7.php'; |
|
| 19 | 19 | } else { |
| 20 | - include_once __DIR__ . '/PolyfillTestCase8.php'; |
|
| 20 | + include_once __DIR__.'/PolyfillTestCase8.php'; |
|
| 21 | 21 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function echoInput() |
| 56 | 56 | { |
| 57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
| 57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
| 58 | 58 | print $r->serialize(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function __get($name) |
| 67 | 67 | { |
| 68 | - switch($name) { |
|
| 68 | + switch ($name) { |
|
| 69 | 69 | case 'dmap': |
| 70 | 70 | return $this->dmap; |
| 71 | 71 | default: |
| 72 | 72 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 73 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . |
|
| 73 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '. |
|
| 74 | 74 | $trace[0]['line'], E_USER_NOTICE); |
| 75 | 75 | return null; |
| 76 | 76 | } |
@@ -97,30 +97,30 @@ discard block |
||
| 97 | 97 | Server::xmlrpc_debugmsg($m); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
| 100 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
| 101 | 101 | { |
| 102 | 102 | return Server::_xmlrpcs_getCapabilities($server, $m); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
| 108 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
| 105 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
| 108 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
| 109 | 109 | { |
| 110 | 110 | return Server::_xmlrpcs_listMethods($server, $m); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 113 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 116 | 116 | function _xmlrpcs_methodSignature($server, $m) |
| 117 | 117 | { |
| 118 | 118 | return Server::_xmlrpcs_methodSignature($server, $m); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
| 121 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
| 124 | 124 | function _xmlrpcs_methodHelp($server, $m) |
| 125 | 125 | { |
| 126 | 126 | return Server::_xmlrpcs_methodHelp($server, $m); |
