@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | // assume this is either a standalone install, or installed as Composer dependency |
21 | 21 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
22 | 22 | /// debugger include this one, taking care of autoloading? |
23 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
23 | + include_once __DIR__."/../src/Autoloader.php"; |
|
24 | 24 | PhpXmlRpc\Autoloader::register(); |
25 | 25 | } |
26 | 26 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | // Variables that shouldn't be unset |
37 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
37 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
38 | 38 | |
39 | 39 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
40 | 40 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -54,8 +54,7 @@ discard block |
||
54 | 54 | function stripslashes_deep($value) |
55 | 55 | { |
56 | 56 | $value = is_array($value) ? |
57 | - array_map('stripslashes_deep', $value) : |
|
58 | - stripslashes($value); |
|
57 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
59 | 58 | |
60 | 59 | return $value; |
61 | 60 | } |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
106 | 105 | // in case user forgot initial '/' in xmlrpc server path, add it back |
107 | 106 | if ($path && ($path[0]) != '/') { |
108 | - $path = '/' . $path; |
|
107 | + $path = '/'.$path; |
|
109 | 108 | } |
110 | 109 | |
111 | 110 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $this->me['struct'] = $val; |
120 | 120 | break; |
121 | 121 | default: |
122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | if ($typeOf !== 1) { |
147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
148 | 148 | return 0; |
149 | 149 | } |
150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
161 | 161 | |
162 | 162 | switch ($this->mytype) { |
163 | 163 | case 1: |
164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
165 | 165 | return 0; |
166 | 166 | case 3: |
167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
168 | 168 | return 0; |
169 | 169 | case 2: |
170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | return 1; |
208 | 208 | } else { |
209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
210 | 210 | return 0; |
211 | 211 | } |
212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | return 1; |
239 | 239 | } else { |
240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
241 | 241 | return 0; |
242 | 242 | } |
243 | 243 | } |
@@ -280,19 +280,19 @@ discard block |
||
280 | 280 | case 1: |
281 | 281 | switch ($typ) { |
282 | 282 | case static::$xmlrpcBase64: |
283 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
283 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
284 | 284 | break; |
285 | 285 | case static::$xmlrpcBoolean: |
286 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
286 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
287 | 287 | break; |
288 | 288 | case static::$xmlrpcString: |
289 | 289 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
290 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
290 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
291 | 291 | break; |
292 | 292 | case static::$xmlrpcInt: |
293 | 293 | case static::$xmlrpcI4: |
294 | 294 | case static::$xmlrpcI8: |
295 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
295 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
296 | 296 | break; |
297 | 297 | case static::$xmlrpcDouble: |
298 | 298 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -300,16 +300,16 @@ discard block |
||
300 | 300 | // sprintf('%F') could be most likely ok, but it fails eg. on 2e-14. |
301 | 301 | // The code below tries its best at keeping max precision while avoiding exp notation, |
302 | 302 | // but there is of course no limit in the number of decimal places to be used... |
303 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
303 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
304 | 304 | break; |
305 | 305 | case static::$xmlrpcDateTime: |
306 | 306 | if (is_string($val)) { |
307 | 307 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
308 | 308 | // DateTimeInterface is not present in php 5.4... |
309 | 309 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
310 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
310 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
311 | 311 | } elseif (is_int($val)) { |
312 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
312 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
313 | 313 | } else { |
314 | 314 | // not really a good idea here: but what should we output anyway? left for backward compat... |
315 | 315 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -331,14 +331,14 @@ discard block |
||
331 | 331 | case 3: |
332 | 332 | // struct |
333 | 333 | if ($this->_php_class) { |
334 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
334 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
335 | 335 | } else { |
336 | 336 | $rs .= "<struct>\n"; |
337 | 337 | } |
338 | 338 | $charsetEncoder = $this->getCharsetEncoder(); |
339 | 339 | /** @var Value $val2 */ |
340 | 340 | foreach ($val as $key2 => $val2) { |
341 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
341 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
342 | 342 | //$rs.=$this->serializeval($val2); |
343 | 343 | $rs .= $val2->serialize($charsetEncoding); |
344 | 344 | $rs .= "</member>\n"; |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $val = reset($this->me); |
375 | 375 | $typ = key($this->me); |
376 | 376 | |
377 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
377 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | /** |
@@ -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) |
@@ -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; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $handles = array(); |
25 | 25 | $curl = curl_multi_init(); |
26 | 26 | |
27 | - foreach($requests as $k => $req) { |
|
27 | + foreach ($requests as $k => $req) { |
|
28 | 28 | $req->setDebug($this->debug); |
29 | 29 | |
30 | 30 | $handle = $this->prepareCurlHandle( |
@@ -57,19 +57,19 @@ discard block |
||
57 | 57 | $running = 0; |
58 | 58 | do { |
59 | 59 | curl_multi_exec($curl, $running); |
60 | - } while($running > 0); |
|
60 | + } while ($running>0); |
|
61 | 61 | |
62 | 62 | $responses = array(); |
63 | - foreach($handles as $k => $h) { |
|
63 | + foreach ($handles as $k => $h) { |
|
64 | 64 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
65 | 65 | |
66 | - if ($this->debug > 1) { |
|
66 | + if ($this->debug>1) { |
|
67 | 67 | $message = "---CURL INFO---\n"; |
68 | 68 | foreach (curl_getinfo($h) as $name => $val) { |
69 | 69 | if (is_array($val)) { |
70 | 70 | $val = implode("\n", $val); |
71 | 71 | } |
72 | - $message .= $name . ': ' . $val . "\n"; |
|
72 | + $message .= $name.': '.$val."\n"; |
|
73 | 73 | } |
74 | 74 | $message .= '---END---'; |
75 | 75 | $this->getLogger()->debugMessage($message); |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | } |
81 | 81 | curl_multi_close($curl); |
82 | 82 | |
83 | - foreach($responses as $k => $resp) { |
|
83 | + foreach ($responses as $k => $resp) { |
|
84 | 84 | if (!$resp) { |
85 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
85 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
86 | 86 | } else { |
87 | 87 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
88 | 88 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $value = $encoder->encode($data, array('auto_dates')); |
100 | 100 | $req = new Request('interopEchoTests.echoValue', array($value)); |
101 | 101 | $reqs = array(); |
102 | -for ($i = 0; $i < $num_tests; $i++) { |
|
102 | +for ($i = 0; $i<$num_tests; $i++) { |
|
103 | 103 | $reqs[] = $req; |
104 | 104 | } |
105 | 105 | |
@@ -114,18 +114,18 @@ discard block |
||
114 | 114 | |
115 | 115 | $t = microtime(true); |
116 | 116 | $resp = $client->send($reqs); |
117 | -$t = microtime(true) - $t; |
|
118 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
117 | +$t = microtime(true)-$t; |
|
118 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
119 | 119 | flush(); |
120 | 120 | |
121 | 121 | $t = microtime(true); |
122 | 122 | $resp = $client->sendParallel($reqs); |
123 | -$t = microtime(true) - $t; |
|
124 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
123 | +$t = microtime(true)-$t; |
|
124 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
125 | 125 | flush(); |
126 | 126 | |
127 | 127 | $client->no_multicall = false; |
128 | 128 | $t = microtime(true); |
129 | 129 | $resp = $client->send($reqs); |
130 | -$t = microtime(true) - $t; |
|
131 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
130 | +$t = microtime(true)-$t; |
|
131 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for php files in the 'extras' directory |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | $this->args = argParser::getArgs(); |
14 | 14 | |
15 | 15 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
16 | - $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
17 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
16 | + $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
17 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function testBenchmark() |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @license code licensed under the BSD License: see file license.txt |
7 | 7 | **/ |
8 | 8 | |
9 | -$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
9 | +$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
10 | 10 | |
11 | 11 | // has to be the same value as used in index.php |
12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | class DebuggerTest extends PhpXmlRpc_WebTestCase |
6 | 6 | { |
@@ -9,8 +9,8 @@ discard block |
||
9 | 9 | $this->args = argParser::getArgs(); |
10 | 10 | |
11 | 11 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
12 | - $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
13 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
12 | + $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
13 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function testIndex() |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST) |
47 | 47 | // Note that the only usecase for web-page mode is when this is used by benchmark.php |
48 | 48 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
49 | - foreach($_SERVER as $key => $val) { |
|
49 | + foreach ($_SERVER as $key => $val) { |
|
50 | 50 | if (array_key_exists($key, $args)) { |
51 | 51 | $$key = $val; |
52 | 52 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | //} |
92 | 92 | } |
93 | 93 | if ($HTTPURI[0] != '/') { |
94 | - $HTTPURI = '/' . $HTTPURI; |
|
94 | + $HTTPURI = '/'.$HTTPURI; |
|
95 | 95 | } |
96 | 96 | $args['HTTPURI'] = $HTTPURI; |
97 | 97 | |
@@ -105,21 +105,21 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | if (isset($HTTPSIGNOREPEER)) { |
108 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
108 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (isset($HTTPSVERIFYHOST)) { |
112 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
112 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if (isset($SSLVERSION)) { |
116 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
116 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | if (isset($PROXYSERVER)) { |
120 | 120 | $arr = explode(':', $PROXYSERVER); |
121 | 121 | $args['PROXYSERVER'] = $arr[0]; |
122 | - if (count($arr) > 1) { |
|
122 | + if (count($arr)>1) { |
|
123 | 123 | $args['PROXYPORT'] = $arr[1]; |
124 | 124 | } else { |
125 | 125 | $args['PROXYPORT'] = 8080; |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
5 | 5 | |
6 | -include_once __DIR__ . '/parse_args.php'; |
|
6 | +include_once __DIR__.'/parse_args.php'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
9 | 9 | |
10 | 10 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
11 | 11 | use PHPUnit\Framework\TestResult; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | // (but only if not called from subclass objects / multitests) |
43 | 43 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
44 | 44 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
45 | - for ($i = 0; $i < count($trace); $i++) { |
|
45 | + for ($i = 0; $i<count($trace); $i++) { |
|
46 | 46 | if (strpos($trace[$i]['function'], 'test') === 0) { |
47 | 47 | self::$failed_tests[$trace[$i]['function']] = true; |
48 | 48 | break; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function _run($result = NULL) |
67 | 67 | { |
68 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
68 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
69 | 69 | |
70 | 70 | if ($result === NULL) { |
71 | 71 | $result = $this->createResult(); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $this->args = argParser::getArgs(); |
97 | 97 | |
98 | 98 | $server = explode(':', $this->args['HTTPSERVER']); |
99 | - if (count($server) > 1) { |
|
99 | + if (count($server)>1) { |
|
100 | 100 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
101 | 101 | } else { |
102 | 102 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $this->client->request_compression = $this->request_compression; |
107 | 107 | $this->client->accepted_compression = $this->accepted_compression; |
108 | 108 | |
109 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
109 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
110 | 110 | |
111 | 111 | if ($this->args['DEBUG'] == 1) |
112 | 112 | ob_start(); |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | } |
144 | 144 | $this->validateResponse($r); |
145 | 145 | if (is_array($errorCode)) { |
146 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
146 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
147 | 147 | } else { |
148 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
148 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
149 | 149 | } |
150 | 150 | if (!$r->faultCode()) { |
151 | 151 | if ($returnResponse) { |
@@ -172,20 +172,20 @@ discard block |
||
172 | 172 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
173 | 173 | parse_str($query, $vars); |
174 | 174 | $query = http_build_query(array_merge($vars, $data)); |
175 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
175 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | public function testString() |
179 | 179 | { |
180 | - $sendString = "here are 3 \"entities\": < > & " . |
|
181 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
182 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
183 | - " also don't want to miss out on \$item[0]. " . |
|
184 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
185 | - "a simple CR here" . chr(13) . |
|
186 | - "a simple LF here" . chr(10) . |
|
187 | - "and then LFCR" . chr(10) . chr(13) . |
|
188 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
180 | + $sendString = "here are 3 \"entities\": < > & ". |
|
181 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
182 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
183 | + " also don't want to miss out on \$item[0]. ". |
|
184 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
185 | + "a simple CR here".chr(13). |
|
186 | + "a simple LF here".chr(10). |
|
187 | + "and then LFCR".chr(10).chr(13). |
|
188 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
189 | 189 | $m = new xmlrpcmsg('examples.stringecho', array( |
190 | 190 | new xmlrpcval($sendString, 'string'), |
191 | 191 | )); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | public function testLatin1String() |
207 | 207 | { |
208 | 208 | $sendString = |
209 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
209 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
210 | 210 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
211 | 211 | $sendString. |
212 | 212 | '</value></param></params></methodCall>'; |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | public function testUtf8Method() |
316 | 316 | { |
317 | 317 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
318 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
318 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
319 | 319 | new xmlrpcval('hello') |
320 | 320 | )); |
321 | 321 | $v = $this->send($m); |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | )); |
338 | 338 | $v = $this->send($m); |
339 | 339 | if ($v) { |
340 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
340 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
341 | 341 | } |
342 | 342 | } |
343 | 343 | |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | )); |
350 | 350 | $v = $this->send($m); |
351 | 351 | if ($v) { |
352 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
352 | + $this->assertEquals(12-23, $v->scalarval()); |
|
353 | 353 | } |
354 | 354 | } |
355 | 355 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | if ($v) { |
384 | 384 | $sz = $v->arraysize(); |
385 | 385 | $got = ''; |
386 | - for ($i = 0; $i < $sz; $i++) { |
|
386 | + for ($i = 0; $i<$sz; $i++) { |
|
387 | 387 | $b = $v->arraymem($i); |
388 | 388 | if ($b->scalarval()) { |
389 | 389 | $got .= '1'; |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | $got = ''; |
447 | 447 | $expected = '37210'; |
448 | 448 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
449 | - foreach($expect_array as $val) { |
|
449 | + foreach ($expect_array as $val) { |
|
450 | 450 | $b = $v->structmem($val); |
451 | 451 | $got .= $b->me['int']; |
452 | 452 | } |
@@ -899,7 +899,7 @@ discard block |
||
899 | 899 | { |
900 | 900 | // make a 'deep client copy' as the original one might have many properties set |
901 | 901 | // also for speed only wrap one method of the whole server |
902 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
902 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
903 | 903 | if ($class == '') { |
904 | 904 | $this->fail('Registration of remote server failed'); |
905 | 905 | } else { |
@@ -938,9 +938,9 @@ discard block |
||
938 | 938 | $cookies = array( |
939 | 939 | //'c1' => array(), |
940 | 940 | 'c2' => array('value' => 'c2'), |
941 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
942 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
943 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
941 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
942 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
943 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
944 | 944 | ); |
945 | 945 | $cookiesval = php_xmlrpc_encode($cookies); |
946 | 946 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -988,10 +988,10 @@ discard block |
||
988 | 988 | $m = new xmlrpcmsg('tests.getcookies', array()); |
989 | 989 | foreach ($cookies as $cookie => $val) { |
990 | 990 | $this->client->setCookie($cookie, $val); |
991 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
991 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
992 | 992 | } |
993 | 993 | $r = $this->client->send($m, $this->timeout, $this->method); |
994 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
994 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
995 | 995 | if (!$r->faultCode()) { |
996 | 996 | $v = $r->value(); |
997 | 997 | $v = php_xmlrpc_decode($v); |