@@ -183,20 +183,20 @@ discard block |
||
183 | 183 | $callable = explode('::', $callable); |
184 | 184 | } |
185 | 185 | if (is_array($callable)) { |
186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
188 | 188 | return false; |
189 | 189 | } |
190 | 190 | if (is_string($callable[0])) { |
191 | 191 | $plainFuncName = implode('::', $callable); |
192 | 192 | } elseif (is_object($callable[0])) { |
193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
194 | 194 | } |
195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
196 | 196 | } else if ($callable instanceof \Closure) { |
197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
198 | 198 | if (!$buildIt) { |
199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
200 | 200 | return false; |
201 | 201 | } |
202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } |
209 | 209 | |
210 | 210 | if (!$exists) { |
211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
212 | 212 | return false; |
213 | 213 | } |
214 | 214 | |
@@ -252,23 +252,23 @@ discard block |
||
252 | 252 | if (is_array($callable)) { |
253 | 253 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
254 | 254 | if ($func->isPrivate()) { |
255 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
255 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
256 | 256 | return false; |
257 | 257 | } |
258 | 258 | if ($func->isProtected()) { |
259 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
259 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
260 | 260 | return false; |
261 | 261 | } |
262 | 262 | if ($func->isConstructor()) { |
263 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
263 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
264 | 264 | return false; |
265 | 265 | } |
266 | 266 | if ($func->isDestructor()) { |
267 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
267 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
268 | 268 | return false; |
269 | 269 | } |
270 | 270 | if ($func->isAbstract()) { |
271 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
271 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
272 | 272 | return false; |
273 | 273 | } |
274 | 274 | /// @todo add more checks for static vs. nonstatic? |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | if ($func->isInternal()) { |
279 | 279 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
280 | 280 | // instead of getparameters to fully reflect internal php functions ? |
281 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
281 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
282 | 282 | return false; |
283 | 283 | } |
284 | 284 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | $i = 0; |
331 | 331 | foreach ($func->getParameters() as $paramObj) { |
332 | 332 | $params[$i] = array(); |
333 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
333 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
334 | 334 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
335 | 335 | $i++; |
336 | 336 | } |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | // build a signature |
396 | 396 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
397 | 397 | $pSig = array($funcDesc['returnsDocs']); |
398 | - for ($i = 0; $i < count($pars); $i++) { |
|
398 | + for ($i = 0; $i<count($pars); $i++) { |
|
399 | 399 | $name = strtolower($funcDesc['params'][$i]['name']); |
400 | 400 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
401 | 401 | $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 | /** |
@@ -761,21 +761,21 @@ discard block |
||
761 | 761 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
762 | 762 | { |
763 | 763 | $namespace = '\\PhpXmlRpc\\'; |
764 | - $reqClass = $namespace . 'Request'; |
|
765 | - $valClass = $namespace . 'Value'; |
|
766 | - $decoderClass = $namespace . 'Encoder'; |
|
764 | + $reqClass = $namespace.'Request'; |
|
765 | + $valClass = $namespace.'Value'; |
|
766 | + $decoderClass = $namespace.'Encoder'; |
|
767 | 767 | |
768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
772 | 772 | |
773 | 773 | $req = new $reqClass('system.methodSignature'); |
774 | 774 | $req->addparam(new $valClass($methodName)); |
775 | 775 | $client->setDebug($debug); |
776 | 776 | $response = $client->send($req, $timeout, $protocol); |
777 | 777 | if ($response->faultCode()) { |
778 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
778 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
779 | 779 | return false; |
780 | 780 | } |
781 | 781 | |
@@ -785,8 +785,8 @@ discard block |
||
785 | 785 | $mSig = $decoder->decode($mSig); |
786 | 786 | } |
787 | 787 | |
788 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
789 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
788 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
789 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
790 | 790 | return false; |
791 | 791 | } |
792 | 792 | |
@@ -802,11 +802,11 @@ discard block |
||
802 | 802 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
803 | 803 | { |
804 | 804 | $namespace = '\\PhpXmlRpc\\'; |
805 | - $reqClass = $namespace . 'Request'; |
|
806 | - $valClass = $namespace . 'Value'; |
|
805 | + $reqClass = $namespace.'Request'; |
|
806 | + $valClass = $namespace.'Value'; |
|
807 | 807 | |
808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
811 | 811 | |
812 | 812 | $mDesc = ''; |
@@ -840,10 +840,10 @@ discard block |
||
840 | 840 | $clientClone = clone $client; |
841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
842 | 842 | { |
843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
847 | 847 | if (isset($extraOptions['return_on_fault'])) { |
848 | 848 | $decodeFault = true; |
849 | 849 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -852,9 +852,9 @@ discard block |
||
852 | 852 | } |
853 | 853 | |
854 | 854 | $namespace = '\\PhpXmlRpc\\'; |
855 | - $reqClass = $namespace . 'Request'; |
|
856 | - $encoderClass = $namespace . 'Encoder'; |
|
857 | - $valueClass = $namespace . 'Value'; |
|
855 | + $reqClass = $namespace.'Request'; |
|
856 | + $encoderClass = $namespace.'Encoder'; |
|
857 | + $valueClass = $namespace.'Value'; |
|
858 | 858 | |
859 | 859 | $encoder = new $encoderClass(); |
860 | 860 | $encodeOptions = array(); |
@@ -925,13 +925,13 @@ discard block |
||
925 | 925 | * @param string $mDesc |
926 | 926 | * @return string[] keys: source, docstring |
927 | 927 | */ |
928 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
928 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
929 | 929 | { |
930 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
930 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
931 | 931 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
932 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
933 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
934 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
932 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
933 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
934 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
935 | 935 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
936 | 936 | if (isset($extraOptions['return_on_fault'])) { |
937 | 937 | $decodeFault = true; |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | $namespace = '\\PhpXmlRpc\\'; |
945 | 945 | |
946 | 946 | $code = "function $newFuncName ("; |
947 | - if ($clientCopyMode < 2) { |
|
947 | + if ($clientCopyMode<2) { |
|
948 | 948 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
949 | 949 | $verbatimClientCopy = !$clientCopyMode; |
950 | 950 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | |
960 | 960 | if ($mDesc != '') { |
961 | 961 | // take care that PHP comment is not terminated unwillingly by method description |
962 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
962 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
963 | 963 | } else { |
964 | 964 | $mDesc = "/**\nFunction $newFuncName\n"; |
965 | 965 | } |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
969 | 969 | $plist = array(); |
970 | 970 | $pCount = count($mSig); |
971 | - for ($i = 1; $i < $pCount; $i++) { |
|
971 | + for ($i = 1; $i<$pCount; $i++) { |
|
972 | 972 | $plist[] = "\$p$i"; |
973 | 973 | $pType = $mSig[$i]; |
974 | 974 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -984,19 +984,19 @@ discard block |
||
984 | 984 | } |
985 | 985 | } |
986 | 986 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
987 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
987 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
988 | 988 | } |
989 | - if ($clientCopyMode < 2) { |
|
989 | + if ($clientCopyMode<2) { |
|
990 | 990 | $plist[] = '$debug=0'; |
991 | 991 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
992 | 992 | } |
993 | 993 | $plist = implode(', ', $plist); |
994 | - $mDesc .= '* @return {$namespace}Response|' . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
994 | + $mDesc .= '* @return {$namespace}Response|'.$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
995 | 995 | |
996 | 996 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
997 | 997 | if ($decodeFault) { |
998 | 998 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
999 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
999 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
1000 | 1000 | } else { |
1001 | 1001 | $respCode = var_export($faultResponse, true); |
1002 | 1002 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
1009 | 1009 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
1010 | 1010 | } |
1011 | 1011 | |
1012 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
1012 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
1013 | 1013 | |
1014 | 1014 | return array('source' => $code, 'docstring' => $mDesc); |
1015 | 1015 | } |
@@ -1035,23 +1035,23 @@ discard block |
||
1035 | 1035 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
1036 | 1036 | { |
1037 | 1037 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
1038 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
1038 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
1039 | 1039 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
1040 | 1040 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
1041 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
1042 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
1041 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
1042 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
1043 | 1043 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
1044 | 1044 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
1045 | 1045 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
1046 | 1046 | $namespace = '\\PhpXmlRpc\\'; |
1047 | 1047 | |
1048 | - $reqClass = $namespace . 'Request'; |
|
1049 | - $decoderClass = $namespace . 'Encoder'; |
|
1048 | + $reqClass = $namespace.'Request'; |
|
1049 | + $decoderClass = $namespace.'Encoder'; |
|
1050 | 1050 | |
1051 | 1051 | $req = new $reqClass('system.listMethods'); |
1052 | 1052 | $response = $client->send($req, $timeout, $protocol); |
1053 | 1053 | if ($response->faultCode()) { |
1054 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
1054 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
1055 | 1055 | |
1056 | 1056 | return false; |
1057 | 1057 | } else { |
@@ -1061,7 +1061,7 @@ discard block |
||
1061 | 1061 | $mList = $decoder->decode($mList); |
1062 | 1062 | } |
1063 | 1063 | if (!is_array($mList) || !count($mList)) { |
1064 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
1064 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
1065 | 1065 | |
1066 | 1066 | return false; |
1067 | 1067 | } else { |
@@ -1069,8 +1069,8 @@ discard block |
||
1069 | 1069 | if ($newClassName != '') { |
1070 | 1070 | $xmlrpcClassName = $newClassName; |
1071 | 1071 | } else { |
1072 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
1073 | - array('_', ''), $client->server) . '_client'; |
|
1072 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
1073 | + array('_', ''), $client->server).'_client'; |
|
1074 | 1074 | } |
1075 | 1075 | while ($buildIt && class_exists($xmlrpcClassName)) { |
1076 | 1076 | $xmlrpcClassName .= 'x'; |
@@ -1101,20 +1101,20 @@ discard block |
||
1101 | 1101 | if (!$buildIt) { |
1102 | 1102 | $source .= $methodWrap['docstring']; |
1103 | 1103 | } |
1104 | - $source .= $methodWrap['source'] . "\n"; |
|
1104 | + $source .= $methodWrap['source']."\n"; |
|
1105 | 1105 | } else { |
1106 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
1106 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
1107 | 1107 | } |
1108 | 1108 | } |
1109 | 1109 | } |
1110 | 1110 | $source .= "}\n"; |
1111 | 1111 | if ($buildIt) { |
1112 | 1112 | $allOK = 0; |
1113 | - eval($source . '$allOK=1;'); |
|
1113 | + eval($source.'$allOK=1;'); |
|
1114 | 1114 | if ($allOK) { |
1115 | 1115 | return $xmlrpcClassName; |
1116 | 1116 | } else { |
1117 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
1117 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
1118 | 1118 | return false; |
1119 | 1119 | } |
1120 | 1120 | } else { |
@@ -1136,8 +1136,8 @@ discard block |
||
1136 | 1136 | */ |
1137 | 1137 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
1138 | 1138 | { |
1139 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
1140 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
1139 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
1140 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
1141 | 1141 | |
1142 | 1142 | // copy all client fields to the client that will be generated runtime |
1143 | 1143 | // (this provides for future expansion or subclassing of client obj) |
@@ -157,10 +157,10 @@ discard block |
||
157 | 157 | $server = $parts['host']; |
158 | 158 | $path = isset($parts['path']) ? $parts['path'] : ''; |
159 | 159 | if (isset($parts['query'])) { |
160 | - $path .= '?' . $parts['query']; |
|
160 | + $path .= '?'.$parts['query']; |
|
161 | 161 | } |
162 | 162 | if (isset($parts['fragment'])) { |
163 | - $path .= '#' . $parts['fragment']; |
|
163 | + $path .= '#'.$parts['fragment']; |
|
164 | 164 | } |
165 | 165 | if (isset($parts['port'])) { |
166 | 166 | $port = $parts['port']; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | } |
177 | 177 | } |
178 | 178 | if ($path == '' || $path[0] != '/') { |
179 | - $this->path = '/' . $path; |
|
179 | + $this->path = '/'.$path; |
|
180 | 180 | } else { |
181 | 181 | $this->path = $path; |
182 | 182 | } |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | }*/ |
215 | 215 | |
216 | 216 | // initialize user_agent string |
217 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
217 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | */ |
593 | 593 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
594 | 594 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
595 | - $method='http') |
|
595 | + $method = 'http') |
|
596 | 596 | { |
597 | 597 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
598 | 598 | |
@@ -624,7 +624,7 @@ discard block |
||
624 | 624 | * @param int $sslVersion |
625 | 625 | * @return Response |
626 | 626 | */ |
627 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
627 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
628 | 628 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
629 | 629 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
630 | 630 | $sslVersion = 0) |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | */ |
664 | 664 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
665 | 665 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
666 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
666 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
667 | 667 | $sslVersion = 0) |
668 | 668 | { |
669 | 669 | /// @todo log a warning if passed an unsupported method |
@@ -699,15 +699,15 @@ discard block |
||
699 | 699 | // thanks to Grant Rauscher <[email protected]> for this |
700 | 700 | $credentials = ''; |
701 | 701 | if ($username != '') { |
702 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
702 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
703 | 703 | if ($authType != 1) { |
704 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
704 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
705 | 705 | } |
706 | 706 | } |
707 | 707 | |
708 | 708 | $acceptedEncoding = ''; |
709 | 709 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
710 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
710 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
711 | 711 | } |
712 | 712 | |
713 | 713 | $proxyCredentials = ''; |
@@ -718,12 +718,12 @@ discard block |
||
718 | 718 | $connectServer = $proxyHost; |
719 | 719 | $connectPort = $proxyPort; |
720 | 720 | $transport = 'tcp'; |
721 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
721 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
722 | 722 | if ($proxyUsername != '') { |
723 | 723 | if ($proxyAuthType != 1) { |
724 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
724 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
725 | 725 | } |
726 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
726 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
727 | 727 | } |
728 | 728 | } else { |
729 | 729 | $connectServer = $server; |
@@ -738,45 +738,45 @@ discard block |
||
738 | 738 | $version = ''; |
739 | 739 | foreach ($this->cookies as $name => $cookie) { |
740 | 740 | if ($cookie['version']) { |
741 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
742 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
741 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
742 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
743 | 743 | if ($cookie['path']) { |
744 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
744 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
745 | 745 | } |
746 | 746 | if ($cookie['domain']) { |
747 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
747 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
748 | 748 | } |
749 | 749 | if ($cookie['port']) { |
750 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
750 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
751 | 751 | } |
752 | 752 | } else { |
753 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
753 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
754 | 754 | } |
755 | 755 | } |
756 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
756 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
757 | 757 | } |
758 | 758 | |
759 | 759 | // omit port if default |
760 | 760 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
761 | - $port = ''; |
|
761 | + $port = ''; |
|
762 | 762 | } else { |
763 | - $port = ':' . $port; |
|
763 | + $port = ':'.$port; |
|
764 | 764 | } |
765 | 765 | |
766 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
767 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
768 | - 'Host: ' . $server . $port . "\r\n" . |
|
769 | - $credentials . |
|
770 | - $proxyCredentials . |
|
771 | - $acceptedEncoding . |
|
772 | - $encodingHdr . |
|
773 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
774 | - $cookieHeader . |
|
775 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
776 | - strlen($payload) . "\r\n\r\n" . |
|
766 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
767 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
768 | + 'Host: '.$server.$port."\r\n". |
|
769 | + $credentials. |
|
770 | + $proxyCredentials. |
|
771 | + $acceptedEncoding. |
|
772 | + $encodingHdr. |
|
773 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
774 | + $cookieHeader. |
|
775 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
776 | + strlen($payload)."\r\n\r\n". |
|
777 | 777 | $payload; |
778 | 778 | |
779 | - if ($this->debug > 1) { |
|
779 | + if ($this->debug>1) { |
|
780 | 780 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
781 | 781 | } |
782 | 782 | |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | |
804 | 804 | $context = stream_context_create($contextOptions); |
805 | 805 | |
806 | - if ($timeout <= 0) { |
|
806 | + if ($timeout<=0) { |
|
807 | 807 | $connectTimeout = ini_get('default_socket_timeout'); |
808 | 808 | } else { |
809 | 809 | $connectTimeout = $timeout; |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
816 | 816 | STREAM_CLIENT_CONNECT, $context); |
817 | 817 | if ($fp) { |
818 | - if ($timeout > 0) { |
|
818 | + if ($timeout>0) { |
|
819 | 819 | stream_set_timeout($fp, $timeout); |
820 | 820 | } |
821 | 821 | } else { |
@@ -824,8 +824,8 @@ discard block |
||
824 | 824 | $this->errstr = $err['message']; |
825 | 825 | } |
826 | 826 | |
827 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
828 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
827 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
828 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
829 | 829 | |
830 | 830 | return $r; |
831 | 831 | } |
@@ -913,18 +913,18 @@ discard block |
||
913 | 913 | $keyPass, $sslVersion); |
914 | 914 | |
915 | 915 | if (!$curl) { |
916 | - return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details'); |
|
916 | + return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details'); |
|
917 | 917 | } |
918 | 918 | |
919 | 919 | $result = curl_exec($curl); |
920 | 920 | |
921 | - if ($this->debug > 1) { |
|
921 | + if ($this->debug>1) { |
|
922 | 922 | $message = "---CURL INFO---\n"; |
923 | 923 | foreach (curl_getinfo($curl) as $name => $val) { |
924 | 924 | if (is_array($val)) { |
925 | 925 | $val = implode("\n", $val); |
926 | 926 | } |
927 | - $message .= $name . ': ' . $val . "\n"; |
|
927 | + $message .= $name.': '.$val."\n"; |
|
928 | 928 | } |
929 | 929 | $message .= '---END---'; |
930 | 930 | $this->getLogger()->debugMessage($message); |
@@ -934,7 +934,7 @@ discard block |
||
934 | 934 | /// @todo we should use a better check here - what if we get back '' or '0'? |
935 | 935 | |
936 | 936 | $this->errstr = 'no response'; |
937 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
937 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
938 | 938 | curl_close($curl); |
939 | 939 | if ($keepAlive) { |
940 | 940 | $this->xmlrpc_curl_handle = null; |
@@ -1004,12 +1004,12 @@ discard block |
||
1004 | 1004 | // http, https |
1005 | 1005 | $protocol = $method; |
1006 | 1006 | if (strpos($protocol, ':') !== false) { |
1007 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
1007 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
1008 | 1008 | return false; |
1009 | 1009 | } |
1010 | 1010 | } |
1011 | 1011 | } |
1012 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
1012 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
1013 | 1013 | if (!$curl) { |
1014 | 1014 | return false; |
1015 | 1015 | } |
@@ -1023,7 +1023,7 @@ discard block |
||
1023 | 1023 | // results into variable |
1024 | 1024 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
1025 | 1025 | |
1026 | - if ($this->debug > 1) { |
|
1026 | + if ($this->debug>1) { |
|
1027 | 1027 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
1028 | 1028 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
1029 | 1029 | } |
@@ -1048,7 +1048,7 @@ discard block |
||
1048 | 1048 | } |
1049 | 1049 | } |
1050 | 1050 | // extra headers |
1051 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
1051 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
1052 | 1052 | // if no keepalive is wanted, let the server know it in advance |
1053 | 1053 | if (!$keepAlive) { |
1054 | 1054 | $headers[] = 'Connection: close'; |
@@ -1065,7 +1065,7 @@ discard block |
||
1065 | 1065 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
1066 | 1066 | // timeout is borked |
1067 | 1067 | if ($timeout) { |
1068 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
1068 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
1069 | 1069 | } |
1070 | 1070 | |
1071 | 1071 | switch ($method) { |
@@ -1084,11 +1084,11 @@ discard block |
||
1084 | 1084 | } |
1085 | 1085 | |
1086 | 1086 | if ($username && $password) { |
1087 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
1087 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
1088 | 1088 | if (defined('CURLOPT_HTTPAUTH')) { |
1089 | 1089 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
1090 | 1090 | } elseif ($authType != 1) { |
1091 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
1091 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
1092 | 1092 | } |
1093 | 1093 | } |
1094 | 1094 | |
@@ -1130,13 +1130,13 @@ discard block |
||
1130 | 1130 | if ($proxyPort == 0) { |
1131 | 1131 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
1132 | 1132 | } |
1133 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
1133 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
1134 | 1134 | if ($proxyUsername) { |
1135 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
1135 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
1136 | 1136 | if (defined('CURLOPT_PROXYAUTH')) { |
1137 | 1137 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
1138 | 1138 | } elseif ($proxyAuthType != 1) { |
1139 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
1139 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
1140 | 1140 | } |
1141 | 1141 | } |
1142 | 1142 | } |
@@ -1146,7 +1146,7 @@ discard block |
||
1146 | 1146 | if (count($this->cookies)) { |
1147 | 1147 | $cookieHeader = ''; |
1148 | 1148 | foreach ($this->cookies as $name => $cookie) { |
1149 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
1149 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
1150 | 1150 | } |
1151 | 1151 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
1152 | 1152 | } |
@@ -1155,7 +1155,7 @@ discard block |
||
1155 | 1155 | curl_setopt($curl, $opt, $val); |
1156 | 1156 | } |
1157 | 1157 | |
1158 | - if ($this->debug > 1) { |
|
1158 | + if ($this->debug>1) { |
|
1159 | 1159 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
1160 | 1160 | } |
1161 | 1161 | |
@@ -1253,7 +1253,7 @@ discard block |
||
1253 | 1253 | $call['methodName'] = new Value($req->method(), 'string'); |
1254 | 1254 | $numParams = $req->getNumParams(); |
1255 | 1255 | $params = array(); |
1256 | - for ($i = 0; $i < $numParams; $i++) { |
|
1256 | + for ($i = 0; $i<$numParams; $i++) { |
|
1257 | 1257 | $params[$i] = $req->getParam($i); |
1258 | 1258 | } |
1259 | 1259 | $call['params'] = new Value($params, 'array'); |
@@ -1279,15 +1279,15 @@ discard block |
||
1279 | 1279 | /// @todo test this code branch... |
1280 | 1280 | $rets = $result->value(); |
1281 | 1281 | if (!is_array($rets)) { |
1282 | - return false; // bad return type from system.multicall |
|
1282 | + return false; // bad return type from system.multicall |
|
1283 | 1283 | } |
1284 | 1284 | $numRets = count($rets); |
1285 | 1285 | if ($numRets != count($reqs)) { |
1286 | - return false; // wrong number of return values. |
|
1286 | + return false; // wrong number of return values. |
|
1287 | 1287 | } |
1288 | 1288 | |
1289 | 1289 | $response = array(); |
1290 | - for ($i = 0; $i < $numRets; $i++) { |
|
1290 | + for ($i = 0; $i<$numRets; $i++) { |
|
1291 | 1291 | $val = $rets[$i]; |
1292 | 1292 | if (!is_array($val)) { |
1293 | 1293 | return false; |
@@ -1295,7 +1295,7 @@ discard block |
||
1295 | 1295 | switch (count($val)) { |
1296 | 1296 | case 1: |
1297 | 1297 | if (!isset($val[0])) { |
1298 | - return false; // Bad value |
|
1298 | + return false; // Bad value |
|
1299 | 1299 | } |
1300 | 1300 | // Normal return value |
1301 | 1301 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1323,11 +1323,11 @@ discard block |
||
1323 | 1323 | |
1324 | 1324 | $rets = $result->value(); |
1325 | 1325 | if ($rets->kindOf() != 'array') { |
1326 | - return false; // bad return type from system.multicall |
|
1326 | + return false; // bad return type from system.multicall |
|
1327 | 1327 | } |
1328 | 1328 | $numRets = $rets->count(); |
1329 | 1329 | if ($numRets != count($reqs)) { |
1330 | - return false; // wrong number of return values. |
|
1330 | + return false; // wrong number of return values. |
|
1331 | 1331 | } |
1332 | 1332 | |
1333 | 1333 | $response = array(); |
@@ -1335,7 +1335,7 @@ discard block |
||
1335 | 1335 | switch ($val->kindOf()) { |
1336 | 1336 | case 'array': |
1337 | 1337 | if ($val->count() != 1) { |
1338 | - return false; // Bad value |
|
1338 | + return false; // Bad value |
|
1339 | 1339 | } |
1340 | 1340 | // Normal return value |
1341 | 1341 | $response[] = new Response($val[0]); |