@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | use PhpXmlRpc\Encoder; |
| 21 | 21 | |
| 22 | 22 | /// @todo allow autoloading when the library is installed as dependency |
| 23 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 23 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 24 | 24 | |
| 25 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 25 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 26 | 26 | $args = argParser::getArgs(); |
| 27 | 27 | |
| 28 | 28 | function begin_test($test_name, $test_case) |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | if (!isset($test_results[$test_name][$test_case])) { |
| 43 | 43 | trigger_error('ending test that was not started'); |
| 44 | 44 | } |
| 45 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 45 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 46 | 46 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 47 | 47 | echo '.'; |
| 48 | 48 | flush(); |
@@ -76,24 +76,24 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | if ($is_web) { |
| 79 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 79 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 80 | 80 | if ($xd) { |
| 81 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 81 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 82 | 82 | } |
| 83 | 83 | flush(); |
| 84 | 84 | ob_flush(); |
| 85 | 85 | } else { |
| 86 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 86 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 87 | 87 | if ($xd) { |
| 88 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 88 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 93 | 93 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 94 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 94 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 95 | 95 | $vals = array(); |
| 96 | - for ($j = 0; $j < 10; $j++) { |
|
| 96 | + for ($j = 0; $j<10; $j++) { |
|
| 97 | 97 | $valarray = array(); |
| 98 | 98 | foreach ($data[$j] as $key => $val) { |
| 99 | 99 | $values = array(); |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 120 | 120 | $encoder = new Encoder(); |
| 121 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 121 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 122 | 122 | $value = $encoder->encode($data, array('auto_dates')); |
| 123 | 123 | $out = $value->serialize(); |
| 124 | 124 | } |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | if (function_exists('xmlrpc_set_type')) { |
| 128 | 128 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 129 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 130 | - for ($j = 0; $j < 10; $j++) { |
|
| 129 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 130 | + for ($j = 0; $j<10; $j++) { |
|
| 131 | 131 | foreach ($keys as $k) { |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 133 | 133 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -141,18 +141,18 @@ discard block |
||
| 141 | 141 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 142 | 142 | $dummy = new Request(''); |
| 143 | 143 | $out = new Response($value); |
| 144 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 144 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 145 | 145 | |
| 146 | 146 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 147 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 147 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 148 | 148 | $response = $dummy->ParseResponse($in, true); |
| 149 | 149 | $value = $response->value(); |
| 150 | 150 | $result = array(); |
| 151 | - foreach($value as $val1) { |
|
| 151 | + foreach ($value as $val1) { |
|
| 152 | 152 | $out = array(); |
| 153 | - foreach($val1 as $name => $val) { |
|
| 153 | + foreach ($val1 as $name => $val) { |
|
| 154 | 154 | $out[$name] = array(); |
| 155 | - foreach($val as $data) { |
|
| 155 | + foreach ($val as $data) { |
|
| 156 | 156 | $out[$name][] = $data->scalarval(); |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -162,18 +162,18 @@ discard block |
||
| 162 | 162 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 163 | 163 | |
| 164 | 164 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 165 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 165 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 166 | 166 | $response = $dummy->ParseResponse($in, true); |
| 167 | 167 | $value = $response->value(); |
| 168 | 168 | $result = array(); |
| 169 | 169 | $l = $value->arraysize(); |
| 170 | - for ($k = 0; $k < $l; $k++) { |
|
| 170 | + for ($k = 0; $k<$l; $k++) { |
|
| 171 | 171 | $val1 = $value->arraymem($k); |
| 172 | 172 | $out = array(); |
| 173 | - foreach($val1 as $name => $val) { |
|
| 173 | + foreach ($val1 as $name => $val) { |
|
| 174 | 174 | $out[$name] = array(); |
| 175 | 175 | $m = $val->arraysize(); |
| 176 | - for ($j = 0; $j < $m; $j++) { |
|
| 176 | + for ($j = 0; $j<$m; $j++) { |
|
| 177 | 177 | $data = $val->arraymem($j); |
| 178 | 178 | $out[$name][] = $data->scalarval(); |
| 179 | 179 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 185 | 185 | |
| 186 | 186 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 187 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 187 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 188 | 188 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
| 189 | 189 | $value = $response->value(); |
| 190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | if (function_exists('xmlrpc_decode')) { |
| 194 | 194 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 195 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 195 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 196 | 196 | $response = $dummy->ParseResponse($in, true, 'xml'); |
| 197 | 197 | $value = xmlrpc_decode($response->value()); |
| 198 | 198 | } |
@@ -208,15 +208,15 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | $server = explode(':', $args['HTTPSERVER']); |
| 215 | - if (count($server) > 1) { |
|
| 216 | - $srv = $server[1] . '://' . $server[0] . $args['HTTPURI']; |
|
| 215 | + if (count($server)>1) { |
|
| 216 | + $srv = $server[1].'://'.$server[0].$args['HTTPURI']; |
|
| 217 | 217 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 218 | 218 | } else { |
| 219 | - $srv = $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 219 | + $srv = $args['HTTPSERVER'].$args['HTTPURI']; |
|
| 220 | 220 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 221 | 221 | } |
| 222 | 222 | // do not interfere with http compression |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | begin_test($testName, 'http 10'); |
| 232 | 232 | $response = array(); |
| 233 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 233 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 234 | 234 | $resp = $c->send($req); |
| 235 | 235 | $response[] = $resp->value(); |
| 236 | 236 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | if (function_exists('curl_init')) { |
| 240 | 240 | begin_test($testName, 'http 11 w. keep-alive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | $c->keepalive = false; |
| 249 | 249 | begin_test($testName, 'http 11'); |
| 250 | 250 | $response = array(); |
| 251 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 251 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 252 | 252 | $resp = $c->send($req, 10, 'http11'); |
| 253 | 253 | $response[] = $resp->value(); |
| 254 | 254 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | begin_test($testName, 'http 10 w. compression'); |
| 270 | 270 | $response = array(); |
| 271 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 271 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 272 | 272 | $resp = $c->send($req); |
| 273 | 273 | $response[] = $resp->value(); |
| 274 | 274 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | if (function_exists('curl_init')) { |
| 278 | 278 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 279 | 279 | $response = array(); |
| 280 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 280 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 281 | 281 | $resp = $c->send($req, 10, 'http11'); |
| 282 | 282 | $response[] = $resp->value(); |
| 283 | 283 | } |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | $c->keepalive = false; |
| 287 | 287 | begin_test($testName, 'http 11 w. compression'); |
| 288 | 288 | $response = array(); |
| 289 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 289 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 290 | 290 | $resp = $c->send($req, 10, 'http11'); |
| 291 | 291 | $response[] = $resp->value(); |
| 292 | 292 | } |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | foreach ($test_results as $test => $results) { |
| 308 | 308 | echo "\nTEST: $test\n"; |
| 309 | 309 | foreach ($results as $case => $data) { |
| 310 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 310 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | 313 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * Please _do not_ copy this file verbatim into your production server. |
| 9 | 9 | **/ |
| 10 | 10 | |
| 11 | -require_once __DIR__ . "/_prepend.php"; |
|
| 11 | +require_once __DIR__."/_prepend.php"; |
|
| 12 | 12 | |
| 13 | 13 | use PhpXmlRpc\PhpXmlRpc; |
| 14 | 14 | use PhpXmlRpc\Response; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | ), |
| 61 | 61 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
| 62 | 62 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
| 63 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
| 63 | + "tests.utf8methodname.".'κόσμε' => array( |
|
| 64 | 64 | "function" => "stringEcho", |
| 65 | 65 | "signature" => $stringecho_sig, |
| 66 | 66 | "docstring" => $stringecho_doc, |
@@ -120,4 +120,4 @@ discard block |
||
| 120 | 120 | $s->service(); |
| 121 | 121 | // That should do all we need! |
| 122 | 122 | |
| 123 | -require_once __DIR__ . "/_append.php"; |
|
| 123 | +require_once __DIR__."/_append.php"; |
|
@@ -40,11 +40,12 @@ |
||
| 40 | 40 | $a = $req->getParam(0); |
| 41 | 41 | $b = $req->getParam(1); |
| 42 | 42 | |
| 43 | - if ($a->scalartyp() == Value::$xmlrpcNull) |
|
| 44 | - return new Response(new Value(plain_findstate($b->scalarval()))); |
|
| 45 | - else |
|
| 46 | - return new Response(new Value(plain_findstate($a->scalarval()))); |
|
| 47 | -} |
|
| 43 | + if ($a->scalartyp() == Value::$xmlrpcNull) { |
|
| 44 | + return new Response(new Value(plain_findstate($b->scalarval()))); |
|
| 45 | + } else { |
|
| 46 | + return new Response(new Value(plain_findstate($a->scalarval()))); |
|
| 47 | + } |
|
| 48 | + } |
|
| 48 | 49 | |
| 49 | 50 | $object = new xmlrpcServerMethodsContainer(); |
| 50 | 51 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | ); |
| 30 | 30 | |
| 31 | 31 | $findstate_sig = array(array(Value::$xmlrpcString, Value::$xmlrpcInt)); |
| 32 | -$findstate_doc = 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 32 | +$findstate_doc = 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 33 | 33 | 'index of that state name in an alphabetic order.'; |
| 34 | 34 | function findState($req) |
| 35 | 35 | { |
@@ -42,11 +42,11 @@ discard block |
||
| 42 | 42 | // extract the value of the state number |
| 43 | 43 | $snv = $sno->scalarval(); |
| 44 | 44 | // look it up in our array (zero-based) |
| 45 | - if (isset($GLOBALS['stateNames'][$snv - 1])) { |
|
| 46 | - $stateName = $GLOBALS['stateNames'][$snv - 1]; |
|
| 45 | + if (isset($GLOBALS['stateNames'][$snv-1])) { |
|
| 46 | + $stateName = $GLOBALS['stateNames'][$snv-1]; |
|
| 47 | 47 | } else { |
| 48 | 48 | // not there, so complain |
| 49 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
| 49 | + $err = "I don't have a state for the index '".$snv."'"; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | // if we generated an error, create an error return response |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | return 0; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1; |
|
| 85 | + return ($agesorter_arr[$a]>$agesorter_arr[$b]) ? -1 : 1; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $agesorter_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcArray)); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | // hack, must make global as uksort() won't |
| 129 | 129 | // allow us to pass any other auxiliary information |
| 130 | 130 | uksort($agesorter_arr, 'agesorter_compare'); |
| 131 | - foreach($agesorter_arr as $key => $val) { |
|
| 131 | + foreach ($agesorter_arr as $key => $val) { |
|
| 132 | 132 | // recreate each struct element |
| 133 | 133 | $v[] = new Value( |
| 134 | 134 | array( |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $s = $req->getParam(0); |
| 154 | 154 | $t = $req->getParam(1); |
| 155 | 155 | |
| 156 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt)); |
|
| 156 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt)); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | $addtwodouble_sig = array(array(Value::$xmlrpcDouble, Value::$xmlrpcDouble, Value::$xmlrpcDouble)); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $s = $req->getParam(0); |
| 164 | 164 | $t = $req->getParam(1); |
| 165 | 165 | |
| 166 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble)); |
|
| 166 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble)); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $stringecho_sig = array(array(Value::$xmlrpcString, Value::$xmlrpcString)); |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | function echoBack($req) |
| 180 | 180 | { |
| 181 | 181 | // just sends back a string with what i got sent to me, just escaped, that's all |
| 182 | - $s = "I got the following message:\n" . $req->serialize(); |
|
| 182 | + $s = "I got the following message:\n".$req->serialize(); |
|
| 183 | 183 | |
| 184 | 184 | return new Response(new Value($s)); |
| 185 | 185 | } |
@@ -293,17 +293,17 @@ discard block |
||
| 293 | 293 | $err = "Error, no 'From' field specified"; |
| 294 | 294 | } |
| 295 | 295 | |
| 296 | - $msgHdr = "From: " . $mFrom->scalarval() . "\n"; |
|
| 297 | - $msgHdr .= "To: " . $mTo->scalarval() . "\n"; |
|
| 296 | + $msgHdr = "From: ".$mFrom->scalarval()."\n"; |
|
| 297 | + $msgHdr .= "To: ".$mTo->scalarval()."\n"; |
|
| 298 | 298 | |
| 299 | 299 | if ($mCc->scalarval() != "") { |
| 300 | - $msgHdr .= "Cc: " . $mCc->scalarval() . "\n"; |
|
| 300 | + $msgHdr .= "Cc: ".$mCc->scalarval()."\n"; |
|
| 301 | 301 | } |
| 302 | 302 | if ($mBcc->scalarval() != "") { |
| 303 | - $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n"; |
|
| 303 | + $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n"; |
|
| 304 | 304 | } |
| 305 | 305 | if ($mMime->scalarval() != "") { |
| 306 | - $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n"; |
|
| 306 | + $msgHdr .= "Content-type: ".$mMime->scalarval()."\n"; |
|
| 307 | 307 | } |
| 308 | 308 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
| 309 | 309 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $moe = $sno["moe"]; |
| 37 | 37 | $larry = $sno["larry"]; |
| 38 | 38 | $curly = $sno["curly"]; |
| 39 | - $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval(); |
|
| 39 | + $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval(); |
|
| 40 | 40 | |
| 41 | 41 | return new Response(new Value($num, Value::$xmlrpcInt)); |
| 42 | 42 | } |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | $ar = $req->getParam(0); |
| 79 | 79 | $sz = $ar->count(); |
| 80 | 80 | $first = $ar[0]; |
| 81 | - $last = $ar[$sz - 1]; |
|
| 81 | + $last = $ar[$sz-1]; |
|
| 82 | 82 | |
| 83 | - return new Response(new Value($first->scalarval() . |
|
| 83 | + return new Response(new Value($first->scalarval(). |
|
| 84 | 84 | $last->scalarval(), Value::$xmlrpcString)); |
| 85 | 85 | } |
| 86 | 86 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $larry = $fools["larry"]; |
| 115 | 115 | $moe = $fools["moe"]; |
| 116 | 116 | |
| 117 | - return new Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt)); |
|
| 117 | + return new Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt)); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | $v1_countTheEntities_sig = array(array(Value::$xmlrpcStruct, Value::$xmlrpcString)); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $ap = 0; |
| 129 | 129 | $qu = 0; |
| 130 | 130 | $amp = 0; |
| 131 | - for ($i = 0; $i < strlen($str); $i++) { |
|
| 131 | + for ($i = 0; $i<strlen($str); $i++) { |
|
| 132 | 132 | $c = substr($str, $i, 1); |
| 133 | 133 | switch ($c) { |
| 134 | 134 | case ">": |
@@ -27,11 +27,11 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | global $stateNames; |
| 29 | 29 | |
| 30 | - if (isset($stateNames[$stateNo - 1])) { |
|
| 31 | - return $stateNames[$stateNo - 1]; |
|
| 30 | + if (isset($stateNames[$stateNo-1])) { |
|
| 31 | + return $stateNames[$stateNo-1]; |
|
| 32 | 32 | } else { |
| 33 | 33 | // not, there so complain |
| 34 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
@@ -125,20 +125,20 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $findstate10_sig = array( |
| 127 | 127 | /// @todo add a demo/test with a closure |
| 128 | - "function" => function ($req) { return findState($req); }, |
|
| 128 | + "function" => function($req) { return findState($req); }, |
|
| 129 | 129 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 130 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 130 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 131 | 131 | 'index of that state name in an alphabetic order.', |
| 132 | 132 | ); |
| 133 | 133 | |
| 134 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 134 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 135 | 135 | |
| 136 | 136 | /// @todo do we really need a new instance ? |
| 137 | 137 | $c = new xmlrpcServerMethodsContainer(); |
| 138 | 138 | |
| 139 | 139 | $moreSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'tests.', 'method_type' => 'all')); |
| 140 | 140 | |
| 141 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 141 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 142 | 142 | |
| 143 | 143 | return array_merge( |
| 144 | 144 | array( |
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en"> |
|
| 1 | +<?php require_once __DIR__."/_prepend.php"; ?><html lang="en"> |
|
| 2 | 2 | <head><title>xmlrpc - Mail demo</title></head> |
| 3 | 3 | <body> |
| 4 | 4 | <h1>Mail demo</h1> |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | print "<font color=\"red\">"; |
| 35 | 35 | print "Mail send failed<br/>\n"; |
| 36 | 36 | print "Fault: "; |
| 37 | - print "Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 38 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"; |
|
| 37 | + print "Code: ".htmlspecialchars($resp->faultCode()). |
|
| 38 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"; |
|
| 39 | 39 | print "</font><br/>"; |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -53,4 +53,4 @@ discard block |
||
| 53 | 53 | <input type="Submit" value="Send"/> |
| 54 | 54 | </form> |
| 55 | 55 | </body> |
| 56 | -</html><?php require_once __DIR__ . "/_append.php"; ?> |
|
| 56 | +</html><?php require_once __DIR__."/_append.php"; ?> |
|
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<?php require_once __DIR__ . "/client/_prepend.php"; ?><html lang="en"> |
|
| 1 | +<?php require_once __DIR__."/client/_prepend.php"; ?><html lang="en"> |
|
| 2 | 2 | <head><title>xmlrpc</title></head> |
| 3 | 3 | <body> |
| 4 | 4 | <?php |
@@ -8,9 +8,9 @@ discard block |
||
| 8 | 8 | print "<h3>Testing value serialization</h3>\n"; |
| 9 | 9 | |
| 10 | 10 | $v = new PhpXmlRpc\Value(23, "int"); |
| 11 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 11 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 12 | 12 | $v = new PhpXmlRpc\Value("What are you saying? >> << &&"); |
| 13 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 13 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value( |
| 16 | 16 | array( |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | "array" |
| 22 | 22 | ); |
| 23 | 23 | |
| 24 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 24 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 25 | 25 | |
| 26 | 26 | $v = new PhpXmlRpc\Value( |
| 27 | 27 | array( |
@@ -49,11 +49,11 @@ discard block |
||
| 49 | 49 | "struct" |
| 50 | 50 | ); |
| 51 | 51 | |
| 52 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 52 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 53 | 53 | |
| 54 | 54 | $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array"); |
| 55 | 55 | |
| 56 | -print "<PRE>" . htmlentities($w->serialize()) . "</PRE>"; |
|
| 56 | +print "<PRE>".htmlentities($w->serialize())."</PRE>"; |
|
| 57 | 57 | |
| 58 | 58 | $w = new PhpXmlRpc\Value("Mary had a little lamb, |
| 59 | 59 | Whose fleece was white as snow, |
@@ -65,29 +65,29 @@ discard block |
||
| 65 | 65 | Ten thousand volts went down its back |
| 66 | 66 | And turned it into nylon", "base64" |
| 67 | 67 | ); |
| 68 | -print "<PRE>" . htmlentities($w->serialize()) . "</PRE>"; |
|
| 69 | -print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>"; |
|
| 68 | +print "<PRE>".htmlentities($w->serialize())."</PRE>"; |
|
| 69 | +print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>"; |
|
| 70 | 70 | |
| 71 | 71 | $req->method(''); |
| 72 | 72 | $req->addParam(new PhpXmlRpc\Value("41", "int")); |
| 73 | 73 | |
| 74 | 74 | print "<h3>Testing request serialization</h3>\n"; |
| 75 | 75 | $op = $req->serialize(); |
| 76 | -print "<PRE>" . htmlentities($op) . "</PRE>"; |
|
| 76 | +print "<PRE>".htmlentities($op)."</PRE>"; |
|
| 77 | 77 | |
| 78 | 78 | print "<h3>Testing ISO date format</h3><pre>\n"; |
| 79 | 79 | |
| 80 | 80 | $t = time(); |
| 81 | 81 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 82 | 82 | print "Now is $t --> $date\n"; |
| 83 | -print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"; |
|
| 83 | +print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"; |
|
| 84 | 84 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 85 | 85 | print "That is to say $date --> $tb\n"; |
| 86 | -print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"; |
|
| 87 | -print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($date, 1) . "\n"; |
|
| 86 | +print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"; |
|
| 87 | +print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($date, 1)."\n"; |
|
| 88 | 88 | |
| 89 | 89 | print "</pre>\n"; |
| 90 | 90 | |
| 91 | 91 | ?> |
| 92 | 92 | </body> |
| 93 | -</html><?php require_once __DIR__ . "/client/_append.php"; ?> |
|
| 93 | +</html><?php require_once __DIR__."/client/_append.php"; ?> |
|
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function echoInput() |
| 56 | 56 | { |
| 57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
| 57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
| 58 | 58 | print $r->serialize(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,11 +65,11 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function __get($name) |
| 67 | 67 | { |
| 68 | - switch($name) { |
|
| 68 | + switch ($name) { |
|
| 69 | 69 | case 'dmap': |
| 70 | 70 | return $this->dmap; |
| 71 | 71 | default: |
| 72 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . |
|
| 72 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '. |
|
| 73 | 73 | $trace[0]['line'], E_USER_NOTICE); |
| 74 | 74 | return null; |
| 75 | 75 | } |
@@ -96,30 +96,30 @@ discard block |
||
| 96 | 96 | Server::xmlrpc_debugmsg($m); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
| 99 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
| 100 | 100 | { |
| 101 | 101 | return Server::_xmlrpcs_getCapabilities($server, $m); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 105 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 106 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
| 107 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
| 104 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 105 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 106 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
| 107 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
| 108 | 108 | { |
| 109 | 109 | return Server::_xmlrpcs_listMethods($server, $m); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 113 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 114 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 112 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 113 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 114 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 115 | 115 | function _xmlrpcs_methodSignature($server, $m) |
| 116 | 116 | { |
| 117 | 117 | return Server::_xmlrpcs_methodSignature($server, $m); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 121 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 122 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
| 120 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 121 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 122 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
| 123 | 123 | function _xmlrpcs_methodHelp($server, $m) |
| 124 | 124 | { |
| 125 | 125 | return Server::_xmlrpcs_methodHelp($server, $m); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $val = reset($ar); |
| 108 | 108 | $typ = key($ar); |
| 109 | 109 | |
| 110 | - return '<value>' . $this->serializedata($typ, $val) . "</value>\n"; |
|
| 110 | + return '<value>'.$this->serializedata($typ, $val)."</value>\n"; |
|
| 111 | 111 | //} |
| 112 | 112 | } |
| 113 | 113 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // preserve back compatibility |
| 127 | 127 | |
| 128 | 128 | if (is_array($b)) { |
| 129 | - foreach($b as $id => $cont) { |
|
| 129 | + foreach ($b as $id => $cont) { |
|
| 130 | 130 | $b[$id] = $cont->scalarval(); |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | // add support for structures directly encoding php objects |
| 135 | 135 | if (is_object($b)) { |
| 136 | 136 | $t = get_object_vars($b); |
| 137 | - foreach($t as $id => $cont) { |
|
| 137 | + foreach ($t as $id => $cont) { |
|
| 138 | 138 | $t[$id] = $cont->scalarval(); |
| 139 | 139 | } |
| 140 | - foreach($t as $id => $cont) { |
|
| 140 | + foreach ($t as $id => $cont) { |
|
| 141 | 141 | @$b->$id = $cont; |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -179,17 +179,17 @@ discard block |
||
| 179 | 179 | /* Expose as global functions the ones which are now class methods */ |
| 180 | 180 | |
| 181 | 181 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 182 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 182 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 183 | 183 | { |
| 184 | 184 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | -function iso8601_encode($timeT, $utc=0) |
|
| 187 | +function iso8601_encode($timeT, $utc = 0) |
|
| 188 | 188 | { |
| 189 | 189 | return Date::iso8601Encode($timeT, $utc); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | -function iso8601_decode($iDate, $utc=0) |
|
| 192 | +function iso8601_decode($iDate, $utc = 0) |
|
| 193 | 193 | { |
| 194 | 194 | return Date::iso8601Decode($iDate, $utc); |
| 195 | 195 | } |
@@ -199,25 +199,25 @@ discard block |
||
| 199 | 199 | return Http::decodeChunked($buffer); |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 202 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 203 | 203 | { |
| 204 | 204 | $encoder = new Encoder(); |
| 205 | 205 | return $encoder->decode($xmlrpcVal, $options); |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 208 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 209 | 209 | { |
| 210 | 210 | $encoder = new Encoder(); |
| 211 | 211 | return $encoder->encode($phpVal, $options); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 214 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 215 | 215 | { |
| 216 | 216 | $encoder = new Encoder(); |
| 217 | 217 | return $encoder->decodeXml($xmlVal, $options); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 220 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 221 | 221 | { |
| 222 | 222 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 223 | 223 | } |