Passed
Push — master ( 7162b6...15029b )
by Gaetano
09:38
created
demo/client/windowscharset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-require_once __DIR__ . "/_prepend.php";
2
+require_once __DIR__."/_prepend.php";
3 3
 
4 4
 /**
5 5
  * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,
Please login to merge, or discard this patch.
src/Value.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
                     $this->me['struct'] = $val;
130 130
                     break;
131 131
                 default:
132
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
132
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
133 133
             }
134 134
         }
135 135
     }
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         }
154 154
 
155 155
         if ($typeOf !== 1) {
156
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
156
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
157 157
             return 0;
158 158
         }
159 159
 
@@ -170,10 +170,10 @@  discard block
 block discarded – undo
170 170
 
171 171
         switch ($this->mytype) {
172 172
             case 1:
173
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
173
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
174 174
                 return 0;
175 175
             case 3:
176
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
176
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
177 177
                 return 0;
178 178
             case 2:
179 179
                 // we're adding a scalar value to an array here
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 
215 215
             return 1;
216 216
         } else {
217
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
217
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
218 218
             return 0;
219 219
         }
220 220
     }
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 
245 245
             return 1;
246 246
         } else {
247
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
247
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
248 248
             return 0;
249 249
         }
250 250
     }
@@ -286,19 +286,19 @@  discard block
 block discarded – undo
286 286
             case 1:
287 287
                 switch ($typ) {
288 288
                     case static::$xmlrpcBase64:
289
-                        $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
289
+                        $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>";
290 290
                         break;
291 291
                     case static::$xmlrpcBoolean:
292
-                        $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
292
+                        $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
293 293
                         break;
294 294
                     case static::$xmlrpcString:
295 295
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
296
-                        $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
296
+                        $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
297 297
                         break;
298 298
                     case static::$xmlrpcInt:
299 299
                     case static::$xmlrpcI4:
300 300
                     case static::$xmlrpcI8:
301
-                        $rs .= "<{$typ}>" . (int)$val . "</{$typ}>";
301
+                        $rs .= "<{$typ}>".(int) $val."</{$typ}>";
302 302
                         break;
303 303
                     case static::$xmlrpcDouble:
304 304
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -306,16 +306,16 @@  discard block
 block discarded – undo
306 306
                         // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
307 307
                         // The code below tries its best at keeping max precision while avoiding exp notation,
308 308
                         // but there is of course no limit in the number of decimal places to be used...
309
-                        $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
309
+                        $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
310 310
                         break;
311 311
                     case static::$xmlrpcDateTime:
312 312
                         if (is_string($val)) {
313 313
                             $rs .= "<{$typ}>{$val}</{$typ}>";
314 314
                         // DateTimeInterface is not present in php 5.4...
315 315
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
316
-                            $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
316
+                            $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
317 317
                         } elseif (is_int($val)) {
318
-                            $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
318
+                            $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
319 319
                         } else {
320 320
                             // not really a good idea here: but what should we output anyway? left for backward compat...
321 321
                             $rs .= "<{$typ}>{$val}</{$typ}>";
@@ -337,14 +337,14 @@  discard block
 block discarded – undo
337 337
             case 3:
338 338
                 // struct
339 339
                 if ($this->_php_class) {
340
-                    $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
340
+                    $rs .= '<struct php_class="'.$this->_php_class."\">\n";
341 341
                 } else {
342 342
                     $rs .= "<struct>\n";
343 343
                 }
344 344
                 $charsetEncoder = $this->getCharsetEncoder();
345 345
                 /** @var Value $val2 */
346 346
                 foreach ($val as $key2 => $val2) {
347
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
347
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
348 348
                     //$rs.=$this->serializeval($val2);
349 349
                     $rs .= $val2->serialize($charsetEncoding);
350 350
                     $rs .= "</member>\n";
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
         $val = reset($this->me);
380 380
         $typ = key($this->me);
381 381
 
382
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
382
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
383 383
     }
384 384
 
