Passed
Push — master ( 4388aa...c1a518 )
by Gaetano
06:42
created
src/Helper/Http.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
 
47 47
         // read chunk-size, chunk-extension (if any) and crlf
48 48
         // get the position of the linebreak
49
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
49
+        $chunkEnd = strpos($buffer, "\r\n")+2;
50 50
         $temp = substr($buffer, 0, $chunkEnd);
51 51
         $chunkSize = hexdec(trim($temp));
52 52
         $chunkStart = $chunkEnd;
53
-        while ($chunkSize > 0) {
54
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
53
+        while ($chunkSize>0) {
54
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
55 55
 
56 56
             // just in case we got a broken connection
57 57
             if ($chunkEnd == false) {
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
             }
64 64
 
65 65
             // read chunk-data and crlf
66
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
66
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
67 67
             // append chunk-data to entity-body
68 68
             $new .= $chunk;
69 69
             // length := length + chunk-size
70 70
             $length += strlen($chunk);
71 71
             // read chunk-size and crlf
72
-            $chunkStart = $chunkEnd + 2;
72
+            $chunkStart = $chunkEnd+2;
73 73
 
74
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
74
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
75 75
             if ($chunkEnd == false) {
76 76
                 break; // just in case we got a broken connection
77 77
             }
78
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
78
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
79 79
             $chunkSize = hexdec(trim($temp));
80 80
             $chunkStart = $chunkEnd;
81 81
         }
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
105 105
             $pos = strpos($data, "\r\n\r\n");
106 106
             if ($pos || is_int($pos)) {
107
-                $bd = $pos + 4;
107
+                $bd = $pos+4;
108 108
             } else {
109 109
                 $pos = strpos($data, "\n\n");
110 110
                 if ($pos || is_int($pos)) {
111
-                    $bd = $pos + 2;
111
+                    $bd = $pos+2;
112 112
                 } else {
113 113
                     // No separation between response headers and body: fault?
114 114
                     $bd = 0;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
119 119
                 $data = substr($data, $bd);
120 120
             } else {
121
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
122
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
121
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
122
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
123 123
             }
124 124
         }
125 125
 
@@ -152,19 +152,19 @@  discard block
 block discarded – undo
152 152
         }
153 153
 
154 154
         if ($httpResponse['status_code'] !== '200') {
155
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
156
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
157
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
155
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
156
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
157
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
158 158
         }
159 159
 
160 160
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
161 161
         $pos = strpos($data, "\r\n\r\n");
162 162
         if ($pos || is_int($pos)) {
163
-            $bd = $pos + 4;
163
+            $bd = $pos+4;
164 164
         } else {
165 165
             $pos = strpos($data, "\n\n");
166 166
             if ($pos || is_int($pos)) {
167
-                $bd = $pos + 2;
167
+                $bd = $pos+2;
168 168
             } else {
169 169
                 // No separation between response headers and body: fault?
170 170
                 // we could take some action here instead of going on...
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         foreach ($ar as $line) {
179 179
             // take care of multi-line headers and cookies
180 180
             $arr = explode(':', $line, 2);
181
-            if (count($arr) > 1) {
181
+            if (count($arr)>1) {
182 182
                 $headerName = strtolower(trim($arr[0]));
183 183
                 /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
184 184
                 ///       passed using multiple header lines.
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                     foreach ($cookies as $cookie) {
196 196
                         // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
197 197
                         if (isset($httpResponse['headers'][$headerName])) {
198
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
198
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
199 199
                         } else {
200 200
                             $httpResponse['headers'][$headerName] = trim($cookie);
201 201
                         }
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
                 }
225 225
             } elseif (isset($headerName)) {
226 226
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
227
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
227
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
228 228
             }
229 229
         }
230 230
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             // Decode chunked encoding sent by http 1.1 servers
248 248
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
249 249
                 if (!$data = static::decodeChunked($data)) {
250
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
250
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
251 251
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
252 252
                 }
253 253
             }
@@ -262,19 +262,19 @@  discard block
 block discarded – undo
262 262
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
263 263
                             $data = $degzdata;
264 264
                             if ($debug) {
265
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
265
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
266 266
                             }
267 267
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
268 268
                             $data = $degzdata;
269 269
                             if ($debug) {
270
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
270
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
271 271
                             }
272 272
                         } else {
273
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
273
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
274 274
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
275 275
                         }
276 276
                     } else {
277
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
277
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
278 278
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
279 279
                     }
280 280
                 }
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.
src/Server.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
      */
