@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * @param array $extraOptions |
42 | 42 | * @return array|false |
43 | 43 | */ |
44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
45 | 45 | { |
46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
47 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
47 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
48 | 48 | // backwards compat: return string instead of callable |
49 | 49 | $extraOptions['return_source'] = true; |
50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | * @param array $extraOptions |
65 | 65 | * @return array|false |
66 | 66 | */ |
67 | -function wrap_php_class($className, $extraOptions=array()) |
|
67 | +function wrap_php_class($className, $extraOptions = array()) |
|
68 | 68 | { |
69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
70 | 70 | $fix = false; |
71 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
71 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
72 | 72 | // backwards compat: return string instead of callable |
73 | 73 | $extraOptions['return_source'] = true; |
74 | 74 | $fix = true; |
75 | 75 | } |
76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
77 | - foreach($wrapped as $name => $value) { |
|
77 | + foreach ($wrapped as $name => $value) { |
|
78 | 78 | if ($fix) { |
79 | 79 | eval($value['source']); |
80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
94 | 94 | * @return array|callable|false |
95 | 95 | */ |
96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
97 | 97 | { |
98 | 98 | if (!is_array($extraOptions)) |
99 | 99 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param array $extraOptions |
129 | 129 | * @return mixed |
130 | 130 | */ |
131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
132 | 132 | { |
133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
149 | 149 | { |
150 | 150 | $code = "function $xmlrpcFuncName ("; |
151 | - if ($clientCopyMode < 2) { |
|
151 | + if ($clientCopyMode<2) { |
|
152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | if ($mDesc != '') { |
164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
166 | 166 | } else { |
167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
172 | 172 | $plist = array(); |
173 | 173 | $pCount = count($mSig); |
174 | - for ($i = 1; $i < $pCount; $i++) { |
|
174 | + for ($i = 1; $i<$pCount; $i++) { |
|
175 | 175 | $plist[] = "\$p$i"; |
176 | 176 | $pType = $mSig[$i]; |
177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
187 | 187 | } |
188 | 188 | } |
189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
191 | 191 | } |
192 | - if ($clientCopyMode < 2) { |
|
192 | + if ($clientCopyMode<2) { |
|
193 | 193 | $plist[] = '$debug=0'; |
194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
195 | 195 | } |
196 | 196 | $plist = implode(', ', $plist); |
197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
198 | 198 | |
199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
200 | 200 | if ($decodeFault) { |
201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
203 | 203 | } else { |
204 | 204 | $respCode = var_export($faultResponse, true); |
205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
213 | 213 | } |
214 | 214 | |
215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
216 | 216 | |
217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * @deprecated |
222 | 222 | */ |
223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
224 | 224 | { |
225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
227 | 227 | |
228 | 228 | // copy all client fields to the client that will be generated runtime |
229 | 229 | // (this provides for future expansion or subclassing of client obj) |