385 385
     /**
Please login to merge, or discard this patch.
src/Encoder.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -90,13 +90,13 @@  discard block
 block discarded – undo
90 90
                                 'scalar' => $val,
91 91
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
92 92
                             );
93
-                            return (object)$xmlrpcVal;
93
+                            return (object) $xmlrpcVal;
94 94
                         case 'base64':
95 95
                             $xmlrpcVal = array(
96 96
                                 'xmlrpc_type' => 'base64',
97 97
                                 'scalar' => $val
98 98
                             );
99
-                            return (object)$xmlrpcVal;
99
+                            return (object) $xmlrpcVal;
100 100
                         case 'string':
101 101
                             if (isset($options['extension_api_encoding'])) {
102 102
                                 // if iconv is not available, we use mb_convert_encoding
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             case 'msg':
166 166
                 $paramCount = $xmlrpcVal->getNumParams();
167 167
                 $arr = array();
168
-                for ($i = 0; $i < $paramCount; $i++) {
168
+                for ($i = 0; $i<$paramCount; $i++) {
169 169
                     $arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
170 170
                 }
171 171
                 return $arr;
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
                 break;
292 292
             case 'resource':
293 293
                 if (in_array('extension_api', $options)) {
294
-                    $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
294
+                    $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
295 295
                 } else {
296 296
                     $xmlrpcVal = new Value();
297 297
                 }
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
                     if ($valEncoding == 'ISO-8859-1') {
341 341
                         $xmlVal = utf8_encode($xmlVal);
342 342
                     } else {
343
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
343
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
344 344
                     }
345 345
                 }
346 346
             }
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
             $parserOptions
363 363
         );
364 364
 
365
-        if ($xmlRpcParser->_xh['isf'] > 1) {
365
+        if ($xmlRpcParser->_xh['isf']>1) {
366 366
             // test that $xmlrpc->_xh['value'] is an obj, too???
367 367
 
368 368
             $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
             case 'methodcall':
388 388
                 $req = new Request($xmlRpcParser->_xh['method']);
389
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
389
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
390 390
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
391 391
                 }
392 392
                 return $req;
Please login to merge, or discard this patch.
src/Helper/Http.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
 
46 46
         // read chunk-size, chunk-extension (if any) and crlf
47 47
         // get the position of the linebreak
48
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
48
+        $chunkEnd = strpos($buffer, "\r\n")+2;
49 49
         $temp = substr($buffer, 0, $chunkEnd);
50 50
         $chunkSize = hexdec(trim($temp));
51 51
         $chunkStart = $chunkEnd;
52
-        while ($chunkSize > 0) {
53
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
52
+        while ($chunkSize>0) {
53
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
54 54
 
55 55
             // just in case we got a broken connection
56 56
             if ($chunkEnd == false) {
@@ -62,19 +62,19 @@  discard block
 block discarded – undo
62 62
             }
63 63
 
64 64
             // read chunk-data and crlf
65
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
65
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
66 66
             // append chunk-data to entity-body
67 67
             $new .= $chunk;
68 68
             // length := length + chunk-size
69 69
             $length += strlen($chunk);
70 70
             // read chunk-size and crlf
71
-            $chunkStart = $chunkEnd + 2;
71
+            $chunkStart = $chunkEnd+2;
72 72
 
73
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
73
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
74 74
             if ($chunkEnd == false) {
75 75
                 break; // just in case we got a broken connection
76 76
             }
77
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
77
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
78 78
             $chunkSize = hexdec(trim($temp));
79 79
             $chunkStart = $chunkEnd;
80 80
         }
@@ -103,11 +103,11 @@  discard block
 block discarded – undo
103 103
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
104 104
             $pos = strpos($data, "\r\n\r\n");
105 105
             if ($pos || is_int($pos)) {
106
-                $bd = $pos + 4;
106
+                $bd = $pos+4;
107 107
             } else {
108 108
                 $pos = strpos($data, "\n\n");
109 109
                 if ($pos || is_int($pos)) {
110
-                    $bd = $pos + 2;
110
+                    $bd = $pos+2;
111 111
                 } else {
112 112
                     // No separation between response headers and body: fault?
113 113
                     $bd = 0;
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
118 118
                 $data = substr($data, $bd);
119 119
             } else {
120
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
121
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
120
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
121
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
122 122
             }
123 123
         }
124 124
 
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
151 151
         }
152 152
 
153 153
         if ($httpResponse['status_code'] !== '200') {
154
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
155
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
156
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
154
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
155
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
156
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
157 157
         }
158 158
 
159 159
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
160 160
         $pos = strpos($data, "\r\n\r\n");
161 161
         if ($pos || is_int($pos)) {
162
-            $bd = $pos + 4;
162
+            $bd = $pos+4;
163 163
         } else {
164 164
             $pos = strpos($data, "\n\n");
165 165
             if ($pos || is_int($pos)) {
166
-                $bd = $pos + 2;
166
+                $bd = $pos+2;
167 167
             } else {
168 168
                 // No separation between response headers and body: fault?
169 169
                 // we could take some action here instead of going on...
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         foreach ($ar as $line) {
178 178
             // take care of multi-line headers and cookies
179 179
             $arr = explode(':', $line, 2);
180
-            if (count($arr) > 1) {
180
+            if (count($arr)>1) {
181 181
                 $headerName = strtolower(trim($arr[0]));
182 182
                 /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
183 183
                 ///       passed using multiple header lines.
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                     foreach ($cookies as $cookie) {
195 195
                         // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
196 196
                         if (isset($httpResponse['headers'][$headerName])) {
197
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
197
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
198 198
                         } else {
199 199
                             $httpResponse['headers'][$headerName] = trim($cookie);
200 200
                         }
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                 }
224 224
             } elseif (isset($headerName)) {
225 225
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
226
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
226
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
227 227
             }
228 228
         }
229 229
 
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
             // Decode chunked encoding sent by http 1.1 servers
247 247
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
248 248
                 if (!$data = static::decodeChunked($data)) {
249
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
249
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
250 250
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
251 251
                 }
252 252
             }
@@ -261,19 +261,19 @@  discard block
 block discarded – undo
261 261
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
262 262
                             $data = $degzdata;
263 263
                             if ($debug) {
264
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
264
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
265 265
                             }
266 266
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
267 267
                             $data = $degzdata;
268 268
                             if ($debug) {
269
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
269
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
270 270
                             }
271 271
                         } else {
272
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
272
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
273 273
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
274 274
                         }
275 275
                     } else {
276
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
276
+                        $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 277
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
278 278
                     }
279 279
                 }
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
     public function parseAcceptHeader($header)
294 294
     {
295 295
         $accepted = array();
296
-        foreach(explode(',', $header) as $c) {
296
+        foreach (explode(',', $header) as $c) {
297 297
             if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) {
298 298
                 $c = $matches[1];
299 299
                 $w = $matches[2];
Please login to merge, or discard this patch.
src/Response.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -155,35 +155,35 @@  discard block
 block discarded – undo
155 155
     public function serialize($charsetEncoding = '')
156 156
     {
157 157
         if ($charsetEncoding != '') {
158
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
158
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
159 159
         } else {
160 160
             $this->content_type = 'text/xml';
161 161
         }
162 162
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
163
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
163
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
164 164
         } else {
165 165
             $result = "<methodResponse>\n";
166 166
         }
167 167
         if ($this->errno) {
168 168
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
169
-            $result .= "<fault>\n" .
170
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
171
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
172
-                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
169
+            $result .= "<fault>\n".
170
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
171
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
172
+                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
173 173
                 "</struct>\n</value>\n</fault>";
174 174
         } else {
175 175
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
176 176
                 if (is_string($this->val) && $this->valtyp == 'xml') {
177
-                    $result .= "<params>\n<param>\n" .
178
-                        $this->val .
177
+                    $result .= "<params>\n<param>\n".
178
+                        $this->val.
179 179
                         "</param>\n</params>";
180 180
                 } else {
181 181
                     /// @todo try to build something serializable using the Encoder...
182 182
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
183 183
                 }
184 184
             } else {
185
-                $result .= "<params>\n<param>\n" .
186
-                    $this->val->serialize($charsetEncoding) .
185
+                $result .= "<params>\n<param>\n".
186
+                    $this->val->serialize($charsetEncoding).
187 187
                     "</param>\n</params>";
188 188
             }
189 189
         }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 return $this->httpResponse['raw_data'];
209 209
             default:
210 210
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
211
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
211
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
212 212
                 return null;
213 213
         }
214 214
     }
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
                 break;
230 230
             default:
231 231
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
232
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
232
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
233 233
         }
234 234
     }
235 235
 
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
                 break;
264 264
             default:
265 265
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
266
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
266
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
267 267
         }
268 268
     }
269 269
 }
Please login to merge, or discard this patch.
src/Helper/XMLParser.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -173,12 +173,12 @@  discard block
 block discarded – undo
173 173
 
174 174
         foreach ($mergedOptions as $key => $val) {
175 175
             if (is_string($key) && !ctype_digit($key)) {
176
-                switch($key) {
176
+                switch ($key) {
177 177
                     case 'target_charset':
178 178
                         if (function_exists('mb_convert_encoding')) {
179 179
                             $this->current_parsing_options['target_charset'] = $val;
180 180
                         } else {
181
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring");
181
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring");
182 182
                         }
183 183
                         break;
184 184
 
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
189 189
                             //$this->_xh['isf'] = 4;
190 190
                             //$this->_xh['isf_reason'] = "Callback passed as 'methodname_callback' is not callable";
191 191
                             //return;
192
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
192
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
193 193
                         }
194 194
                         break;
195 195
 
196 196
                     default:
197
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
197
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": unsupported option: $key");
198 198
                 }
199 199
                 unset($mergedOptions[$key]);
200 200
             }
@@ -230,10 +230,10 @@  discard block
 block discarded – undo
230 230
 
231 231
         try {
232 232
             // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors
233
-            for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
233
+            for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
234 234
                 $chunk = substr($data, $offset, $this->maxChunkLength);
235 235
                 // error handling: xml not well formed
236
-                if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
236
+                if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
237 237
                     $errCode = xml_get_error_code($parser);
238 238
                     $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
239 239
                         xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
                     break;
244 244
                 }
245 245
                 // no need to parse further if we already have a fatal error
246
-                if ($this->_xh['isf'] >= 2) {
246
+                if ($this->_xh['isf']>=2) {
247 247
                     break;
248 248
                 }
249 249
             }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
276 276
     {
277 277
         // if invalid xmlrpc already detected, skip all processing
278
-        if ($this->_xh['isf'] >= 2) {
278
+        if ($this->_xh['isf']>=2) {
279 279
             return;
280 280
         }
281 281
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
                 $this->_xh['rt'] = strtolower($name);
299 299
             } else {
300 300
                 $this->_xh['isf'] = 2;
301
-                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
301
+                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
302 302
 
303 303
                 return;
304 304
             }
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 
401 401
             case 'MEMBER':
402 402
                 // set member name to null, in case we do not find in the xml later on
403
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
403
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
404 404
                 //$this->_xh['ac']='';
405 405
                 // Drop trough intentionally
406 406
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
      */
