View GitHub Repository phpxmlrpc

Schedule Inspection
Subscribe
Passed
Push — master ( 578abb...374b4b )
by Gaetano
09:34
created
Status
Category
Toggle Patches
demo/client/introspect.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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 
                         }
Please login to merge, or discard this patch.
src/Traits/DeprecationLogger.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,7 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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 
 }
Please login to merge, or discard this patch.
src/Response.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78 
                 // user declares the type of resp value: we "almost" trust it... but log errors just in case
79 79 
                 if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) ||
80 80 
                     ($this->valtyp == 'xml' && (!is_string($this->val)))) {
81 
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType);
81 
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType);
82 82 
                 }
83 83 
             }
84 84 
         }
 
@@ -165,34 +165,34 @@  discard block
 
 block discarded – undo
165 165 
     public function serialize($charsetEncoding = '')
166 166 
     {
167 167 
         if ($charsetEncoding != '') {
168 
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
168 
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
169 169 
         } else {
170 170 
             $this->content_type = 'text/xml';
171 171 
         }
172 172
173 173 
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
174 
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
174 
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
175 175 
         } else {
176 176 
             $result = "<methodResponse>\n";
177 177 
         }
178 178 
         if ($this->errno) {
179 179 
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
180 
-            $result .= "<fault>\n" .
181 
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
182 
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
183 
-                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) .
180 
+            $result .= "<fault>\n".
181 
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
182 
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
183 
+                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding).
184 184 
                 "</string></value>\n</member>\n</struct>\n</value>\n</fault>";
185 185 
         } else {
186 186 
             if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) {
187 
-                $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>";
187 
+                $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>";
188 188 
             } else if (is_string($this->val) && $this->valtyp == 'xml') {
189 
-                $result .= "<params>\n<param>\n" .
190 
-                    $this->val .
189 
+                $result .= "<params>\n<param>\n".
190 
+                    $this->val.
191 191 
                     "</param>\n</params>";
192 192 
             } else if ($this->valtyp == 'phpvals') {
193 193 
                     $encoder = new Encoder();
194 194 
                     $val = $encoder->encode($this->val);
195 
-                    $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>";
195 
+                    $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>";
196 196 
             } else {
197 197 
                 throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values');
198 198 
             }
 
@@ -211,9 +211,9 @@  discard block
 
 block discarded – undo
211 211 
     public function xml_header($charsetEncoding = '')
212 212 
     {
213 213 
         if ($charsetEncoding != '') {
214 
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
214 
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
215 215 
         } else {
216 
-            return "<?xml version=\"1.0\"?" . ">\n";
216 
+            return "<?xml version=\"1.0\"?".">\n";
217 217 
         }
218 218 
     }
219 219 
 
@@ -229,21 +229,21 @@  discard block
 
 block discarded – undo
229 229 
             case 'errstr':
230 230 
             case 'payload':
231 231 
             case 'content_type':
232 
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
232 
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
233 233 
                 return $this->$name;
234 234 
             case 'hdrs':
235 
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
235 
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
236 236 
                 return $this->httpResponse['headers'];
237 237 
             case '_cookies':
238 
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
238 
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
239 239 
                 return $this->httpResponse['cookies'];
240 240 
             case 'raw_data':
241 
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
241 
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
242 242 
                 return $this->httpResponse['raw_data'];
243 243 
             default:
244 244 
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
245 245 
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
246 
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
246 
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
247 247 
                 $result = null;
248 248 
                 return $result;
249 249 
         }
 
@@ -258,25 +258,25 @@  discard block
 
 block discarded – undo
258 258 
             case 'errstr':
259 259 
             case 'payload':
260 260 
             case 'content_type':
261 
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
261 
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
262 262 
                 $this->$name = $value;
263 263 
                 break;
264 264 
             case 'hdrs':
265 
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
265 
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
266 266 
                 $this->httpResponse['headers'] = $value;
267 267 
                 break;
268 268 
             case '_cookies':
269 
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
269 
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
270 270 
                 $this->httpResponse['cookies'] = $value;
271 271 
                 break;
272 272 
             case 'raw_data':
273 
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
273 
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
274 274 
                 $this->httpResponse['raw_data'] = $value;
275 275 
                 break;
276 276 
             default:
277 277 
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
278 278 
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
279 
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
279 
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
280 280 
         }
281 281 
     }
282 282 
 
@@ -289,16 +289,16 @@  discard block
 
 block discarded – undo
