Passed
Push — master ( 37c162...149546 )
by Gaetano
09:04
created
src/Request.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
             return true;
86 86
         } else {
87
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
87
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
88 88
             return false;
89 89
         }
90 90
     }
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
         $this->logDeprecationUnlessCalledBy('serialize');
135 135
 
136 136
         if ($charsetEncoding != '') {
137
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
137
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
138 138
         } else {
139 139
             $this->content_type = 'text/xml';
140 140
         }
141 141
 
142 142
         $result = $this->xml_header($charsetEncoding);
143
-        $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
144
-                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
143
+        $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
144
+                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
145 145
         $result .= "<params>\n";
146 146
         foreach ($this->params as $p) {
147
-            $result .= "<param>\n" . $p->serialize($charsetEncoding) .
147
+            $result .= "<param>\n".$p->serialize($charsetEncoding).
148 148
                 "</param>\n";
149 149
         }
150 150
         $result .= "</params>\n";
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
         $this->logDeprecationUnlessCalledBy('createPayload');
165 165
 
166 166
         if ($charsetEncoding != '') {
167
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
167
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
168 168
         } else {
169
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
169
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
170 170
         }
171 171
     }
172 172
 
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
228 228
      */
229 229
     public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
230 230
     {
231
-        if ($this->debug > 0) {
231
+        if ($this->debug>0) {
232 232
             $this->getLogger()->debug("---GOT---\n$data\n---END---");
233 233
         }
234 234
 
235 235
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
236 236
 
237 237
         if ($data == '') {
238
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
238
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
239 239
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
240 240
         }
241 241
 
@@ -243,12 +243,12 @@  discard block
 block discarded – undo
243 243
         if (substr($data, 0, 4) == 'HTTP') {
244 244
             $httpParser = new Http();
245 245
             try {
246
-                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
246
+                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
247 247
             } catch (HttpException $e) {
248 248
                 // failed processing of HTTP response headers
249 249
                 // save into response obj the full payload received, for debugging
250 250
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
251
-            } catch(\Exception $e) {
251
+            } catch (\Exception $e) {
252 252
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
253 253
             }
254 254
         } else {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
265 265
         $pos = strrpos($data, '</methodResponse>');
266 266
         if ($pos !== false) {
267
-            $data = substr($data, 0, $pos + 17);
267
+            $data = substr($data, 0, $pos+17);
268 268
         }
269 269
 
270 270
         // try to 'guestimate' the character encoding of the received response
@@ -273,21 +273,21 @@  discard block
 block discarded – undo
273 273
             $data
274 274
         );
275 275
 
276
-        if ($this->debug >= 0) {
276
+        if ($this->debug>=0) {
277 277
             $this->httpResponse = $httpResponse;
278 278
         } else {
279 279
             $httpResponse = null;
280 280
         }
281 281
 
282
-        if ($this->debug > 0) {
282
+        if ($this->debug>0) {
283 283
             $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
284 284
             if ($start) {
285 285
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
286 286
                 /// @todo what if there is no end tag?
287 287
                 $end = strpos($data, '-->', $start);
288
-                $comments = substr($data, $start, $end - $start);
289
-                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" .
290
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
288
+                $comments = substr($data, $start, $end-$start);
289
+                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t".
290
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
291 291
             }
292 292
         }
293 293
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
                     if ($respEncoding == 'ISO-8859-1') {
310 310
                         $data = utf8_encode($data);
311 311
                     } else {
312
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
312
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
313 313
                     }
314 314
                 }
315 315
             }
@@ -336,16 +336,16 @@  discard block
 block discarded – undo
336 336
             //    there could be proxies meddling with the request, or network data corruption...
337 337
 
338 338
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
339
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
339
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse);
340 340
 
341
-            if ($this->debug > 0) {
341
+            if ($this->debug>0) {
342 342
                 $this->getLogger()->debug($_xh['isf_reason']);
343 343
             }
344 344
         }
345 345
         // second error check: xml well-formed but not xml-rpc compliant
346 346
         elseif ($_xh['isf'] == 2) {
347 347
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
348
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
348
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse);
349 349
 
350 350
             /// @todo echo something for the user? check if it was already done by the parser...
351 351
             //if ($this->debug > 0) {
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
         }