473 473
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
474 474
     {
475
-        if ($this->_xh['isf'] >= 2) {
475
+        if ($this->_xh['isf']>=2) {
476 476
             return;
477 477
 
478 478
         }
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
                     $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8');
495 495
                 }
496 496
 
497
-                if ($rebuildXmlrpcvals > 0) {
497
+                if ($rebuildXmlrpcvals>0) {
498 498
                     // build the xmlrpc val out of the data received, and substitute it
499 499
                     $temp = new Value($this->_xh['value'], $this->_xh['vt']);
500 500
                     // in case we got info about underlying php class, save it in the object we're rebuilding
@@ -502,15 +502,15 @@  discard block
 block discarded – undo
502 502
                         $temp->_php_class = $this->_xh['php_class'];
503 503
                     }
504 504
                     $this->_xh['value'] = $temp;
505
-                } elseif ($rebuildXmlrpcvals < 0) {
505
+                } elseif ($rebuildXmlrpcvals<0) {
506 506
                     if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
507
-                        $this->_xh['value'] = (object)array(
507
+                        $this->_xh['value'] = (object) array(
508 508
                             'xmlrpc_type' => 'datetime',
509 509
                             'scalar' => $this->_xh['value'],
510 510
                             'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
511 511
                         );
512 512
                     } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
513
-                        $this->_xh['value'] = (object)array(
513
+                        $this->_xh['value'] = (object) array(
514 514
                             'xmlrpc_type' => 'base64',
515 515
                             'scalar' => $this->_xh['value']
516 516
                         );
@@ -525,8 +525,8 @@  discard block
 block discarded – undo
525 525
                 // check if we are inside an array or struct:
526 526
                 // if value just built is inside an array, let's move it into array on the stack
527 527
                 $vscount = count($this->_xh['valuestack']);
528
-                if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
529
-                    $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
528
+                if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
529
+                    $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
530 530
                 }
531 531
                 break;
532 532
 
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
                     $this->_xh['value'] = $this->_xh['ac'];
547 547
                 } elseif ($name == 'DATETIME.ISO8601') {
548 548
                     if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
549
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
549
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
550 550
                     }
551 551
                     $this->_xh['vt'] = Value::$xmlrpcDateTime;
552 552
                     $this->_xh['value'] = $this->_xh['ac'];
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
                     } else {
564 564
                         // log if receiving something strange, even though we set the value to false anyway
565 565
                         if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
566
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
566
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
567 567
                         }