289 289 
             case 'errstr':
290 290 
             case 'payload':
291 291 
             case 'content_type':
292 
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
292 
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
293 293 
                 return isset($this->$name);
294 294 
             case 'hdrs':
295 
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
295 
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
296 296 
                 return isset($this->httpResponse['headers']);
297 297 
             case '_cookies':
298 
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
298 
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
299 299 
                 return isset($this->httpResponse['cookies']);
300 300 
             case 'raw_data':
301 
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
301 
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
302 302 
                 return isset($this->httpResponse['raw_data']);
303 303 
             default:
304 304 
                 return false;
 
@@ -314,25 +314,25 @@  discard block
 
 block discarded – undo
314 314 
             case 'errstr':
315 315 
             case 'payload':
316 316 
             case 'content_type':
317 
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
317 
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
318 318 
                 unset($this->$name);
319 319 
                 break;
320 320 
             case 'hdrs':
321 
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
321 
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
322 322 
                 unset($this->httpResponse['headers']);
323 323 
                 break;
324 324 
             case '_cookies':
325 
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
325 
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
326 326 
                 unset($this->httpResponse['cookies']);
327 327 
                 break;
328 328 
             case 'raw_data':
329 
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
329 
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
330 330 
                 unset($this->httpResponse['raw_data']);
331 331 
                 break;
332 332 
             default:
333 333 
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
334 334 
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
335 
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
335 
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
336 336 
         }
337 337 
     }
338 338 
 }
Please login to merge, or discard this patch.
src/Encoder.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -57,13 +57,13 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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;
Please login to merge, or discard this patch.
demo/vardemo.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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>');
Please login to merge, or discard this patch.
demo/server/methodProviders/functions.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -54,11 +54,11 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
Please login to merge, or discard this patch.
demo/server/methodProviders/validator1.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -17,7 +17,7 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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 &lt;i4&gt;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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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 &lt;i4&gt;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
 
 block discarded – undo
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
 
 block discarded – undo
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 &lt;, &gt;, &amp; \' 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
 
 block discarded – undo
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 ">":
Please login to merge, or discard this patch.
demo/server/methodProviders/wrapper.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -26,11 +26,11 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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(
Please login to merge, or discard this patch.
extras/benchmark.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -19,9 +19,9 @@  discard block
 
 block discarded – undo
19 19 
 use PhpXmlRpc\Encoder;
20 20
21 21 
 /// @todo allow autoloading when the library is installed as dependency
22 
-include_once __DIR__ . '/../vendor/autoload.php';
22 
+include_once __DIR__.'/../vendor/autoload.php';
23 23
24 
-include __DIR__ . '/../tests/parse_args.php';
24 
+include __DIR__.'/../tests/parse_args.php';
25 25 
 $args = argParser::getArgs();
26 26
27 27 
 function begin_test($test_name, $test_case)
 
@@ -41,7 +41,7 @@  discard block
 
 block discarded – undo
41 41 
     if (!isset($test_results[$test_name][$test_case])) {
42 42 
         trigger_error('ending test that was not started');
43 43 
     }
44 
-    $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
44 
+    $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
45 45 
     $test_results[$test_name][$test_case]['result'] = $test_result;
46 46 
     echo '.';
47 47 
     flush();
 
@@ -75,24 +75,24 @@  discard block
 
 block discarded – undo
75 75 
 }
76 76
77 77 
 if ($is_web) {
78 
-    echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
78 
+    echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
79 79 
     if ($xd) {
80 
-        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
80 
+        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
81 81 
     }
82 82 
     flush();
83 83 
     ob_flush();
84 84 
 } else {
85 
-    echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
85 
+    echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
86 86 
     if ($xd) {
87 
-        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
87 
+        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
88 88 
     }
89 89 
 }
90 90
91 91 
 // test 'manual style' data encoding vs. 'automatic style' encoding
92 92 
 begin_test('Data encoding (large array)', 'manual encoding');
