@@ -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 | /** |
5 | 5 | * Demoing how to inject a custom logger for use by the library |
@@ -21,17 +21,17 @@ discard block |
||
21 | 21 | // logger API |
22 | 22 | public function debug($message, $context = array()) |
23 | 23 | { |
24 | - $this->debugBuffer .= $message . "\n"; |
|
24 | + $this->debugBuffer .= $message."\n"; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function error($message, $context = array()) |
28 | 28 | { |
29 | - $this->errorBuffer .= $message . "\n"; |
|
29 | + $this->errorBuffer .= $message."\n"; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function warning($message, $context = array()) |
33 | 33 | { |
34 | - $this->warningBuffer .= $message . "\n"; |
|
34 | + $this->warningBuffer .= $message."\n"; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function getDebug() |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | |
63 | 63 | $input = array( |
64 | 64 | array('name' => 'Dave', 'age' => 24), |
65 | - array('name' => 'Edd', 'age' => 45), |
|
66 | - array('name' => 'Joe', 'age' => 37), |
|
65 | + array('name' => 'Edd', 'age' => 45), |
|
66 | + array('name' => 'Joe', 'age' => 37), |
|
67 | 67 | array('name' => 'Fred', 'age' => 27), |
68 | 68 | ); |
69 | 69 | |
@@ -85,6 +85,6 @@ discard block |
||
85 | 85 | $response = $client->send($request); |
86 | 86 | output("Response received.<br>"); |
87 | 87 | |
88 | -output("The client error info is:<pre>\n" . $logger->getError() . "\n</pre>"); |
|
89 | -output("The client warning info is:<pre>\n" . $logger->getWarning() . "\n</pre>"); |
|
90 | -output("The client debug info is:<pre>\n" . $logger->getDebug() . "\n</pre>"); |
|
88 | +output("The client error info is:<pre>\n".$logger->getError()."\n</pre>"); |
|
89 | +output("The client warning info is:<pre>\n".$logger->getWarning()."\n</pre>"); |
|
90 | +output("The client debug info is:<pre>\n".$logger->getDebug()."\n</pre>"); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | if ($response->faultCode()) { |
29 | 29 | throw new HttpException(502, $response->faultString()); |
30 | 30 | } else { |
31 | - return new Response("<html><body>State number $stateNo is: " . $response->value()->scalarVal() . '</body></html>'); |
|
31 | + return new Response("<html><body>State number $stateNo is: ".$response->value()->scalarVal().'</body></html>'); |
|
32 | 32 | } |
33 | 33 | } |
34 | 34 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $val = reset($ar); |
130 | 130 | $typ = key($ar); |
131 | 131 | |
132 | - return '<value>' . $this->serializeData($typ, $val) . "</value>\n"; |
|
132 | + return '<value>'.$this->serializeData($typ, $val)."</value>\n"; |
|
133 | 133 | //} |
134 | 134 | } |
135 | 135 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | // preserve back compatibility |
149 | 149 | |
150 | 150 | if (is_array($b)) { |
151 | - foreach($b as $id => $cont) { |
|
151 | + foreach ($b as $id => $cont) { |
|
152 | 152 | $b[$id] = $cont->scalarVal(); |
153 | 153 | } |
154 | 154 | } |
@@ -156,10 +156,10 @@ discard block |
||
156 | 156 | // add support for structures directly encoding php objects |
157 | 157 | if (is_object($b)) { |
158 | 158 | $t = get_object_vars($b); |
159 | - foreach($t as $id => $cont) { |
|
159 | + foreach ($t as $id => $cont) { |
|
160 | 160 | $t[$id] = $cont->scalarVal(); |
161 | 161 | } |
162 | - foreach($t as $id => $cont) { |
|
162 | + foreach ($t as $id => $cont) { |
|
163 | 163 | @$b->$id = $cont; |
164 | 164 | } |
165 | 165 | } |
@@ -201,17 +201,17 @@ discard block |
||
201 | 201 | /* Expose as global functions the ones which are now class methods */ |
202 | 202 | |
203 | 203 | /// Wrong speling, but we are adamant on backwards compatibility! |
204 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
204 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
205 | 205 | { |
206 | 206 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
207 | 207 | } |
208 | 208 | |
209 | -function iso8601_encode($timeT, $utc=0) |
|
209 | +function iso8601_encode($timeT, $utc = 0) |
|
210 | 210 | { |
211 | 211 | return Date::iso8601Encode($timeT, $utc); |
212 | 212 | } |
213 | 213 | |
214 | -function iso8601_decode($iDate, $utc=0) |
|
214 | +function iso8601_decode($iDate, $utc = 0) |
|
215 | 215 | { |
216 | 216 | return Date::iso8601Decode($iDate, $utc); |
217 | 217 | } |
@@ -221,25 +221,25 @@ discard block |
||
221 | 221 | return Http::decodeChunked($buffer); |
222 | 222 | } |
223 | 223 | |
224 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
224 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
225 | 225 | { |
226 | 226 | $encoder = new Encoder(); |
227 | 227 | return $encoder->decode($xmlrpcVal, $options); |
228 | 228 | } |
229 | 229 | |
230 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
230 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
231 | 231 | { |
232 | 232 | $encoder = new Encoder(); |
233 | 233 | return $encoder->encode($phpVal, $options); |
234 | 234 | } |
235 | 235 | |
236 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
236 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
237 | 237 | { |
238 | 238 | $encoder = new Encoder(); |
239 | 239 | return $encoder->decodeXml($xmlVal, $options); |
240 | 240 | } |
241 | 241 | |
242 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
242 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
243 | 243 | { |
244 | 244 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
245 | 245 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param array $extraOptions |
42 | 42 | * @return array|false |
43 | 43 | */ |
44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
45 | 45 | { |
46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
47 | 47 | if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @param array $extraOptions |
65 | 65 | * @return array|false |
66 | 66 | */ |
67 | -function wrap_php_class($className, $extraOptions=array()) |
|
67 | +function wrap_php_class($className, $extraOptions = array()) |
|
68 | 68 | { |
69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
70 | 70 | $fix = false; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $fix = true; |
75 | 75 | } |
76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
77 | - foreach($wrapped as $name => $value) { |
|
77 | + foreach ($wrapped as $name => $value) { |
|
78 | 78 | if ($fix) { |
79 | 79 | eval($value['source']); |
80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
94 | 94 | * @return array|callable|false |
95 | 95 | */ |
96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
97 | 97 | { |
98 | 98 | if (!is_array($extraOptions)) |
99 | 99 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param array $extraOptions |
129 | 129 | * @return mixed |
130 | 130 | */ |
131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
132 | 132 | { |
133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
149 | 149 | { |
150 | 150 | $code = "function $xmlrpcFuncName ("; |
151 | - if ($clientCopyMode < 2) { |
|
151 | + if ($clientCopyMode<2) { |
|
152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | if ($mDesc != '') { |
164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
166 | 166 | } else { |
167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
172 | 172 | $plist = array(); |
173 | 173 | $pCount = count($mSig); |
174 | - for ($i = 1; $i < $pCount; $i++) { |
|
174 | + for ($i = 1; $i<$pCount; $i++) { |
|
175 | 175 | $plist[] = "\$p$i"; |
176 | 176 | $pType = $mSig[$i]; |
177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
187 | 187 | } |
188 | 188 | } |
189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
191 | 191 | } |
192 | - if ($clientCopyMode < 2) { |
|
192 | + if ($clientCopyMode<2) { |
|
193 | 193 | $plist[] = '$debug=0'; |
194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
195 | 195 | } |
196 | 196 | $plist = implode(', ', $plist); |
197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
198 | 198 | |
199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
200 | 200 | if ($decodeFault) { |
201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
203 | 203 | } else { |
204 | 204 | $respCode = var_export($faultResponse, true); |
205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $innerCode .= "if (\$res->faultCode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
213 | 213 | } |
214 | 214 | |
215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
216 | 216 | |
217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * @deprecated |
222 | 222 | */ |
223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
224 | 224 | { |
225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
227 | 227 | |
228 | 228 | // copy all client fields to the client that will be generated runtime |
229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | use PhpXmlRpc\Encoder; |
5 | 5 | use PhpXmlRpc\Client; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $handles = array(); |
34 | 34 | $curl = curl_multi_init(); |
35 | 35 | |
36 | - foreach($requests as $k => $req) { |
|
36 | + foreach ($requests as $k => $req) { |
|
37 | 37 | $req->setDebug($this->debug); |
38 | 38 | $handle = $this->createCurlHandle($req, $method, $this->server, $this->port, $this->path, $opts); |
39 | 39 | curl_multi_add_handle($curl, $handle); |
@@ -43,20 +43,20 @@ discard block |
||
43 | 43 | $running = 0; |
44 | 44 | do { |
45 | 45 | curl_multi_exec($curl, $running); |
46 | - } while($running > 0); |
|
46 | + } while ($running>0); |
|
47 | 47 | |
48 | 48 | $responses = array(); |
49 | 49 | $errors = array(); |
50 | - foreach($handles as $k => $h) { |
|
50 | + foreach ($handles as $k => $h) { |
|
51 | 51 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
52 | 52 | |
53 | - if ($this->debug > 1) { |
|
53 | + if ($this->debug>1) { |
|
54 | 54 | $message = "---CURL INFO---\n"; |
55 | 55 | foreach (curl_getinfo($h) as $name => $val) { |
56 | 56 | if (is_array($val)) { |
57 | 57 | $val = implode("\n", $val); |
58 | 58 | } |
59 | - $message .= $name . ': ' . $val . "\n"; |
|
59 | + $message .= $name.': '.$val."\n"; |
|
60 | 60 | } |
61 | 61 | $message .= '---END---'; |
62 | 62 | $this->getLogger()->debugMessage($message); |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | } |
72 | 72 | curl_multi_close($curl); |
73 | 73 | |
74 | - foreach($responses as $k => $resp) { |
|
74 | + foreach ($responses as $k => $resp) { |
|
75 | 75 | if (!$resp) { |
76 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . $errors[$k]); |
|
76 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.$errors[$k]); |
|
77 | 77 | } else { |
78 | 78 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
79 | 79 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $value = $encoder->encode($data, array('auto_dates')); |
94 | 94 | $req = new Request('interopEchoTests.echoValue', array($value)); |
95 | 95 | $reqs = array(); |
96 | -for ($i = 0; $i < $num_tests; $i++) { |
|
96 | +for ($i = 0; $i<$num_tests; $i++) { |
|
97 | 97 | $reqs[] = $req; |
98 | 98 | } |
99 | 99 | |
@@ -102,40 +102,40 @@ discard block |
||
102 | 102 | // avoid storing http info in the responses, to make the checksums comparable |
103 | 103 | $client->setDebug(-1); |
104 | 104 | |
105 | -echo "Making $num_tests calls to method interopEchoTests.echoValue on server " . XMLRPCSERVER . " ...\n"; |
|
105 | +echo "Making $num_tests calls to method interopEchoTests.echoValue on server ".XMLRPCSERVER." ...\n"; |
|
106 | 106 | flush(); |
107 | 107 | |
108 | -$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
108 | +$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
109 | 109 | $t = microtime(true); |
110 | 110 | $resp = $client->send($reqs); |
111 | -$t = microtime(true) - $t; |
|
112 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
113 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
111 | +$t = microtime(true)-$t; |
|
112 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
113 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
114 | 114 | flush(); |
115 | 115 | |
116 | 116 | if (strpos(XMLRPCSERVER, 'http://') === 0) { |
117 | - $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
117 | + $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
118 | 118 | $t = microtime(true); |
119 | 119 | $resp = $client->send($reqs); |
120 | - $t = microtime(true) - $t; |
|
121 | - echo "Sequential send, curl (w. keepalive): " . sprintf('%.3f', $t) . " secs.\n"; |
|
122 | - echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
120 | + $t = microtime(true)-$t; |
|
121 | + echo "Sequential send, curl (w. keepalive): ".sprintf('%.3f', $t)." secs.\n"; |
|
122 | + echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
123 | 123 | flush(); |
124 | 124 | } |
125 | 125 | |
126 | 126 | $t = microtime(true); |
127 | 127 | $resp = $client->sendParallel($reqs); |
128 | -$t = microtime(true) - $t; |
|
129 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
130 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
128 | +$t = microtime(true)-$t; |
|
129 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
130 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
131 | 131 | flush(); |
132 | 132 | |
133 | 133 | $client->setOption(Client::OPT_NO_MULTICALL, false); |
134 | 134 | // make sure we don't reuse the keepalive handle |
135 | -$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
135 | +$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
136 | 136 | $t = microtime(true); |
137 | 137 | $resp = $client->send($reqs); |
138 | -$t = microtime(true) - $t; |
|
139 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
140 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
138 | +$t = microtime(true)-$t; |
|
139 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
|
140 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
141 | 141 | flush(); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>phpxmlrpc - Introspect demo</title></head> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | function display_error($r) |
18 | 18 | { |
19 | 19 | output("An error occurred: "); |
20 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
20 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | $client = new Client(XMLRPCSERVER); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP); |
26 | 26 | |
27 | 27 | // First off, let's retrieve the list of methods available on the remote server |
28 | -output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n"); |
|
28 | +output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n"); |
|
29 | 29 | $req = new Request('system.listMethods'); |
30 | 30 | $resp = $client->send($req); |
31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | // Then, retrieve the signature and help text of each available method |
49 | 49 | foreach ($v as $methodName) { |
50 | - output("<h4>" . htmlspecialchars($methodName) . "</h4>\n"); |
|
50 | + output("<h4>".htmlspecialchars($methodName)."</h4>\n"); |
|
51 | 51 | // build requests first, add params later |
52 | 52 | $r1 = new PhpXmlRpc\Request('system.methodHelp'); |
53 | 53 | $r2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | continue; |
84 | 84 | } |
85 | 85 | $ret = $sig[0]; |
86 | - output("<code>" . htmlspecialchars($ret) . " " |
|
87 | - . htmlspecialchars($methodName) . "("); |
|
88 | - if (count($sig) > 1) { |
|
89 | - for ($k = 1; $k < count($sig); $k++) { |
|
86 | + output("<code>".htmlspecialchars($ret)." " |
|
87 | + . htmlspecialchars($methodName)."("); |
|
88 | + if (count($sig)>1) { |
|
89 | + for ($k = 1; $k<count($sig); $k++) { |
|
90 | 90 | output(htmlspecialchars($sig[$k])); |
91 | - if ($k < count($sig) - 1) { |
|
91 | + if ($k<count($sig)-1) { |
|
92 | 92 | output(", "); |
93 | 93 | } |
94 | 94 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | return; |
15 | 15 | } |
16 | 16 | |
17 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $message); |
|
17 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$message); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return; |
35 | 35 | } |
36 | 36 | |
37 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] . |
|
38 | - ' is only supposed to be called by ' . $expectedCaller); |
|
37 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function']. |
|
38 | + ' is only supposed to be called by '.$expectedCaller); |
|
39 | 39 | } |
40 | 40 | } |
@@ -57,13 +57,13 @@ discard block |
||
57 | 57 | 'scalar' => $val, |
58 | 58 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
59 | 59 | ); |
60 | - return (object)$xmlrpcVal; |
|
60 | + return (object) $xmlrpcVal; |
|
61 | 61 | case 'base64': |
62 | 62 | $xmlrpcVal = array( |
63 | 63 | 'xmlrpc_type' => 'base64', |
64 | 64 | 'scalar' => $val |
65 | 65 | ); |
66 | - return (object)$xmlrpcVal; |
|
66 | + return (object) $xmlrpcVal; |
|
67 | 67 | case 'string': |
68 | 68 | if (isset($options['extension_api_encoding'])) { |
69 | 69 | // if iconv is not available, we use mb_convert_encoding |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | case 'msg': |
137 | 137 | $paramCount = $xmlrpcVal->getNumParams(); |
138 | 138 | $arr = array(); |
139 | - for ($i = 0; $i < $paramCount; $i++) { |
|
139 | + for ($i = 0; $i<$paramCount; $i++) { |
|
140 | 140 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
141 | 141 | } |
142 | 142 | return $arr; |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | break; |
262 | 262 | case 'resource': |
263 | 263 | if (in_array('extension_api', $options)) { |
264 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
264 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
265 | 265 | } else { |
266 | 266 | $xmlrpcVal = new Value(); |
267 | 267 | } |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
311 | 311 | $xmlVal = utf8_encode($xmlVal); |
312 | 312 | } else { |
313 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
313 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | } |
@@ -336,10 +336,10 @@ discard block |
||
336 | 336 | $_xh = $xmlRpcParser->_xh; |
337 | 337 | } |
338 | 338 | |
339 | - if ($_xh['isf'] > 1) { |
|
339 | + if ($_xh['isf']>1) { |
|
340 | 340 | // test that $_xh['value'] is an obj, too??? |
341 | 341 | |
342 | - $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']); |
|
342 | + $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']); |
|
343 | 343 | |
344 | 344 | return false; |
345 | 345 | } |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | |
361 | 361 | case 'methodcall': |
362 | 362 | $req = new Request($_xh['method']); |
363 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
363 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
364 | 364 | $req->addParam($_xh['params'][$i]); |
365 | 365 | } |
366 | 366 | return $req; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
2 | +require_once __DIR__."/client/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
11 | 11 | |
12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
14 | 14 | |
15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
17 | 17 | |
18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
20 | 20 | |
21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
23 | 23 | |
24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
28 | 28 | |
29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
31 | -output("(value of base64 string is: '" . $v->scalarVal() . "')<BR><BR>"); |
|
30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
31 | +output("(value of base64 string is: '".$v->scalarVal()."')<BR><BR>"); |
|
32 | 32 | |
33 | 33 | $v = new PhpXmlRpc\Value( |
34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | ), |
42 | 42 | "array" |
43 | 43 | ); |
44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
45 | 45 | |
46 | 46 | $v = new PhpXmlRpc\Value( |
47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | ), |
62 | 62 | "struct" |
63 | 63 | ); |
64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
65 | 65 | |
66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
68 | 68 | |
69 | 69 | class MyClass |
70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
80 | 80 | |
81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
88 | 88 | |
89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
90 | 90 | // The greek word 'kosme' |
91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
94 | 94 | if (function_exists('mb_convert_encoding')) { |
95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
100 | 100 | $req->method('examples.getStateName'); |
101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
103 | 103 | |
104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
107 | 107 | |
108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
109 | 109 | $t = time(); |
110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
111 | 111 | output("Now is $t --> $date\n"); |
112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
114 | 114 | output("That is to say $date --> $tb\n"); |
115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
117 | 117 | output("</pre>\n"); |
118 | 118 | |
119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
123 | 123 | |
124 | 124 | output('</body></html>'); |