240 240
     public static function xmlrpc_debugmsg($msg)
241 241
     {
242
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
242
+        static::$_xmlrpc_debuginfo .= $msg."\n";
243 243
     }
244 244
 
245 245
     /**
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
      */
252 252
     public static function error_occurred($msg)
253 253
     {
254
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
254
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
255 255
     }
256 256
 
257 257
     /**
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
         // user debug info should be encoded by the end user using the INTERNAL_ENCODING
273 273
         $out = '';
274 274
         if ($this->debug_info != '') {
275
-            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
275
+            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
276 276
         }
277 277
         if (static::$_xmlrpc_debuginfo != '') {
278
-            $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
278
+            $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
279 279
             // NB: a better solution MIGHT be to use CDATA, but we need to insert it
280 280
             // into return payload AFTER the beginning tag
281 281
             //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
         $this->debug_info = '';
305 305
 
306 306
         // Save what we received, before parsing it
307
-        if ($this->debug > 1) {
308
-            $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
307
+        if ($this->debug>1) {
308
+            $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
309 309
         }
310 310
 
311 311
         $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -321,21 +321,21 @@  discard block
 block discarded – undo
321 321
             $resp->raw_data = $rawData;
322 322
         }
323 323
 
324
-        if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
325
-            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
326
-                static::$_xmlrpcs_occurred_errors . "+++END+++");
324
+        if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
325
+            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
326
+                static::$_xmlrpcs_occurred_errors."+++END+++");
327 327
         }
328 328
 
329 329
         $payload = $this->xml_header($respCharset);
330
-        if ($this->debug > 0) {
331
-            $payload = $payload . $this->serializeDebug($respCharset);
330
+        if ($this->debug>0) {
331
+            $payload = $payload.$this->serializeDebug($respCharset);
332 332
         }
333 333
 
334 334
         // Do not create response serialization if it has already happened. Helps to build json magic
335 335
         if (empty($resp->payload)) {
336 336
             $resp->serialize($respCharset);
337 337
         }
338
-        $payload = $payload . $resp->payload;
338
+        $payload = $payload.$resp->payload;
339 339
 
340 340
         if ($returnPayload) {
341 341
             return $payload;
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
         // if we get a warning/error that has output some text before here, then we cannot
345 345
         // add a new header. We cannot say we are sending xml, either...
346 346
         if (!headers_sent()) {
347
-            header('Content-Type: ' . $resp->content_type);
347
+            header('Content-Type: '.$resp->content_type);
348 348
             // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
349 349
             header("Vary: Accept-Charset");
350 350
 
@@ -367,10 +367,10 @@  discard block
 block discarded – undo
367 367
             // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
368 368
             // responses up to 8000 bytes
369 369
             if ($phpNoSelfCompress) {
370
-                header('Content-Length: ' . (int)strlen($payload));
370
+                header('Content-Length: '.(int) strlen($payload));
371 371
             }
372 372
         } else {
373
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
373
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
374 374
         }
375 375
 
376 376
         print $payload;
@@ -428,9 +428,9 @@  discard block
 block discarded – undo
428 428
             $numParams = count($in);
429 429
         }
430 430
         foreach ($sigs as $curSig) {
431
-            if (count($curSig) == $numParams + 1) {
431
+            if (count($curSig) == $numParams+1) {
432 432
                 $itsOK = 1;
433
-                for ($n = 0; $n < $numParams; $n++) {
433
+                for ($n = 0; $n<$numParams; $n++) {
434 434
                     if (is_object($in)) {
435 435
                         $p = $in->getParam($n);
436 436
                         if ($p->kindOf() == 'scalar') {
@@ -443,10 +443,10 @@  discard block
 block discarded – undo
443 443
                     }
444 444
 
445 445
                     // param index is $n+1, as first member of sig is return type
446
-                    if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
446
+                    if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
447 447
                         $itsOK = 0;
448
-                        $pno = $n + 1;
449
-                        $wanted = $curSig[$n + 1];
448
+                        $pno = $n+1;
449
+                        $wanted = $curSig[$n+1];
450 450
                         $got = $pt;
451 451
                         break;
452 452
                     }
@@ -473,10 +473,10 @@  discard block
 block discarded – undo
473 473
         // check if $_SERVER is populated: it might have been disabled via ini file
474 474
         // (this is true even when in CLI mode)
475 475
         if (count($_SERVER) == 0) {
476
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
476
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
477 477
         }
478 478
 
479
-        if ($this->debug > 1) {
479
+        if ($this->debug>1) {
480 480
             if (function_exists('getallheaders')) {
481 481
                 $this->debugmsg(''); // empty line
482 482
                 foreach (getallheaders() as $name => $val) {
@@ -501,13 +501,13 @@  discard block
 block discarded – undo
501 501
                 if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
502 502
                     if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
503 503
                         $data = $degzdata;
504
-                        if ($this->debug > 1) {
505
-                            $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
504
+                        if ($this->debug>1) {
505
+                            $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
506 506
                         }
507 507
                     } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
508 508
                         $data = $degzdata;
509
-                        if ($this->debug > 1) {
510
-                            $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
509
+                        if ($this->debug>1) {
510
+                            $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
511 511
                         }
512 512
                     } else {
513 513
                         $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
                     if ($reqEncoding == 'ISO-8859-1') {
600 600
                         $data = utf8_encode($data);
601 601
                     } else {
602
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
602
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
603 603
                     }
604 604
                 }
605 605
             }
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
             preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
631 631
             return new Response(
632 632
                 0,
633
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
633
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
634 634
                 $xmlRpcParser->_xh['isf_reason']);
635 635
         } elseif ($xmlRpcParser->_xh['isf']) {
636 636
             /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc,
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
             return new Response(
639 639
                 0,
640 640
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
641
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
641
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']);
642 642
         } else {
643 643
             // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle
644 644
             // this, but in the most common scenario (xmlrpc values type server with some methods registered as phpvals)
@@ -648,20 +648,20 @@  discard block
 block discarded – undo
648 648
                     ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
649 649
                 )
650 650
             ) {
651
-                if ($this->debug > 1) {
652
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
651
+                if ($this->debug>1) {
652
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
653 653
                 }
654 654
 
655 655
                 return $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
656 656
             } else {
657 657
                 // build a Request object with data parsed from xml and add parameters in
658 658
                 $req = new Request($xmlRpcParser->_xh['method']);
659
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
659
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
660 660
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
661 661
                 }
662 662
 
663
-                if ($this->debug > 1) {
664
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
663
+                if ($this->debug>1) {
664
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
665 665
                 }
666 666
 
667 667
                 return $this->execute($req);
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
                 return new Response(
714 714
                     0,
715 715
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
716
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
716
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
717 717
                 );
718 718
             }
719 719
         }
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
         // build string representation of function 'name'
729 729
         if (is_array($func)) {
730 730
             if (is_object($func[0])) {
731
-                $funcName = get_class($func[0]) . '->' . $func[1];
731
+                $funcName = get_class($func[0]).'->'.$func[1];
732 732
             } else {
733 733
                 $funcName = implode('::', $func);
734 734
             }
@@ -740,17 +740,17 @@  discard block
 block discarded – undo
740 740
 
741 741
         // verify that function to be invoked is in fact callable
742 742
         if (!is_callable($func)) {
743
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
743
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
744 744
             return new Response(
745 745
                 0,
746 746
                 PhpXmlRpc::$xmlrpcerr['server_error'],
747
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
747
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
748 748
             );
749 749
         }
750 750
 
751 751
         // If debug level is 3, we should catch all errors generated during processing of user function, and log them
752 752
         // as part of response
753
-        if ($this->debug > 2) {
753
+        if ($this->debug>2) {
754 754
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
755 755
         }
756 756
 
@@ -764,14 +764,14 @@  discard block
 block discarded – undo
764 764
                     $r = call_user_func($func, $req);
765 765
                 }
766 766
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
767
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
767
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
768 768
                     if (is_a($r, 'PhpXmlRpc\Value')) {
769 769
                         $r = new Response($r);
770 770
                     } else {
771 771
                         $r = new Response(
772 772
                             0,
773 773
                             PhpXmlRpc::$xmlrpcerr['server_error'],
774
-                            PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
774
+                            PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
775 775
                         );
776 776
                     }
777 777
                 }
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
                         $r = call_user_func_array($func, array($methodName, $params, $this->user_data));
787 787
                         // mimic EPI behaviour: if we get an array that looks like an error, make it an error response
788 788
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
789
-                            $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
789
+                            $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
790 790
                         } else {
791 791
                             // functions using EPI api should NOT return resp objects, so make sure we encode the
792 792
                             // return type correctly
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
             // proper error-response
811 811
             switch ($this->exception_handling) {
812 812
                 case 2:
813
-                    if ($this->debug > 2) {
813
+                    if ($this->debug>2) {
814 814
                         if (self::$_xmlrpcs_prev_ehandler) {
815 815
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
816 816
                         } else {
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
             // proper error-response
834 834
             switch ($this->exception_handling) {
835 835
                 case 2:
836
-                    if ($this->debug > 2) {
836
+                    if ($this->debug>2) {
837 837
                         if (self::$_xmlrpcs_prev_ehandler) {
838 838
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
839 839
                         } else {
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
             }
854 854
         }
855 855
 
856
-        if ($this->debug > 2) {
856
+        if ($this->debug>2) {
857 857
             // note: restore the error handler we found before calling the user func, even if it has been changed
858 858
             // inside the func itself
859 859
             if (self::$_xmlrpcs_prev_ehandler) {
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
      */