93 
-for ($i = 0; $i < $num_tests; $i++) {
93 
+for ($i = 0; $i<$num_tests; $i++) {
94 94 
     $vals = array();
95 
-    for ($j = 0; $j < 10; $j++) {
95 
+    for ($j = 0; $j<10; $j++) {
96 96 
         $valArray = array();
97 97 
         foreach ($data[$j] as $key => $val) {
98 98 
             $values = array();
 
@@ -117,7 +117,7 @@  discard block
 
 block discarded – undo
117 117
118 118 
 begin_test('Data encoding (large array)', 'automatic encoding');
119 119 
 $encoder = new Encoder();
120 
-for ($i = 0; $i < $num_tests; $i++) {
120 
+for ($i = 0; $i<$num_tests; $i++) {
121 121 
     $value = $encoder->encode($data, array('auto_dates'));
122 122 
     $out = $value->serialize();
123 123 
 }
 
@@ -125,8 +125,8 @@  discard block
 
 block discarded – undo
125 125
126 126 
 if (function_exists('xmlrpc_set_type')) {
127 127 
     begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
128 
-    for ($i = 0; $i < $num_tests; $i++) {
129 
-        for ($j = 0; $j < 10; $j++) {
128 
+    for ($i = 0; $i<$num_tests; $i++) {
129 
+        for ($j = 0; $j<10; $j++) {
130 130 
             foreach ($keys as $k) {
131 131 
                 xmlrpc_set_type($data[$j][$k][4], 'datetime');
132 132 
                 xmlrpc_set_type($data[$j][$k][8], 'datetime');
 
@@ -140,18 +140,18 @@  discard block
 
 block discarded – undo
140 140 
 // test 'old style' data decoding vs. 'automatic style' decoding
141 141 
 $dummy = new Request('');
142 142 
 $out = new Response($value);
143 
-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
143 
+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
144 144
145 145 
 begin_test('Data decoding (large array)', 'manual decoding');
146 
-for ($i = 0; $i < $num_tests; $i++) {
146 
+for ($i = 0; $i<$num_tests; $i++) {
147 147 
     $response = $dummy->ParseResponse($in, true);
148 148 
     $value = $response->value();
149 149 
     $result = array();
150 
-    foreach($value as $val1) {
150 
+    foreach ($value as $val1) {
151 151 
         $out = array();
152 
-        foreach($val1 as $name => $val) {
152 
+        foreach ($val1 as $name => $val) {
153 153 
             $out[$name] = array();
154 
-            foreach($val as $data) {
154 
+            foreach ($val as $data) {
155 155 
                 $out[$name][] = $data->scalarVal();
156 156 
             }
157 157 
         }
 
@@ -161,18 +161,18 @@  discard block
 
 block discarded – undo
161 161 
 end_test('Data decoding (large array)', 'manual decoding', $result);
162 162
163 163 
 begin_test('Data decoding (large array)', 'manual decoding deprecated');
164 
-for ($i = 0; $i < $num_tests; $i++) {
164 
+for ($i = 0; $i<$num_tests; $i++) {
165 165 
     $response = $dummy->ParseResponse($in, true);
166 166 
     $value = $response->value();
167 167 
     $result = array();
168 168 
     $l = $value->arraySize();
169 
-    for ($k = 0; $k < $l; $k++) {
169 
+    for ($k = 0; $k<$l; $k++) {
170 170 
         $val1 = $value->arrayMem($k);
171 171 
         $out = array();
172 
-        foreach($val1 as $name => $val) {
172 
+        foreach ($val1 as $name => $val) {
173 173 
             $out[$name] = array();
174 174 
             $m = $val->arraySize();
175 
-            for ($j = 0; $j < $m; $j++) {
175 
+            for ($j = 0; $j<$m; $j++) {
176 176 
                 $data = $val->arrayMem($j);
177 177 
                 $out[$name][] = $data->scalarVal();
178 178 
             }
 
@@ -183,7 +183,7 @@  discard block
 
 block discarded – undo
183 183 
 end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
184 184
185 185 
 begin_test('Data decoding (large array)', 'automatic decoding');
186 
-for ($i = 0; $i < $num_tests; $i++) {
186 
+for ($i = 0; $i<$num_tests; $i++) {
187 187 
     $response = $dummy->parseResponse($in, true, 'phpvals');
188 188 
     $value = $response->value();
189 189 
 }
 
@@ -191,7 +191,7 @@  discard block
 
 block discarded – undo
191 191
192 192 
 if (function_exists('xmlrpc_decode')) {
193 193 
     begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
194 
-    for ($i = 0; $i < $num_tests; $i++) {
194 
+    for ($i = 0; $i<$num_tests; $i++) {
195 195 
         $response = $dummy->parseResponse($in, true, 'xml');
196 196 
         $value = xmlrpc_decode($response->value());
197 197 
     }
 
@@ -208,16 +208,16 @@  discard block
 
 block discarded – undo
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
215 215 
     $server = explode(':', $args['HTTPSERVER']);
216 
-    if (count($server) > 1) {
217 
-        $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI'];
216 
+    if (count($server)>1) {
217 
+        $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI'];
218 218 
         $c = new Client($args['HTTPURI'], $server[0], $server[1]);
219 219 
     } else {
220 
-        $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI'];
220 
+        $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI'];
221 221 
         $c = new Client($args['HTTPURI'], $args['HTTPSERVER']);
222 222 
     }
223 223 
 
@@ -229,7 +229,7 @@  discard block
 
 block discarded – undo
229 229
230 230 
     begin_test($testName, 'http 10');
231 231 
     $response = array();
232 
-    for ($i = 0; $i < $num_tests; $i++) {
232 
+    for ($i = 0; $i<$num_tests; $i++) {
233 233 
         $resp = $c->send($req);
234 234 
         $response[] = $resp->value();
235 235 
     }
 
@@ -239,7 +239,7 @@  discard block
 
 block discarded – undo
239 239 
         $c->setOption(Client::OPT_KEEPALIVE, false);
240 240 
         begin_test($testName, 'http 11 no keepalive');
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 
         }
 
@@ -247,7 +247,7 @@  discard block
 
 block discarded – undo
247 247
248 248 
         begin_test($testName, 'http 11 w. keep-alive');
249 249 
         $response = array();
250 
-        for ($i = 0; $i < $num_tests; $i++) {
250 
+        for ($i = 0; $i<$num_tests; $i++) {
251 251 
             $resp = $c->send($req, 10, 'http11');
252 252 
             $response[] = $resp->value();
253 253 
         }
 
@@ -269,7 +269,7 @@  discard block
 
 block discarded – undo
269 269
270 270 
         begin_test($testName, 'http 10 w. compression');
271 271 
         $response = array();
272 
-        for ($i = 0; $i < $num_tests; $i++) {
272 
+        for ($i = 0; $i<$num_tests; $i++) {
273 273 
             $resp = $c->send($req);
274 274 
             $response[] = $resp->value();
275 275 
         }
 
@@ -279,7 +279,7 @@  discard block
 
 block discarded – undo
279 279 
             $c->setOption(Client::OPT_KEEPALIVE, false);
280 280 
             begin_test($testName, 'http 11 w. compression and no keepalive');
281 281 
             $response = array();
282 
-            for ($i = 0; $i < $num_tests; $i++) {
282 
+            for ($i = 0; $i<$num_tests; $i++) {
283 283 
                 $resp = $c->send($req, 10, 'http11');
284 284 
                 $response[] = $resp->value();
285 285 
             }
 
@@ -288,7 +288,7 @@  discard block
 
 block discarded – undo
288 288 
             $c->setOption(Client::OPT_KEEPALIVE, true);
289 289 
             begin_test($testName, 'http 11 w. keep-alive and compression');
290 290 
             $response = array();
291 
-            for ($i = 0; $i < $num_tests; $i++) {
291 
+            for ($i = 0; $i<$num_tests; $i++) {
292 292 
                 $resp = $c->send($req, 10, 'http11');
293 293 
                 $response[] = $resp->value();
294 294 
             }
 
@@ -309,11 +309,11 @@  discard block
 
 block discarded – undo
309 309 
         /// test multicall vs. many calls vs. keep-alives - HTTPS
310 310
311 311 
         $server = explode(':', $args['HTTPSSERVER']);
312 
-        if (count($server) > 1) {
313 
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
312 
+        if (count($server)>1) {
313 
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
314 314 
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
315 315 
         } else {
316 
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
316 
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
317 317 
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https');
318 318 
         }
319 319 
         $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']);
 
@@ -327,7 +327,7 @@  discard block
 
 block discarded – undo
327 327 
         $c->setOption(Client::OPT_KEEPALIVE, false);
328 328 
         begin_test($testName, 'https no keep-alive');
329 329 
         $response = array();
330 
-        for ($i = 0; $i < $num_tests; $i++) {
330 
+        for ($i = 0; $i<$num_tests; $i++) {
331 331 
             $resp = $c->send($req);
332 332 
             $response[] = $resp->value();
333 333 
         }
 
@@ -336,7 +336,7 @@  discard block
 
 block discarded – undo
336 336 
         $c->setOption(Client::OPT_KEEPALIVE, true);
337 337 
         begin_test($testName, 'https w. keep-alive');
338 338 
         $response = array();
339 
-        for ($i = 0; $i < $num_tests; $i++) {
339 
+        for ($i = 0; $i<$num_tests; $i++) {
340 340 
             $resp = $c->send($req, 10);
341 341 
             $response[] = $resp->value();
342 342 
         }
 
@@ -357,7 +357,7 @@  discard block
 
 block discarded – undo
357 357 
             $c->setOption(Client::OPT_KEEPALIVE, false);
358 358 
             begin_test($testName, 'https w. compression and no keepalive');
359 359 
             $response = array();
360 
-            for ($i = 0; $i < $num_tests; $i++) {
360 
+            for ($i = 0; $i<$num_tests; $i++) {
361 361 
                 $resp = $c->send($req);
362 362 
                 $response[] = $resp->value();
363 363 
             }
 
@@ -366,7 +366,7 @@  discard block
 
 block discarded – undo
366 366 
             $c->setOption(Client::OPT_KEEPALIVE, true);
367 367 
             begin_test($testName, 'https w. keep-alive and compression');
368 368 
             $response = array();
369 
-            for ($i = 0; $i < $num_tests; $i++) {
369 
+            for ($i = 0; $i<$num_tests; $i++) {
370 370 
                 $resp = $c->send($req, 10);
371 371 
                 $response[] = $resp->value();
372 372 
             }
 
@@ -387,11 +387,11 @@  discard block
 
 block discarded – undo
387 387 
         /// test multicall vs. many calls vs. keep-alives - HTTP/2
388 388
389 389 
         $server = explode(':', $args['HTTPSSERVER']);
390 
-        if (count($server) > 1) {
391 
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
390 
+        if (count($server)>1) {
391 
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
392 392 
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
393 393 
         } else {
394 
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
394 
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
395 395 
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2');
396 396 
         }
397 397 
         $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']);
 
@@ -405,7 +405,7 @@  discard block
 
 block discarded – undo
405 405 
         $c->setOption(Client::OPT_KEEPALIVE, false);
406 406 
         begin_test($testName, 'http2 no keep-alive');
407 407 
         $response = array();
408 
-        for ($i = 0; $i < $num_tests; $i++) {
408 
+        for ($i = 0; $i<$num_tests; $i++) {
409 409 
             $resp = $c->send($req);
410 410 
             $response[] = $resp->value();
411 411 
         }
 
@@ -414,7 +414,7 @@  discard block
 
 block discarded – undo
414 414 
         $c->setOption(Client::OPT_KEEPALIVE, true);
415 415 
         begin_test($testName, 'http2 w. keep-alive');
416 416 
         $response = array();
417 
-        for ($i = 0; $i < $num_tests; $i++) {
417 
+        for ($i = 0; $i<$num_tests; $i++) {
418 418 
             $resp = $c->send($req, 10);
419 419 
             $response[] = $resp->value();
420 420 
         }
 
@@ -435,7 +435,7 @@  discard block
 
 block discarded – undo
435 435 
             $c->setOption(Client::OPT_KEEPALIVE, false);
436 436 
             begin_test($testName, 'http2 w. compression and no keepalive');
437 437 
             $response = array();
438 
-            for ($i = 0; $i < $num_tests; $i++) {
438 
+            for ($i = 0; $i<$num_tests; $i++) {
439 439 
                 $resp = $c->send($req);
440 440 
                 $response[] = $resp->value();
441 441 
             }
 
@@ -444,7 +444,7 @@  discard block
 
 block discarded – undo
444 444 
             $c->setOption(Client::OPT_KEEPALIVE, true);
445 445 
             begin_test($testName, 'http2 w. keep-alive and compression');
446 446 
             $response = array();
447 
-            for ($i = 0; $i < $num_tests; $i++) {
447 
+            for ($i = 0; $i<$num_tests; $i++) {
448 448 
                 $resp = $c->send($req, 10);
449 449 
                 $response[] = $resp->value();
450 450 
             }
 
@@ -466,7 +466,7 @@  discard block
 
 block discarded – undo
466 466 
 foreach ($test_results as $test => $results) {
467 467 
     echo "\nTEST: $test\n";
468 468 
     foreach ($results as $case => $data) {
469 
-        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
469 
+        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
470 470 
     }
471 471 
 }
472 472
Please login to merge, or discard this patch.