568 568
                         $this->_xh['value'] = false;
569 569
                     }
@@ -573,38 +573,38 @@  discard block
 block discarded – undo
573 573
                     // NOTE: regexp could be much stricter than this...
574 574
                     if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
575 575
                         /// @todo: find a better way of throwing an error than this!
576
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
576
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
577 577
                         $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
578 578
                     } else {
579 579
                         // it's ok, add it on
580
-                        $this->_xh['value'] = (double)$this->_xh['ac'];
580
+                        $this->_xh['value'] = (double) $this->_xh['ac'];
581 581
                     }
582 582
                 } else {
583 583
                     // we have an I4/I8/INT
584 584
                     // we must check that only 0123456789-<space> are characters here
585 585
                     if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
586 586
                         /// @todo find a better way of throwing an error than this!
587
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
587
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
588 588
                         $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
589 589
                     } else {
590 590
                         // it's ok, add it on
591
-                        $this->_xh['value'] = (int)$this->_xh['ac'];
591
+                        $this->_xh['value'] = (int) $this->_xh['ac'];
592 592
                     }
593 593
                 }
594 594
                 $this->_xh['lv'] = 3; // indicate we've found a value
595 595
                 break;
596 596
 
597 597
             case 'NAME':
598
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
598
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
599 599
                 break;