920 920
     protected function debugmsg($string)
921 921
     {
922
-        $this->debug_info .= $string . "\n";
922
+        $this->debug_info .= $string."\n";
923 923
     }
924 924
 
925 925
     /**
@@ -929,9 +929,9 @@  discard block
 block discarded – undo
929 929
     protected function xml_header($charsetEncoding = '')
930 930
     {
931 931
         if ($charsetEncoding != '') {
932
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
932
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
933 933
         } else {
934
-            return "<?xml version=\"1.0\"?" . ">\n";
934
+            return "<?xml version=\"1.0\"?".">\n";
935 935
         }
936 936
     }
937 937
 
@@ -1203,7 +1203,7 @@  discard block
 block discarded – undo
1203 1203
                 $i++; // for error message, we count params from 1
1204 1204
                 return static::_xmlrpcs_multicall_error(new Response(0,
1205 1205
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1206
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
1206
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1207 1207
             }
1208 1208
         }
1209 1209
 
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
1284 1284
             }
1285 1285
         } else {
1286 1286
             $numCalls = count($req);
1287
-            for ($i = 0; $i < $numCalls; $i++) {
1287
+            for ($i = 0; $i<$numCalls; $i++) {
1288 1288
                 $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1289 1289
             }
1290 1290
         }
Please login to merge, or discard this patch.
src/Helper/XMLParser.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -164,19 +164,19 @@  discard block
 block discarded – undo
164 164
         $this->callbacks = array();
165 165
         foreach ($options as $key => $val) {
166 166
             if (is_string($key)) {
167
-                switch($key) {
167
+                switch ($key) {
168 168
                     case 'methodname_callback':
169 169
                         if (!is_callable($val)) {
170 170
                             //$this->_xh['isf'] = 4;
171 171
                             //$this->_xh['isf_reason'] = "Callback passed as 'methodname_callback' is not callable";
172 172
                             //return;
173
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
173
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
174 174
                         } else {
175 175
                             $this->callbacks['methodname'] = $val;
176 176
                         }
177 177
                         break;
178 178
                     default:
179
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
179
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": unsupported option: $key");
180 180
                 }
181 181
                 unset($options[$key]);
182 182
             }
@@ -214,10 +214,10 @@  discard block
 block discarded – undo
214 214
 
215 215
         try {
216 216
             // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors
217
-            for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
217
+            for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
218 218
                 $chunk = substr($data, $offset, $this->maxChunkLength);
219 219
                 // error handling: xml not well formed
220
-                if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
220
+                if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
221 221
                     $errCode = xml_get_error_code($parser);
222 222
                     $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
223 223
                         xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                     break;
228 228
                 }
229 229
                 // no need to parse further if we already have a fatal error
230
-                if ($this->_xh['isf'] >= 2) {
230
+                if ($this->_xh['isf']>=2) {
231 231
                     break;
232 232
                 }
233 233
             }
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
260 260
     {
261 261
         // if invalid xmlrpc already detected, skip all processing
262
-        if ($this->_xh['isf'] >= 2) {
262
+        if ($this->_xh['isf']>=2) {
263 263
             return;
264 264
         }
265 265
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
                 $this->_xh['rt'] = strtolower($name);
282 282
             } else {
283 283
                 $this->_xh['isf'] = 2;
284
-                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
284
+                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
285 285
 
286 286
                 return;
287 287
             }
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 
384 384
             case 'MEMBER':
385 385
                 // set member name to null, in case we do not find in the xml later on
386
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
386
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
387 387
                 //$this->_xh['ac']='';
388 388
                 // Drop trough intentionally
389 389
 
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
      */