355 355
         // third error check: parsing of the response has somehow gone boink.
356 356
         /// @todo shall we omit this check, since we trust the parsing code?
357
-        elseif ($_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
357
+        elseif ($_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
358 358
             // something odd has happened and it's time to generate a client side error indicating something odd went on
359 359
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
360 360
                 '', $httpResponse
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 
363 363
             /// @todo echo something for the user?
364 364
         } else {
365
-            if ($this->debug > 1) {
365
+            if ($this->debug>1) {
366 366
                 $this->getLogger()->debug(
367 367
                     "---PARSED---\n".var_export($_xh['value'], true)."\n---END---"
368 368
                 );
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
                 if ($errNo == 0) {
387 387
                     // FAULT returned, errno needs to reflect that
388 388
                     /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
389
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
389
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
390 390
                     $errNo = -1;
391 391
                 }
392 392
 
@@ -432,12 +432,12 @@  discard block
 block discarded – undo
432 432
             case '_php_class':
433 433
             case 'payload':
434 434
             case 'content_type':
435
-                $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
435
+                $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
436 436
                 return $this->$name;
437 437
             default:
438 438
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
439 439
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
440
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
440
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
441 441
                 $result = null;
442 442
                 return $result;
443 443
         }
@@ -451,13 +451,13 @@  discard block
 block discarded – undo
451 451
             case 'debug':
452 452
             case 'payload':
453 453
             case 'content_type':
454
-                $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
454
+                $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
455 455
                 $this->$name = $value;
456 456
                 break;
457 457
             default:
458 458
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
459 459
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
460
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
460
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
461 461
         }
462 462
     }
463 463
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
             case 'debug':
470 470
             case 'payload':
471 471
             case 'content_type':
472
-                $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
472
+                $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
473 473
                 return isset($this->$name);
474 474
             default:
475 475
                 return false;
@@ -484,13 +484,13 @@  discard block
 block discarded – undo
484 484
             case 'debug':
485 485
             case 'payload':
486 486
             case 'content_type':
487
-                $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
487
+                $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
488 488
                 unset($this->$name);
489 489
                 break;
490 490
             default:
491 491
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
492 492
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
493
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
493
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
494 494
         }
495 495
     }
496 496
 }
Please login to merge, or discard this patch.
lib/xmlrpcs.inc 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
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,7 +65,7 @@  discard block
 block discarded – undo
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:
@@ -96,30 +96,30 @@  discard block
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/Server.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -463,7 +463,7 @@
 block discarded – undo
463 463
     public function addToMap($methodName, $function, $sig = null, $doc = false, $sigDoc = false, $parametersType = false,
464 464
         $exceptionHandling = false)
465 465
     {
466
-       return $this->addToMap($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling);
466
+        return $this->addToMap($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling);
467 467
     }
468 468
 
469 469
     /**
Please login to merge, or discard this patch.
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
     public function getOptions()
249 249
     {
250 250
         $values = array();
251
-        foreach(static::$options as $opt) {
251
+        foreach (static::$options as $opt) {
252 252
             $values[$opt] = $this->getOption($opt);
253 253
         }
254 254
         return $values;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
      */
262 262
     public function setOptions($options)