600 600
 
601 601
             case 'MEMBER':
602 602
                 // add to array in the stack the last element built, unless no VALUE was found
603 603
                 if ($this->_xh['vt']) {
604 604
                     $vscount = count($this->_xh['valuestack']);
605
-                    $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
605
+                    $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
606 606
                 } else {
607
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
607
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
608 608
                 }
609 609
                 break;
610 610
 
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
                     $this->_xh['params'][] = $this->_xh['value'];
630 630
                     $this->_xh['pt'][] = $this->_xh['vt'];
631 631
                 } else {
632
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
632
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
633 633
                 }
634 634
                 break;
635 635
 
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
     public function xmlrpc_cd($parser, $data)
705 705
     {
706 706
         // skip processing if xml fault already detected
707
-        if ($this->_xh['isf'] >= 2) {
707
+        if ($this->_xh['isf']>=2) {
708 708
             return;
709 709
         }
710 710
 
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
     public function xmlrpc_dh($parser, $data)
727 727
     {
728 728
         // skip processing if xml fault already detected
729
-        if ($this->_xh['isf'] >= 2) {
729
+        if ($this->_xh['isf']>=2) {
730 730
             return;
731 731
         }
732 732
 
@@ -800,8 +800,8 @@  discard block
 block discarded – undo
800 800
         // Details:
801 801
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
802 802
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
803
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
804
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
803
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
804
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
805 805
             $xmlChunk, $matches)) {
806 806
             return strtoupper(substr($matches[2], 1, -1));
807 807
         }
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
820 820
             // IANA also likes better US-ASCII, so go with it
821 821
             if ($enc == 'ASCII') {
822
-                $enc = 'US-' . $enc;
822
+                $enc = 'US-'.$enc;
823 823
             }
824 824
 
825 825
             return $enc;
@@ -856,8 +856,8 @@  discard block
 block discarded – undo
856 856
         // Details:
857 857
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
858 858
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
859
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
860
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
859
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
860
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
861 861
             $xmlChunk, $matches)) {
862 862
             return true;
863 863
         }
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
877 877
                 break;
878 878
             default:
879 879
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
880
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
880
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
881 881
         }
882 882
     }
883 883
 
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
                 break;
902 902
             default:
903 903
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
904
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
904
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
905 905
         }
906 906
     }
907 907
 }
Please login to merge, or discard this patch.