453 453
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
454 454
     {
455
-        if ($this->_xh['isf'] >= 2) {
455
+        if ($this->_xh['isf']>=2) {
456 456
             return;
457 457
 
458 458
         }
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
                     $this->_xh['vt'] = Value::$xmlrpcString;
470 470
                 }
471 471
 
472
-                if ($rebuildXmlrpcvals > 0) {
472
+                if ($rebuildXmlrpcvals>0) {
473 473
                     // build the xmlrpc val out of the data received, and substitute it
474 474
                     $temp = new Value($this->_xh['value'], $this->_xh['vt']);
475 475
                     // in case we got info about underlying php class, save it in the object we're rebuilding
@@ -477,15 +477,15 @@  discard block
 block discarded – undo
477 477
                         $temp->_php_class = $this->_xh['php_class'];
478 478
                     }
479 479
                     $this->_xh['value'] = $temp;
480
-                } elseif ($rebuildXmlrpcvals < 0) {
480
+                } elseif ($rebuildXmlrpcvals<0) {
481 481
                     if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
482
-                        $this->_xh['value'] = (object)array(
482
+                        $this->_xh['value'] = (object) array(
483 483
                             'xmlrpc_type' => 'datetime',
484 484
                             'scalar' => $this->_xh['value'],
485 485
                             'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
486 486
                         );
487 487
                     } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
488
-                        $this->_xh['value'] = (object)array(
488
+                        $this->_xh['value'] = (object) array(
489 489
                             'xmlrpc_type' => 'base64',
490 490
                             'scalar' => $this->_xh['value']
491 491
                         );
@@ -500,8 +500,8 @@  discard block
 block discarded – undo
500 500
                 // check if we are inside an array or struct:
501 501
                 // if value just built is inside an array, let's move it into array on the stack
502 502
                 $vscount = count($this->_xh['valuestack']);
503
-                if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
504
-                    $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
503
+                if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
504
+                    $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
505 505
                 }
506 506
                 break;
507 507
 
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
                     $this->_xh['value'] = $this->_xh['ac'];
522 522
                 } elseif ($name == 'DATETIME.ISO8601') {
523 523
                     if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
524
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
524
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
525 525
                     }
526 526
                     $this->_xh['vt'] = Value::$xmlrpcDateTime;
527 527
                     $this->_xh['value'] = $this->_xh['ac'];
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
                     } else {
539 539
                         // log if receiving something strange, even though we set the value to false anyway
540 540
                         if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
541
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
541
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
542 542
                         }