263 263
     {
264
-        foreach($options as $name => $value) {
264
+        foreach ($options as $name => $value) {
265 265
             $this->setOption($name, $value);
266 266
         }
267 267
 
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
      */
300 300
     public static function xmlrpc_debugmsg($msg)
301 301
     {
302
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
302
+        static::$_xmlrpc_debuginfo .= $msg."\n";
303 303
     }
304 304
 
305 305
     /**
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
      */
312 312
     public static function error_occurred($msg)
313 313
     {
314
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
314
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
315 315
     }
316 316
 
317 317
     /**
@@ -332,10 +332,10 @@  discard block
 block discarded – undo
332 332
         // user debug info should be encoded by the end user using the INTERNAL_ENCODING
333 333
         $out = '';
334 334
         if ($this->debug_info != '') {
335
-            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
335
+            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
336 336
         }
337 337
         if (static::$_xmlrpc_debuginfo != '') {
338
-            $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
338
+            $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
339 339
             // NB: a better solution MIGHT be to use CDATA, but we need to insert it
340 340
             // into return payload AFTER the beginning tag
341 341
             //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
@@ -364,8 +364,8 @@  discard block
 block discarded – undo
364 364
         $this->debug_info = '';
365 365
 
366 366
         // Save what we received, before parsing it
367
-        if ($this->debug > 1) {
368
-            $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++");
367
+        if ($this->debug>1) {
368
+            $this->debugMsg("+++GOT+++\n".$data."\n+++END+++");
369 369
         }
370 370
 
371 371
         $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -382,13 +382,13 @@  discard block
 block discarded – undo
382 382
             $resp->raw_data = $rawData;
383 383
         }
384 384
 
385
-        if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
386
-            $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
387
-                static::$_xmlrpcs_occurred_errors . "+++END+++");
385
+        if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
386
+            $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
387
+                static::$_xmlrpcs_occurred_errors."+++END+++");
388 388
         }
389 389
 
390 390
         $header = $resp->xml_header($respCharset);
391
-        if ($this->debug > 0) {
391
+        if ($this->debug>0) {
392 392
             $header .= $this->serializeDebug($respCharset);
393 393
         }
394 394
 
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
         if (empty($payload)) {
400 400
             $payload = $resp->serialize($respCharset);
401 401
         }
402
-        $payload = $header . $payload;
402
+        $payload = $header.$payload;
403 403
 
404 404
         if ($returnPayload) {
405 405
             return $payload;
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
         // if we get a warning/error that has output some text before here, then we cannot
409 409
         // add a new header. We cannot say we are sending xml, either...
410 410
         if (!headers_sent()) {
411
-            header('Content-Type: ' . $resp->getContentType());
411
+            header('Content-Type: '.$resp->getContentType());
412 412
             // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
413 413
             header("Vary: Accept-Charset");
414 414
 
@@ -431,10 +431,10 @@  discard block
 block discarded – undo
431 431
             // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
432 432
             // responses up to 8000 bytes
433 433
             if ($phpNoSelfCompress) {
434
-                header('Content-Length: ' . (int)strlen($payload));
434
+                header('Content-Length: '.(int) strlen($payload));
435 435
             }
436 436
         } else {
437
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
437
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
438 438
         }
439 439
 
440 440
         print $payload;
@@ -523,9 +523,9 @@  discard block
 block discarded – undo
523 523
             $numParams = count($in);
524 524
         }
525 525
         foreach ($sigs as $curSig) {
526
-            if (count($curSig) == $numParams + 1) {
526
+            if (count($curSig) == $numParams+1) {
527 527
                 $itsOK = 1;
528
-                for ($n = 0; $n < $numParams; $n++) {
528
+                for ($n = 0; $n<$numParams; $n++) {
529 529
                     if (is_object($in)) {
530 530
                         $p = $in->getParam($n);
531 531
                         if ($p->kindOf() == 'scalar') {
@@ -538,10 +538,10 @@  discard block
 block discarded – undo
538 538
                     }
539 539
 
540 540
                     // param index is $n+1, as first member of sig is return type
541
-                    if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
541
+                    if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
542 542
                         $itsOK = 0;
543
-                        $pno = $n + 1;
544
-                        $wanted = $curSig[$n + 1];
543
+                        $pno = $n+1;
544
+                        $wanted = $curSig[$n+1];
545 545
                         $got = $pt;
546 546
                         break;
547 547
                     }
@@ -568,10 +568,10 @@  discard block
 block discarded – undo
568 568
         // check if $_SERVER is populated: it might have been disabled via ini file
569 569
         // (this is true even when in CLI mode)
570 570
         if (count($_SERVER) == 0) {
571
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
571
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
572 572
         }
573 573
 
574
-        if ($this->debug > 1) {
574
+        if ($this->debug>1) {
575 575
             if (function_exists('getallheaders')) {
576 576
                 $this->debugMsg(''); // empty line
577 577
                 foreach (getallheaders() as $name => $val) {
@@ -596,13 +596,13 @@  discard block
 block discarded – undo
596 596
                 if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
597 597
                     if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
598 598
                         $data = $degzdata;
599
-                        if ($this->debug > 1) {
600
-                            $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
599
+                        if ($this->debug>1) {
600
+                            $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
601 601
                         }
602 602
                     } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
603 603
                         $data = $degzdata;
604
-                        if ($this->debug > 1) {
605
-                            $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
604
+                        if ($this->debug>1) {
605
+                            $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
606 606
                         }
607 607
                     } else {
608 608
                         $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
                     if ($reqEncoding == 'ISO-8859-1') {
690 690
                         $data = utf8_encode($data);
691 691
                     } else {
692
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding);
692
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding);
693 693
                     }
694 694
                 }
695 695
             }
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
             preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches);
718 718
             return new Response(
719 719
                 0,
720
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
720
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
721 721
                 $_xh['isf_reason']);
722 722
         } elseif ($_xh['isf']) {
723 723
             /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs.
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
             return new Response(
726 726
                 0,
727 727
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
728
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']);
728
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']);
729 729
         } else {
730 730
             // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle
731 731
             // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals)
@@ -735,20 +735,20 @@  discard block
 block discarded – undo
735 735
                     ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals')
736 736
                 )
737 737
             ) {
738
-                if ($this->debug > 1) {
739
-                    $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++");
738
+                if ($this->debug>1) {
739
+                    $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++");
740 740
                 }
741 741
 
742 742
                 return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']);
743 743
             } else {
744 744
                 // build a Request object with data parsed from xml and add parameters in
745 745
                 $req = new Request($_xh['method']);
746
-                for ($i = 0; $i < count($_xh['params']); $i++) {
746
+                for ($i = 0; $i<count($_xh['params']); $i++) {
747 747
                     $req->addParam($_xh['params'][$i]);
748 748
                 }
749 749
 
750
-                if ($this->debug > 1) {
751
-                    $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
750
+                if ($this->debug>1) {
751
+                    $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
752 752
                 }
753 753
 
754 754
                 return $this->execute($req);
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
                 return new Response(
799 799
                     0,
800 800
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
801
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
801
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
802 802
                 );
803 803
             }
804 804
         }
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
         // build string representation of function 'name'
814 814
         if (is_array($func)) {
815 815
             if (is_object($func[0])) {
816
-                $funcName = get_class($func[0]) . '->' . $func[1];
816
+                $funcName = get_class($func[0]).'->'.$func[1];
817 817
             } else {
818 818
                 $funcName = implode('::', $func);
819 819
             }
@@ -825,23 +825,23 @@  discard block
 block discarded – undo
825 825
 
826 826
         // verify that function to be invoked is in fact callable
827 827
         if (!is_callable($func)) {
828
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
828
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
829 829
             return new Response(
830 830
                 0,
831 831
                 PhpXmlRpc::$xmlrpcerr['server_error'],
832
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
832
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
833 833
             );
834 834
         }
835 835
 
836 836
         if (isset($dmap[$methodName]['exception_handling'])) {
837
-            $exception_handling = (int)$dmap[$methodName]['exception_handling'];
837
+            $exception_handling = (int) $dmap[$methodName]['exception_handling'];
838 838
         } else {
839 839
             $exception_handling = $this->exception_handling;
840 840
         }
841 841
 
842 842
         // If debug level is 3, we should catch all errors generated during processing of user function, and log them
843 843
         // as part of response
844
-        if ($this->debug > 2) {
844
+        if ($this->debug>2) {
845 845
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
846 846
         }
847 847
 
@@ -855,14 +855,14 @@  discard block
 block discarded – undo
855 855
                     $r = call_user_func($func, $req);
856 856
                 }
857 857
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
858
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
858
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
859 859
                     if (is_a($r, 'PhpXmlRpc\Value')) {
860 860
                         $r = new Response($r);
861 861
                     } else {
862 862
                         $r = new Response(
863 863
                             0,
864 864
                             PhpXmlRpc::$xmlrpcerr['server_error'],
865
-                            PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
865
+                            PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
866 866
                         );
867 867
                     }
868 868
                 }
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
877 877
                         $r = call_user_func_array($func, array($methodName, $params, $this->user_data));
878 878
                         // mimic EPI behaviour: if we get an array that looks like an error, make it an error response
879 879
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
880
-                            $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
880
+                            $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
881 881
                         } else {
882 882
                             // functions using EPI api should NOT return resp objects, so make sure we encode the
883 883
                             // return type correctly
@@ -902,7 +902,7 @@  discard block
 block discarded – undo
902 902
             // proper error-response
903 903
             switch ($exception_handling) {
904 904
                 case 2:
905
-                    if ($this->debug > 2) {
905
+                    if ($this->debug>2) {
906 906
                         if (self::$_xmlrpcs_prev_ehandler) {
907 907
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
908 908
                         } else {
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
             // proper error-response
926 926
             switch ($exception_handling) {
927 927
                 case 2:
928
-                    if ($this->debug > 2) {
928
+                    if ($this->debug>2) {
929 929
                         if (self::$_xmlrpcs_prev_ehandler) {
930 930
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
931 931
                         } else {
@@ -945,7 +945,7 @@  discard block
 block discarded – undo
945 945
             }
946 946
         }
947 947
 
948
-        if ($this->debug > 2) {
948
+        if ($this->debug>2) {
949 949
             // note: restore the error handler we found before calling the user func, even if it has been changed
950 950
             // inside the func itself
951 951
             if (self::$_xmlrpcs_prev_ehandler) {
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
      */
1012 1012
     protected function debugMsg($string)
1013 1013
     {
1014
-        $this->debug_info .= $string . "\n";
1014
+        $this->debug_info .= $string."\n";
1015 1015
     }
1016 1016
 
1017 1017
     /**
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
                 $i++; // for error message, we count params from 1
1303 1303
                 return static::_xmlrpcs_multicall_error(new Response(0,
1304 1304
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1305
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
1305
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1306 1306
             }
1307 1307
         }
1308 1308
 
@@ -1383,7 +1383,7 @@  discard block
 block discarded – undo
1383 1383
             }
1384 1384
         } else {
1385 1385
             $numCalls = count($req);
1386
-            for ($i = 0; $i < $numCalls; $i++) {
1386
+            for ($i = 0; $i<$numCalls; $i++) {
1387 1387
                 $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1388 1388
             }
1389 1389
         }
@@ -1448,12 +1448,12 @@  discard block
 block discarded – undo
1448 1448
      */
1449 1449
     protected function xml_header($charsetEncoding = '')
1450 1450
     {
1451
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
1451
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1452 1452
 
1453 1453
         if ($charsetEncoding != '') {
1454
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
1454
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
1455 1455
         } else {
1456
-            return "<?xml version=\"1.0\"?" . ">\n";
1456
+            return "<?xml version=\"1.0\"?".">\n";
1457 1457
         }
1458 1458
     }
1459 1459
 
@@ -1469,12 +1469,12 @@  discard block
 block discarded – undo
1469 1469
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
1470 1470
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
1471 1471
             case self::OPT_RESPONSE_CHARSET_ENCODING:
1472
-                $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
1472
+                $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
1473 1473
                 return $this->$name;
1474 1474
             default:
1475 1475
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1476 1476
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1477
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
1477
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1478 1478
                 $result = null;
1479 1479
                 return $result;
1480 1480
         }
@@ -1491,13 +1491,13 @@  discard block
 block discarded – undo
1491 1491
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
1492 1492
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
1493 1493
             case self::OPT_RESPONSE_CHARSET_ENCODING:
1494
-                $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
1494
+                $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
1495 1495
                 $this->$name = $value;
1496 1496
                 break;
1497 1497
             default:
1498 1498
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1499 1499
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1500
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
1500
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1501 1501
         }
1502 1502
     }
1503 1503
 
@@ -1512,7 +1512,7 @@  discard block
 block discarded – undo
1512 1512
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
1513 1513
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
1514 1514
             case self::OPT_RESPONSE_CHARSET_ENCODING:
1515
-                $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
1515
+                $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
1516 1516
                 return isset($this->$name);
1517 1517
             default:
1518 1518
                 return false;
@@ -1530,13 +1530,13 @@  discard block
 block discarded – undo
1530 1530
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
1531 1531
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
1532 1532
             case self::OPT_RESPONSE_CHARSET_ENCODING:
1533
-                $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
1533
+                $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
1534 1534
                 unset($this->$name);
1535 1535
                 break;
1536 1536
             default:
1537 1537
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1538 1538
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1539
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
1539
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1540 1540
         }
1541 1541
     }
1542 1542
 }
Please login to merge, or discard this patch.