@@ -66,11 +66,12 @@ |
||
66 | 66 | $a = $req->getParam(0); |
67 | 67 | $b = $req->getParam(1); |
68 | 68 | |
69 | - if ($a->scalartyp() == Value::$xmlrpcNull) |
|
70 | - return new Response(new Value(plain_findstate($b->scalarval()))); |
|
71 | - else |
|
72 | - return new Response(new Value(plain_findstate($a->scalarval()))); |
|
73 | -} |
|
69 | + if ($a->scalartyp() == Value::$xmlrpcNull) { |
|
70 | + return new Response(new Value(plain_findstate($b->scalarval()))); |
|
71 | + } else { |
|
72 | + return new Response(new Value(plain_findstate($a->scalarval()))); |
|
73 | + } |
|
74 | + } |
|
74 | 75 | |
75 | 76 | return array( |
76 | 77 | "tests.getallheaders" => array( |
@@ -91,7 +91,7 @@ |
||
91 | 91 | |
92 | 92 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
93 | 93 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
94 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
94 | + "tests.utf8methodname.".'κόσμε' => array( |
|
95 | 95 | "function" => "exampleMethods::stringEcho", |
96 | 96 | "signature" => exampleMethods::$stringecho_sig, |
97 | 97 | "docstring" => exampleMethods::$stringecho_doc, |
@@ -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 - Which toolkit demo</title></head> |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | <methodName>interopEchoTests.whichToolkit</methodName> |
20 | 20 | <params/> |
21 | 21 | </methodCall>'; |
22 | -output("XML custom request:<br/><pre>" . htmlspecialchars($payload) . "</pre>\n"); |
|
22 | +output("XML custom request:<br/><pre>".htmlspecialchars($payload)."</pre>\n"); |
|
23 | 23 | |
24 | 24 | $client = new Client(XMLRPCSERVER); |
25 | 25 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | if (!$resp->faultCode()) { |
41 | 41 | |
42 | 42 | $xml = $resp->value(); |
43 | - output("XML response:<br/><pre>" . htmlspecialchars($xml) . "</pre>\n"); |
|
43 | + output("XML response:<br/><pre>".htmlspecialchars($xml)."</pre>\n"); |
|
44 | 44 | |
45 | 45 | $encoder = new Encoder(); |
46 | 46 | // from xml to xml-rpc Response |
@@ -52,14 +52,14 @@ discard block |
||
52 | 52 | |
53 | 53 | output("Toolkit info:<br/>\n"); |
54 | 54 | output("<pre>"); |
55 | - output("name: " . htmlspecialchars($value["toolkitName"]) . "\n"); |
|
56 | - output("version: " . htmlspecialchars($value["toolkitVersion"]) . "\n"); |
|
57 | - output("docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n"); |
|
58 | - output("os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n"); |
|
55 | + output("name: ".htmlspecialchars($value["toolkitName"])."\n"); |
|
56 | + output("version: ".htmlspecialchars($value["toolkitVersion"])."\n"); |
|
57 | + output("docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n"); |
|
58 | + output("os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n"); |
|
59 | 59 | output("</pre>"); |
60 | 60 | } else { |
61 | 61 | output("An error occurred: "); |
62 | - output("Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n"); |
|
62 | + output("Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n"); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | output("</body></html>\n"); |
@@ -1,5 +1,5 @@ |
||
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 - Proxy demo</title></head> |
@@ -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 - Agesort demo</title></head> |
@@ -17,21 +17,21 @@ discard block |
||
17 | 17 | |
18 | 18 | $inAr = array( |
19 | 19 | array('name' => 'Dave', 'age' => 24), |
20 | - array('name' => 'Edd', 'age' => 45), |
|
21 | - array('name' => 'Joe', 'age' => 37), |
|
20 | + array('name' => 'Edd', 'age' => 45), |
|
21 | + array('name' => 'Joe', 'age' => 37), |
|
22 | 22 | array('name' => 'Fred', 'age' => 27), |
23 | 23 | ); |
24 | 24 | |
25 | 25 | output('This is the input data:<br/><pre>'); |
26 | 26 | foreach ($inAr as $val) { |
27 | - output($val['name'] . ", " . $val['age'] . "\n"); |
|
27 | + output($val['name'].", ".$val['age']."\n"); |
|
28 | 28 | } |
29 | 29 | output('</pre>'); |
30 | 30 | |
31 | 31 | // Create xml-rpc parameters from the input array: an array of structs |
32 | 32 | $encoder = new Encoder(); |
33 | 33 | $v = $encoder->encode($inAr); |
34 | -output("Encoded into xml-rpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
34 | +output("Encoded into xml-rpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
35 | 35 | |
36 | 36 | // create client and request objects |
37 | 37 | $req = new Request('examples.sortByAge', array($v)); |
@@ -51,15 +51,15 @@ discard block |
||
51 | 51 | $value = $resp->value(); |
52 | 52 | foreach ($encoder->decode($value) as $struct) { |
53 | 53 | // note: here we are trusting the server's response to have the expected format |
54 | - output(htmlspecialchars($struct['name']) . ", " . htmlspecialchars($struct['age']) . "\n"); |
|
54 | + output(htmlspecialchars($struct['name']).", ".htmlspecialchars($struct['age'])."\n"); |
|
55 | 55 | } |
56 | 56 | |
57 | - output('</pre><hr/>For nerds: I got this value back<br/><pre>' . |
|
58 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
57 | + output('</pre><hr/>For nerds: I got this value back<br/><pre>'. |
|
58 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
59 | 59 | } else { |
60 | 60 | output('An error occurred:<pre>'); |
61 | - output('Code: ' . htmlspecialchars($resp->faultCode()) . |
|
62 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . "'</pre><hr/>"); |
|
61 | + output('Code: '.htmlspecialchars($resp->faultCode()). |
|
62 | + "\nReason: '".htmlspecialchars($resp->faultString())."'</pre><hr/>"); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | output("</body></html>\n"); |
@@ -26,7 +26,7 @@ |
||
26 | 26 | */ |
27 | 27 | function plain_findstate($stateNo) |
28 | 28 | { |
29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
29 | + if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
30 | 30 | return exampleMethods::$stateNames[$stateNo - 1]; |
31 | 31 | } else { |
32 | 32 | // not, there so complain |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | */ |
27 | 27 | function plain_findstate($stateNo) |
28 | 28 | { |
29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
30 | - return exampleMethods::$stateNames[$stateNo - 1]; |
|
29 | + if (isset(exampleMethods::$stateNames[$stateNo-1])) { |
|
30 | + return exampleMethods::$stateNames[$stateNo-1]; |
|
31 | 31 | } else { |
32 | 32 | // not, there so complain |
33 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
33 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | if ($req->getNumParams()) { |
70 | 70 | $p1 = $req->getParam(0); |
71 | 71 | if ($p1->kindOf() === 'scalar') { |
72 | - $errNum = (int)$p1->scalarval(); |
|
72 | + $errNum = (int) $p1->scalarval(); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | throw new Exception("it's just a test", $errNum); |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | |
142 | 142 | $findstate10_sig = array( |
143 | 143 | /// @todo add a demo and test with closure usage |
144 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
144 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
145 | 145 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
146 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
146 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
147 | 147 | 'index of that state name in an alphabetic order.', |
148 | 148 | ); |
149 | 149 | |
150 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
150 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
151 | 151 | |
152 | 152 | /// @todo do we really need a new instance ? |
153 | 153 | $c = new handlersContainer(); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
158 | 158 | |
159 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
159 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
160 | 160 | |
161 | 161 | return array_merge( |
162 | 162 | array( |
@@ -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 the code-generation capabilities of the library: create a client class which exposes a bunch of methods |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | ); |
22 | 22 | |
23 | 23 | // the generated code does not have an autoloader included - we need to add in one |
24 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
24 | +$autoloader = __DIR__."/_prepend.php"; |
|
25 | 25 | |
26 | 26 | $targetFile = '/tmp/MyClient.php'; |
27 | 27 | $generated = file_put_contents($targetFile, |
28 | - "<?php\n\n" . |
|
29 | - "require_once '$autoloader';\n\n" . |
|
28 | + "<?php\n\n". |
|
29 | + "require_once '$autoloader';\n\n". |
|
30 | 30 | $code['code'] |
31 | 31 | ); |
32 | 32 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $client = new MyClient(); |
47 | 47 | $sorted = $client->examples_sortByAge(array( |
48 | 48 | array('name' => 'Dave', 'age' => 24), |
49 | - array('name' => 'Edd', 'age' => 45), |
|
50 | - array('name' => 'Joe', 'age' => 37), |
|
49 | + array('name' => 'Edd', 'age' => 45), |
|
50 | + array('name' => 'Joe', 'age' => 37), |
|
51 | 51 | array('name' => 'Fred', 'age' => 27), |
52 | 52 | )); |
53 | 53 |
@@ -8,5 +8,5 @@ |
||
8 | 8 | } |
9 | 9 | |
10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
12 | 12 | PhpXmlRpc\Autoloader::register(); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | array(Value::$xmlrpcInt, Value::$xmlrpcArray) |
18 | 18 | ), |
19 | 19 | "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.', |
20 | - "function" => function ($req) |
|
20 | + "function" => function($req) |
|
21 | 21 | { |
22 | 22 | $sno = $req->getParam(0); |
23 | 23 | $numCurly = 0; |
@@ -38,13 +38,13 @@ discard block |
||
38 | 38 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
39 | 39 | ), |
40 | 40 | "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
41 | - "function" => function ($req) |
|
41 | + "function" => function($req) |
|
42 | 42 | { |
43 | 43 | $sno = $req->getParam(0); |
44 | 44 | $moe = $sno["moe"]; |
45 | 45 | $larry = $sno["larry"]; |
46 | 46 | $curly = $sno["curly"]; |
47 | - $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval(); |
|
47 | + $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval(); |
|
48 | 48 | |
49 | 49 | return new Response(new Value($num, Value::$xmlrpcInt)); |
50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | array(Value::$xmlrpcStruct, Value::$xmlrpcStruct) |
56 | 56 | ), |
57 | 57 | "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.', |
58 | - "function" => function ($req) |
|
58 | + "function" => function($req) |
|
59 | 59 | { |
60 | 60 | $sno = $req->getParam(0); |
61 | 61 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | ) |
72 | 72 | ), |
73 | 73 | "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.', |
74 | - "function" => function ($req) |
|
74 | + "function" => function($req) |
|
75 | 75 | { |
76 | 76 | return new Response(new Value( |
77 | 77 | array( |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | array(Value::$xmlrpcString, Value::$xmlrpcArray) |
93 | 93 | ), |
94 | 94 | "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.', |
95 | - "function" => function ($req) |
|
95 | + "function" => function($req) |
|
96 | 96 | { |
97 | 97 | $ar = $req->getParam(0); |
98 | 98 | $sz = $ar->count(); |
99 | 99 | $first = $ar[0]; |
100 | - $last = $ar[$sz - 1]; |
|
100 | + $last = $ar[$sz-1]; |
|
101 | 101 | |
102 | - return new Response(new Value($first->scalarval() . $last->scalarval(), Value::$xmlrpcString)); |
|
102 | + return new Response(new Value($first->scalarval().$last->scalarval(), Value::$xmlrpcString)); |
|
103 | 103 | } |
104 | 104 | ), |
105 | 105 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | array(Value::$xmlrpcStruct, Value::$xmlrpcInt) |
109 | 109 | ), |
110 | 110 | "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.', |
111 | - "function" => function ($req) |
|
111 | + "function" => function($req) |
|
112 | 112 | { |
113 | 113 | $sno = $req->getParam(0); |
114 | 114 | $v = $sno->scalarval(); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
130 | 130 | ), |
131 | 131 | "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
132 | - "function" => function ($req) |
|
132 | + "function" => function($req) |
|
133 | 133 | { |
134 | 134 | $sno = $req->getParam(0); |
135 | 135 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $larry = $fools["larry"]; |
141 | 141 | $moe = $fools["moe"]; |
142 | 142 | |
143 | - return new Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt)); |
|
143 | + return new Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt)); |
|
144 | 144 | } |
145 | 145 | ), |
146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | array(Value::$xmlrpcStruct, Value::$xmlrpcString) |
150 | 150 | ), |
151 | 151 | "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely <, >, & \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.', |
152 | - "function" => function ($req) |
|
152 | + "function" => function($req) |
|
153 | 153 | { |
154 | 154 | $sno = $req->getParam(0); |
155 | 155 | $str = $sno->scalarval(); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $ap = 0; |
159 | 159 | $qu = 0; |
160 | 160 | $amp = 0; |
161 | - for ($i = 0; $i < strlen($str); $i++) { |
|
161 | + for ($i = 0; $i<strlen($str); $i++) { |
|
162 | 162 | $c = substr($str, $i, 1); |
163 | 163 | switch ($c) { |
164 | 164 | case ">": |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | $snv = $sno->scalarval(); |
55 | 55 | |
56 | 56 | // look it up in our array (zero-based) |
57 | - if (isset(self::$stateNames[$snv - 1])) { |
|
58 | - $stateName = self::$stateNames[$snv - 1]; |
|
57 | + if (isset(self::$stateNames[$snv-1])) { |
|
58 | + $stateName = self::$stateNames[$snv-1]; |
|
59 | 59 | } else { |
60 | 60 | // not there, so complain |
61 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
61 | + $err = "I don't have a state for the index '".$snv."'"; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | if ($err != '') { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $s = $req->getParam(0); |
133 | 133 | $t = $req->getParam(1); |
134 | 134 | |
135 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt)); |
|
135 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt)); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | public static $addtwodouble_sig = array(array('double', 'double', 'double')); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $s = $req->getParam(0); |
143 | 143 | $t = $req->getParam(1); |
144 | 144 | |
145 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble)); |
|
145 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble)); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | public static $stringecho_sig = array(array('string', 'string')); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | /// In fact, we miss some API (or extra data) in the Request... |
166 | 166 | //$payload = file_get_contents('php://input'); |
167 | 167 | $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding); |
168 | - $s = "I got the following message:\n" . $payload; |
|
168 | + $s = "I got the following message:\n".$payload; |
|
169 | 169 | |
170 | 170 | return new Response(new Value($s)); |
171 | 171 | } |
@@ -238,17 +238,17 @@ discard block |
||
238 | 238 | |
239 | 239 | /// @todo in real life, we should check for presence of return characters to avoid header injection! |
240 | 240 | |
241 | - $msgHdr = "From: " . $mFrom->scalarval() . "\n"; |
|
242 | - $msgHdr .= "To: " . $mTo->scalarval() . "\n"; |
|
241 | + $msgHdr = "From: ".$mFrom->scalarval()."\n"; |
|
242 | + $msgHdr .= "To: ".$mTo->scalarval()."\n"; |
|
243 | 243 | |
244 | 244 | if ($mCc->scalarval() != "") { |
245 | - $msgHdr .= "Cc: " . $mCc->scalarval() . "\n"; |
|
245 | + $msgHdr .= "Cc: ".$mCc->scalarval()."\n"; |
|
246 | 246 | } |
247 | 247 | if ($mBcc->scalarval() != "") { |
248 | - $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n"; |
|
248 | + $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n"; |
|
249 | 249 | } |
250 | 250 | if ($mMime->scalarval() != "") { |
251 | - $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n"; |
|
251 | + $msgHdr .= "Content-type: ".$mMime->scalarval()."\n"; |
|
252 | 252 | } |
253 | 253 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
254 | 254 |