543 543
                         $this->_xh['value'] = false;
544 544
                     }
@@ -548,38 +548,38 @@  discard block
 block discarded – undo
548 548
                     // NOTE: regexp could be much stricter than this...
549 549
                     if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
550 550
                         /// @todo: find a better way of throwing an error than this!
551
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
551
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
552 552
                         $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
553 553
                     } else {
554 554
                         // it's ok, add it on
555
-                        $this->_xh['value'] = (double)$this->_xh['ac'];
555
+                        $this->_xh['value'] = (double) $this->_xh['ac'];
556 556
                     }
557 557
                 } else {
558 558
                     // we have an I4/I8/INT
559 559
                     // we must check that only 0123456789-<space> are characters here
560 560
                     if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
561 561
                         /// @todo find a better way of throwing an error than this!
562
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
562
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
563 563
                         $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
564 564
                     } else {
565 565
                         // it's ok, add it on
566
-                        $this->_xh['value'] = (int)$this->_xh['ac'];
566
+                        $this->_xh['value'] = (int) $this->_xh['ac'];
567 567
                     }
568 568
                 }
569 569
                 $this->_xh['lv'] = 3; // indicate we've found a value
570 570
                 break;
571 571
 
572 572
             case 'NAME':
573
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
573
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
574 574
                 break;
575 575
 
576 576
             case 'MEMBER':
577 577
                 // add to array in the stack the last element built, unless no VALUE was found
578 578
                 if ($this->_xh['vt']) {
579 579
                     $vscount = count($this->_xh['valuestack']);
580
-                    $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
580
+                    $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
581 581
                 } else {
582
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
582
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
583 583
                 }
584 584
                 break;
585 585
 
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
                     $this->_xh['params'][] = $this->_xh['value'];
605 605
                     $this->_xh['pt'][] = $this->_xh['vt'];
606 606
                 } else {
607
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
607
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
608 608
                 }
609 609
                 break;
610 610
 
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
     public function xmlrpc_cd($parser, $data)
680 680
     {
681 681
         // skip processing if xml fault already detected
682
-        if ($this->_xh['isf'] >= 2) {
682
+        if ($this->_xh['isf']>=2) {
683 683
             return;
684 684
         }
685 685
 
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
     public function xmlrpc_dh($parser, $data)
702 702
     {
703 703
         // skip processing if xml fault already detected
704
-        if ($this->_xh['isf'] >= 2) {
704
+        if ($this->_xh['isf']>=2) {
705 705
             return;
706 706
         }
707 707
 
@@ -775,8 +775,8 @@  discard block
 block discarded – undo
775 775
         // Details:
776 776
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
777 777
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
778
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
779
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
778
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
779
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
780 780
             $xmlChunk, $matches)) {
781 781
             return strtoupper(substr($matches[2], 1, -1));
782 782
         }
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
795 795
             // IANA also likes better US-ASCII, so go with it
796 796
             if ($enc == 'ASCII') {
797
-                $enc = 'US-' . $enc;
797
+                $enc = 'US-'.$enc;
798 798
             }
799 799
 
800 800
             return $enc;
@@ -829,8 +829,8 @@  discard block
 block discarded – undo
829 829
         // Details:
830 830
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
831 831
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
832
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
833
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
832
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
833
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
834 834
             $xmlChunk, $matches)) {
835 835
             return true;
836 836
         }
Please login to merge, or discard this patch.
src/Request.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
     public function xml_header($charsetEncoding = '')
108 108
     {
109 109
         if ($charsetEncoding != '') {
110
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
110
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
111 111
         } else {
112
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
112
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
113 113
         }
114 114
     }
115 115
 
@@ -132,16 +132,16 @@  discard block
 block discarded – undo
132 132
     public function createPayload($charsetEncoding = '')
133 133
     {
134 134
         if ($charsetEncoding != '') {
135
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
135
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
136 136
         } else {
137 137
             $this->content_type = 'text/xml';
138 138
         }
139 139
         $this->payload = $this->xml_header($charsetEncoding);
140
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
141
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
140
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
141
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
142 142
         $this->payload .= "<params>\n";
143 143
         foreach ($this->params as $p) {
144
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
144
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
145 145
                 "</param>\n";
146 146
         }
147 147
         $this->payload .= "</params>\n";
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
264 264
 
265 265
         if ($data == '') {
266
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
266
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
267 267
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
268 268
         }
269 269
 
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
                 // failed processing of HTTP response headers
277 277
                 // save into response obj the full payload received, for debugging
278 278
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
279
-            } catch(\Exception $e) {
279
+            } catch (\Exception $e) {
280 280
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
281 281
             }
282 282
         }
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
         // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
291 291
         $pos = strrpos($data, '</methodResponse>');
292 292
         if ($pos !== false) {
293
-            $data = substr($data, 0, $pos + 17);
293
+            $data = substr($data, 0, $pos+17);
294 294
         }
295 295
 
296 296
         // try to 'guestimate' the character encoding of the received response
@@ -304,9 +304,9 @@  discard block
 block discarded – undo
304 304
             if ($start) {
305 305
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
306 306
                 $end = strpos($data, '-->', $start);
307
-                $comments = substr($data, $start, $end - $start);
308
-                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
309
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
307
+                $comments = substr($data, $start, $end-$start);
308
+                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
309
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
310 310
             }
311 311
         }
312 312
 
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                     if ($respEncoding == 'ISO-8859-1') {
329 329
                         $data = utf8_encode($data);
330 330
                     } else {
331
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
331
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
332 332
                     }
333 333
                 }
334 334
             }
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
             //    there could be proxies meddling with the request, or network data corruption...
359 359
 
360 360
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
361
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
361
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
362 362
                 $this->httpResponse
363 363
             );
364 364
 
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
         // second error check: xml well-formed but not xml-rpc compliant
370 370
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
371 371
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
372
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
372
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
373 373
                 $this->httpResponse
374 374
             );
375 375
 
@@ -379,13 +379,13 @@  discard block
 block discarded – undo
379 379
         }
380 380
         // third error check: parsing of the response has somehow gone boink.
381 381
         /// @todo shall we omit this check, since we trust the parsing code?
382
-        elseif ($xmlRpcParser->_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
382
+        elseif ($xmlRpcParser->_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
383 383
             // something odd has happened and it's time to generate a client side error indicating something odd went on
384 384
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
385 385
                 '', $this->httpResponse
386 386
             );
387 387
         } else {
388
-            if ($this->debug > 1) {
388
+            if ($this->debug>1) {
389 389
                 $this->getLogger()->debugMessage(
390 390
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
391 391
                 );
Please login to merge, or discard this patch.