Completed
Push — master ( 70e3fd...820f99 )
by Gaetano
06:05
created
demo/client/introspect.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,20 +6,20 @@  discard block
 block discarded – undo
6 6
 <h3>The code demonstrates usage of multicall and introspection methods</h3>
7 7
 <?php
8 8
 
9
-include_once __DIR__ . "/../../src/Autoloader.php";
9
+include_once __DIR__."/../../src/Autoloader.php";
10 10
 PhpXmlRpc\Autoloader::register();
11 11
 
12 12
 function display_error($r)
13 13
 {
14 14
     print "An error occurred: ";
15
-    print "Code: " . $r->faultCode()
16
-        . " Reason: '" . $r->faultString() . "'<br/>";
15
+    print "Code: ".$r->faultCode()
16
+        . " Reason: '".$r->faultString()."'<br/>";
17 17
 }
18 18
 
19 19
 $client = new PhpXmlRpc\Client("http://phpxmlrpc.sourceforge.net/server.php");
20 20
 
21 21
 // First off, let's retrieve the list of methods available on the remote server
22
-print "<h3>methods available at http://" . $client->server . $client->path . "</h3>\n";
22
+print "<h3>methods available at http://".$client->server.$client->path."</h3>\n";
23 23
 $req = new PhpXmlRpc\Request('system.listMethods');
24 24
 $resp = $client->send($req);
25 25
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
     // Then, retrieve the signature and help text of each available method
32 32
     foreach ($v as $methodName) {
33
-        print "<h4>" . $methodName->scalarval() . "</h4>\n";
33
+        print "<h4>".$methodName->scalarval()."</h4>\n";
34 34
         // build messages first, add params later
35 35
         $m1 = new PhpXmlRpc\Request('system.methodHelp');
36 36
         $m2 = new PhpXmlRpc\Request('system.methodSignature');
@@ -61,13 +61,13 @@  discard block
 block discarded – undo
61 61
             if ($val->kindOf() == "array") {
62 62
                 foreach ($val as $x) {
63 63
                     $ret = $x[0];
64
-                    print "<code>" . htmlspecialchars($ret->scalarval()) . " "
65
-                        . htmlspecialchars($methodName->scalarval()) . "(";
66
-                    if ($x->count() > 1) {
67
-                        for ($k = 1; $k < $x->count(); $k++) {
64
+                    print "<code>".htmlspecialchars($ret->scalarval())." "
65
+                        . htmlspecialchars($methodName->scalarval())."(";
66
+                    if ($x->count()>1) {
67
+                        for ($k = 1; $k<$x->count(); $k++) {
68 68
                             $y = $x[$k];
69 69
                             print htmlspecialchars($y->scalarval());
70
-                            if ($k < $x->count() - 1) {
70
+                            if ($k<$x->count()-1) {
71 71
                                 print ", ";
72 72
                             }
73 73
                         }
Please login to merge, or discard this patch.
tests/benchmark.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
 use PhpXmlRpc\Response;
18 18
 use PhpXmlRpc\Encoder;
19 19
 
20
-include_once __DIR__ . '/../vendor/autoload.php';
20
+include_once __DIR__.'/../vendor/autoload.php';
21 21
 
22
-include __DIR__ . '/parse_args.php';
22
+include __DIR__.'/parse_args.php';
23 23
 $args = argParser::getArgs();
24 24
 
25 25
 function begin_test($test_name, $test_case)
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     if (!isset($test_results[$test_name][$test_case])) {
40 40
         trigger_error('ending test that was not started');
41 41
     }
42
-    $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
42
+    $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
43 43
     $test_results[$test_name][$test_case]['result'] = $test_result;
44 44
     echo '.';
45 45
     flush();
@@ -73,24 +73,24 @@  discard block
 block discarded – undo
73 73
 }
74 74
 
75 75
 if ($is_web) {
76
-    echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
76
+    echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
77 77
     if ($xd) {
78
-        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
78
+        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
79 79
     }
80 80
     flush();
81 81
     ob_flush();
82 82
 } else {
83
-    echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
83
+    echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
84 84
     if ($xd) {
85
-        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
85
+        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
86 86
     }
87 87
 }
88 88
 
89 89
 // test 'manual style' data encoding vs. 'automatic style' encoding
90 90
 begin_test('Data encoding (large array)', 'manual encoding');
91
-for ($i = 0; $i < $num_tests; $i++) {
91
+for ($i = 0; $i<$num_tests; $i++) {
92 92
     $vals = array();
93
-    for ($j = 0; $j < 10; $j++) {
93
+    for ($j = 0; $j<10; $j++) {
94 94
         $valarray = array();
95 95
         foreach ($data[$j] as $key => $val) {
96 96
             $values = array();
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 
116 116
 begin_test('Data encoding (large array)', 'automatic encoding');
117 117
 $encoder = new Encoder();
118
-for ($i = 0; $i < $num_tests; $i++) {
118
+for ($i = 0; $i<$num_tests; $i++) {
119 119
     $value = $encoder->encode($data, array('auto_dates'));
120 120
     $out = $value->serialize();
121 121
 }
@@ -123,8 +123,8 @@  discard block
 block discarded – undo
123 123
 
124 124
 if (function_exists('xmlrpc_set_type')) {
125 125
     begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
126
-    for ($i = 0; $i < $num_tests; $i++) {
127
-        for ($j = 0; $j < 10; $j++) {
126
+    for ($i = 0; $i<$num_tests; $i++) {
127
+        for ($j = 0; $j<10; $j++) {
128 128
             foreach ($keys as $k) {
129 129
                 xmlrpc_set_type($data[$j][$k][4], 'datetime');
130 130
                 xmlrpc_set_type($data[$j][$k][8], 'datetime');
@@ -138,18 +138,18 @@  discard block
 block discarded – undo
138 138
 // test 'old style' data decoding vs. 'automatic style' decoding
139 139
 $dummy = new Request('');
140 140
 $out = new Response($value);
141
-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
141
+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
142 142
 
143 143
 begin_test('Data decoding (large array)', 'manual decoding');
144
-for ($i = 0; $i < $num_tests; $i++) {
144
+for ($i = 0; $i<$num_tests; $i++) {
145 145
     $response = $dummy->ParseResponse($in, true);
146 146
     $value = $response->value();
147 147
     $result = array();
148
-    foreach($value as $val1) {
148
+    foreach ($value as $val1) {
149 149
         $out = array();
150
-        foreach($val1 as $name => $val) {
150
+        foreach ($val1 as $name => $val) {
151 151
             $out[$name] = array();
152
-            foreach($val as $data) {
152
+            foreach ($val as $data) {
153 153
                 $out[$name][] = $data->scalarval();
154 154
             }
155 155
         }
@@ -159,18 +159,18 @@  discard block
 block discarded – undo
159 159
 end_test('Data decoding (large array)', 'manual decoding', $result);
160 160
 
161 161
 begin_test('Data decoding (large array)', 'manual decoding deprecated');
162
-for ($i = 0; $i < $num_tests; $i++) {
162
+for ($i = 0; $i<$num_tests; $i++) {
163 163
     $response = $dummy->ParseResponse($in, true);
164 164
     $value = $response->value();
165 165
     $result = array();
166 166
     $l = $value->arraysize();
167
-    for ($k = 0; $k < $l; $k++) {
167
+    for ($k = 0; $k<$l; $k++) {
168 168
         $val1 = $value->arraymem($k);
169 169
         $out = array();
170
-        foreach($val1 as $name => $val) {
170
+        foreach ($val1 as $name => $val) {
171 171
             $out[$name] = array();
172 172
             $m = $val->arraysize();
173
-            for ($j = 0; $j < $m; $j++) {
173
+            for ($j = 0; $j<$m; $j++) {
174 174
                 $data = $val->arraymem($j);
175 175
                 $out[$name][] = $data->scalarval();
176 176
             }
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
182 182
 
183 183
 begin_test('Data decoding (large array)', 'automatic decoding');
184
-for ($i = 0; $i < $num_tests; $i++) {
184
+for ($i = 0; $i<$num_tests; $i++) {
185 185
     $response = $dummy->ParseResponse($in, true, 'phpvals');
186 186
     $value = $response->value();
187 187
 }
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 if (function_exists('xmlrpc_decode')) {
191 191
     begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
192
-    for ($i = 0; $i < $num_tests; $i++) {
192
+    for ($i = 0; $i<$num_tests; $i++) {
193 193
         $response = $dummy->ParseResponse($in, true, 'xml');
194 194
         $value = xmlrpc_decode($response->value());
195 195
     }
@@ -203,15 +203,15 @@  discard block
 block discarded – undo
203 203
     $value = $encoder->encode($data1, array('auto_dates'));
204 204
     $req = new Request('interopEchoTests.echoValue', array($value));
205 205
     $reqs = array();
206
-    for ($i = 0; $i < 25; $i++) {
206
+    for ($i = 0; $i<25; $i++) {
207 207
         $reqs[] = $req;
208 208
     }
209 209
     $server = explode(':', $args['LOCALSERVER']);
210
-    if (count($server) > 1) {
211
-        $srv = $server[1] . '://' . $server[0] . $args['URI'];
210
+    if (count($server)>1) {
211
+        $srv = $server[1].'://'.$server[0].$args['URI'];
212 212
         $c = new Client($args['URI'], $server[0], $server[1]);
213 213
     } else {
214
-        $srv = $args['LOCALSERVER'] . $args['URI'];
214
+        $srv = $args['LOCALSERVER'].$args['URI'];
215 215
         $c = new Client($args['URI'], $args['LOCALSERVER']);
216 216
     }
217 217
     // do not interfere with http compression
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
     }
226 226
     begin_test($testName, 'http 10');
227 227
     $response = array();
228
-    for ($i = 0; $i < 25; $i++) {
228
+    for ($i = 0; $i<25; $i++) {
229 229
         $resp = $c->send($req);
230 230
         $response[] = $resp->value();
231 231
     }
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
     if (function_exists('curl_init')) {
235 235
         begin_test($testName, 'http 11 w. keep-alive');
236 236
         $response = array();
237
-        for ($i = 0; $i < 25; $i++) {
237
+        for ($i = 0; $i<25; $i++) {
238 238
             $resp = $c->send($req, 10, 'http11');
239 239
             $response[] = $resp->value();
240 240
         }
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
         $c->keepalive = false;
244 244
         begin_test($testName, 'http 11');
245 245
         $response = array();
246
-        for ($i = 0; $i < 25; $i++) {
246
+        for ($i = 0; $i<25; $i++) {
247 247
             $resp = $c->send($req, 10, 'http11');
248 248
             $response[] = $resp->value();
249 249
         }
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 
264 264
         begin_test($testName, 'http 10 w. compression');
265 265
         $response = array();
266
-        for ($i = 0; $i < 25; $i++) {
266
+        for ($i = 0; $i<25; $i++) {
267 267
             $resp = $c->send($req);
268 268
             $response[] = $resp->value();
269 269
         }
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         if (function_exists('curl_init')) {
273 273
             begin_test($testName, 'http 11 w. keep-alive and compression');
274 274
             $response = array();
275
-            for ($i = 0; $i < 25; $i++) {
275
+            for ($i = 0; $i<25; $i++) {
276 276
                 $resp = $c->send($req, 10, 'http11');
277 277
                 $response[] = $resp->value();
278 278
             }
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             $c->keepalive = false;
282 282
             begin_test($testName, 'http 11 w. compression');
283 283
             $response = array();
284
-            for ($i = 0; $i < 25; $i++) {
284
+            for ($i = 0; $i<25; $i++) {
285 285
                 $resp = $c->send($req, 10, 'http11');
286 286
                 $response[] = $resp->value();
287 287
             }
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 foreach ($test_results as $test => $results) {
303 303
     echo "\nTEST: $test\n";
304 304
     foreach ($results as $case => $data) {
305
-        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
305
+        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
306 306
     }
307 307
 }
308 308
 
Please login to merge, or discard this patch.
demo/client/agesort.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 <p></p>
11 11
 <?php
12 12
 
13
-include_once __DIR__ . "/../../src/Autoloader.php";
13
+include_once __DIR__."/../../src/Autoloader.php";
14 14
 PhpXmlRpc\Autoloader::register();
15 15
 
16 16
 $inAr = array("Dave" => 24, "Edd" => 45, "Joe" => 37, "Fred" => 27);
17 17
 print "This is the input data:<br/><pre>";
18 18
 foreach ($inAr as $key => $val) {
19
-    print $key . ", " . $val . "\n";
19
+    print $key.", ".$val."\n";
20 20
 }
21 21
 print "</pre>";
22 22
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     );
33 33
 }
34 34
 $v = new PhpXmlRpc\Value($p, "array");
35
-print "Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n";
35
+print "Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n";
36 36
 
37 37
 // create client and message objects
38 38
 $req = new PhpXmlRpc\Request('examples.sortByAge', array($v));
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
     foreach ($value as $struct) {
53 53
         $name = $struct["name"];
54 54
         $age = $struct["age"];
55
-        print htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n";
55
+        print htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n";
56 56
     }
57 57
 
58
-    print "<hr/>For nerds: I got this value back<br/><pre>" .
59
-        htmlentities($resp->serialize()) . "</pre><hr/>\n";
58
+    print "<hr/>For nerds: I got this value back<br/><pre>".
59
+        htmlentities($resp->serialize())."</pre><hr/>\n";
60 60
 } else {
61 61
     print "An error occurred:<pre>";
62
-    print "Code: " . htmlspecialchars($resp->faultCode()) .
63
-        "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>';
62
+    print "Code: ".htmlspecialchars($resp->faultCode()).
63
+        "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>';
64 64
 }
65 65
 
66 66
 ?>
Please login to merge, or discard this patch.
src/Helper/Logger.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,10 +39,10 @@
 block discarded – undo
39 39
             $flags = ENT_COMPAT;
40 40
             // avoid warnings on php < 5.4...
41 41
             if (defined('ENT_HTML401')) {
42
-                $flags =  $flags | ENT_HTML401;
42
+                $flags = $flags | ENT_HTML401;
43 43
             }
44 44
             if (defined('ENT_SUBSTITUTE')) {
45
-                $flags =  $flags | ENT_SUBSTITUTE;
45
+                $flags = $flags | ENT_SUBSTITUTE;
46 46
             }
47 47
             if ($encoding != null) {
48 48
                 print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";
Please login to merge, or discard this patch.
src/Response.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -117,35 +117,35 @@
 block discarded – undo
117 117
     public function serialize($charsetEncoding = '')
118 118
     {
119 119
         if ($charsetEncoding != '') {
120
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
120
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
121 121
         } else {
122 122
             $this->content_type = 'text/xml';
123 123
         }
124 124
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
125
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
125
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
126 126
         } else {
127 127
             $result = "<methodResponse>\n";
128 128
         }
129 129
         if ($this->errno) {
130 130
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
131
-            $result .= "<fault>\n" .
132
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
133
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
134
-                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
131
+            $result .= "<fault>\n".
132
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
133
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
134
+                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
135 135
                 "</struct>\n</value>\n</fault>";
136 136
         } else {
137 137
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
138 138
                 if (is_string($this->val) && $this->valtyp == 'xml') {
139
-                    $result .= "<params>\n<param>\n" .
140
-                        $this->val .
139
+                    $result .= "<params>\n<param>\n".
140
+                        $this->val.
141 141
                         "</param>\n</params>";
142 142
                 } else {
143 143
                     /// @todo try to build something serializable?
144 144
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
145 145
                 }
146 146
             } else {
147
-                $result .= "<params>\n<param>\n" .
148
-                    $this->val->serialize($charsetEncoding) .
147
+                $result .= "<params>\n<param>\n".
148
+                    $this->val->serialize($charsetEncoding).
149 149
                     "</param>\n</params>";
150 150
             }
151 151
         }
Please login to merge, or discard this patch.
tests/1ParsingBugsTest.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * NB: do not let your IDE fool you. The correct encoding for this file is NOT UTF8.
4 4
  */
5
-include_once __DIR__ . '/../lib/xmlrpc.inc';
6
-include_once __DIR__ . '/../lib/xmlrpcs.inc';
5
+include_once __DIR__.'/../lib/xmlrpc.inc';
6
+include_once __DIR__.'/../lib/xmlrpcs.inc';
7 7
 
8
-include_once __DIR__ . '/parse_args.php';
8
+include_once __DIR__.'/parse_args.php';
9 9
 
10 10
 /**
11 11
  * Tests involving parsing of xml and handling of xmlrpc values
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
     public function testUnicodeInMemberName()
63 63
     {
64
-        $str = "G" . chr(252) . "nter, El" . chr(232) . "ne";
64
+        $str = "G".chr(252)."nter, El".chr(232)."ne";
65 65
         $v = array($str => new xmlrpcval(1));
66 66
         $r = new xmlrpcresp(new xmlrpcval($v, 'struct'));
67 67
         $r = $r->serialize();
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
             '<?xml version="1.0"?>
78 78
 <!-- $Id -->
79 79
 <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments -->
80
-<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
80
+<!-- ' . chr(224).chr(252).chr(232).'&#224;&#252;&#232; -->
81 81
 <methodResponse>
82 82
 <fault>
83 83
 <value>
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 </member>
89 89
 <member>
90 90
 <name>faultString</name>
91
-<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
91
+<value><string>' . chr(224).chr(252).chr(232).'&#224;&#252;&#232;</string></value>
92 92
 </member>
93 93
 </struct>
94 94
 </value>
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $m = $this->newMsg('dummy');
98 98
         $r = $m->parseResponse($response);
99 99
         $v = $r->faultString();
100
-        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
100
+        $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v);
101 101
     }
102 102
 
103 103
     public function testValidNumbers()
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
     public function testI8()
160 160
     {
161
-        if (PHP_INT_SIZE == 4 ) {
161
+        if (PHP_INT_SIZE == 4) {
162 162
             $this->markTestSkipped('did not find a locale which sets decimal separator to comma');
163 163
             return;
164 164
         }
@@ -481,11 +481,11 @@  discard block
 block discarded – undo
481 481
 
482 482
     public function testUTF8Response()
483 483
     {
484
-        $string = chr(224) . chr(252) . chr(232);
484
+        $string = chr(224).chr(252).chr(232);
485 485
 
486 486
         $s = $this->newMsg('dummy');
487
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
488
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
487
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
488
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
489 489
 ';
490 490
         $r = $s->parseResponse($f, false, 'phpvals');
491 491
         $v = $r->value();
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
         $this->assertEquals($string, $v);
494 494
 
495 495
         $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
496
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
496
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
497 497
 ';
498 498
         $r = $s->parseResponse($f, false, 'phpvals');
499 499
         $v = $r->value();
@@ -508,11 +508,11 @@  discard block
 block discarded – undo
508 508
 
509 509
     public function testLatin1Response()
510 510
     {
511
-        $string = chr(224) . chr(252) . chr(232);
511
+        $string = chr(224).chr(252).chr(232);
512 512
 
513 513
         $s = $this->newMsg('dummy');
514
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
515
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
514
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
515
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
516 516
 ';
517 517
         $r = $s->parseResponse($f, false, 'phpvals');
518 518
         $v = $r->value();
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
         $this->assertEquals($string, $v);
521 521
 
522 522
         $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
523
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
523
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
524 524
 ';
525 525
         $r = $s->parseResponse($f, false, 'phpvals');
526 526
         $v = $r->value();
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
         $this->assertequals(1, count($v1));
616 616
         $out = array('me' => array(), 'mytype' => 2, '_php_class' => null);
617 617
 
618
-        foreach($v1 as $key => $val)
618
+        foreach ($v1 as $key => $val)
619 619
         {
620 620
             $this->assertArrayHasKey($key, $out);
621 621
             $expected = $out[$key];
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
         $this->assertequals(2, count($v2));
631 631
         $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object'));
632 632
         $i = 0;
633
-        foreach($v2 as $key => $val)
633
+        foreach ($v2 as $key => $val)
634 634
         {
635 635
             $expected = $out[$i];
636 636
             $this->assertequals($expected['key'], $key);
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
     {
644 644
         // nb: make sure that  the serialized xml corresponding to this is > 10MB in size
645 645
         $data = array();
646
-        for ($i = 0; $i < 500000; $i++ ) {
646
+        for ($i = 0; $i<500000; $i++) {
647 647
             $data[] = 'hello world';
648 648
         }
649 649
 
Please login to merge, or discard this patch.
src/Helper/Charset.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
 
52 52
     private function __construct()
53 53
     {
54
-        for ($i = 0; $i < 32; $i++) {
54
+        for ($i = 0; $i<32; $i++) {
55 55
             $this->xml_iso88591_Entities["in"][] = chr($i);
56 56
             $this->xml_iso88591_Entities["out"][] = "&#{$i};";
57 57
         }
58 58
 
59
-        for ($i = 160; $i < 256; $i++) {
59
+        for ($i = 160; $i<256; $i++) {
60 60
             $this->xml_iso88591_Entities["in"][] = chr($i);
61 61
             $this->xml_iso88591_Entities["out"][] = "&#{$i};";
62 62
         }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $srcEncoding = PhpXmlRpc::$xmlrpc_internalencoding;
94 94
         }
95 95
 
96
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
96
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
97 97
         switch ($conversion) {
98 98
             case 'ISO-8859-1_':
99 99
             case 'ISO-8859-1_US-ASCII':
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
122 122
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
123 123
                 $escapedData = '';
124 124
                 // be kind to users creating string xmlrpc values out of different php types
125
-                $data = (string)$data;
125
+                $data = (string) $data;
126 126
                 $ns = strlen($data);
127
-                for ($nn = 0; $nn < $ns; $nn++) {
127
+                for ($nn = 0; $nn<$ns; $nn++) {
128 128
                     $ch = $data[$nn];
129 129
                     $ii = ord($ch);
130 130
                     // 7 bits: 0bbbbbbb (127)
131
-                    if ($ii < 128) {
131
+                    if ($ii<128) {
132 132
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
133 133
                         switch ($ii) {
134 134
                             case 34:
@@ -152,33 +152,33 @@  discard block
 block discarded – undo
152 152
                     } // 11 bits: 110bbbbb 10bbbbbb (2047)
153 153
                     elseif ($ii >> 5 == 6) {
154 154
                         $b1 = ($ii & 31);
155
-                        $ii = ord($data[$nn + 1]);
155
+                        $ii = ord($data[$nn+1]);
156 156
                         $b2 = ($ii & 63);
157
-                        $ii = ($b1 * 64) + $b2;
157
+                        $ii = ($b1 * 64)+$b2;
158 158
                         $ent = sprintf('&#%d;', $ii);
159 159
                         $escapedData .= $ent;
160 160
                         $nn += 1;
161 161
                     } // 16 bits: 1110bbbb 10bbbbbb 10bbbbbb
162 162
                     elseif ($ii >> 4 == 14) {
163 163
                         $b1 = ($ii & 15);
164
-                        $ii = ord($data[$nn + 1]);
164
+                        $ii = ord($data[$nn+1]);
165 165
                         $b2 = ($ii & 63);
166
-                        $ii = ord($data[$nn + 2]);
166
+                        $ii = ord($data[$nn+2]);
167 167
                         $b3 = ($ii & 63);
168
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
168
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
169 169
                         $ent = sprintf('&#%d;', $ii);
170 170
                         $escapedData .= $ent;
171 171
                         $nn += 2;
172 172
                     } // 21 bits: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
173 173
                     elseif ($ii >> 3 == 30) {
174 174
                         $b1 = ($ii & 7);
175
-                        $ii = ord($data[$nn + 1]);
175
+                        $ii = ord($data[$nn+1]);
176 176
                         $b2 = ($ii & 63);
177
-                        $ii = ord($data[$nn + 2]);
177
+                        $ii = ord($data[$nn+2]);
178 178
                         $b3 = ($ii & 63);
179
-                        $ii = ord($data[$nn + 3]);
179
+                        $ii = ord($data[$nn+3]);
180 180
                         $b4 = ($ii & 63);
181
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
181
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
182 182
                         $ent = sprintf('&#%d;', $ii);
183 183
                         $escapedData .= $ent;
184 184
                         $nn += 3;
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 
214 214
             default:
215 215
                 $escapedData = '';
216
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
216
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
217 217
         }
218 218
 
219 219
         return $escapedData;
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
             case 'iso88591':
268 268
                 return $this->xml_iso88591_Entities;
269 269
             default:
270
-                throw new \Exception('Unsupported charset: ' . $charset);
270
+                throw new \Exception('Unsupported charset: '.$charset);
271 271
         }
272 272
     }
273 273
 
Please login to merge, or discard this patch.
src/Helper/XMLParser.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
         $this->accept = $accept;
134 134
 
135 135
         // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors
136
-        for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
136
+        for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
137 137
             $chunk = substr($data, $offset, $this->maxChunkLength);
138 138
             // error handling: xml not well formed
139
-            if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
139
+            if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
140 140
                 $errCode = xml_get_error_code($parser);
141 141
                 $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
142 142
                     xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
161 161
     {
162 162
         // if invalid xmlrpc already detected, skip all processing
163
-        if ($this->_xh['isf'] < 2) {
163
+        if ($this->_xh['isf']<2) {
164 164
 
165 165
             // check for correct element nesting
166 166
             if (count($this->_xh['stack']) == 0) {
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                     $this->_xh['rt'] = strtolower($name);
180 180
                 } else {
181 181
                     $this->_xh['isf'] = 2;
182
-                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
182
+                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
183 183
 
184 184
                     return;
185 185
                 }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
                     break;
274 274
                 case 'MEMBER':
275 275
                     // set member name to null, in case we do not find in the xml later on
276
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
276
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
277 277
                     //$this->_xh['ac']='';
278 278
                 // Drop trough intentionally
279 279
                 case 'PARAM':
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
      */
334 334
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = true)
335 335
     {
336
-        if ($this->_xh['isf'] < 2) {
336
+        if ($this->_xh['isf']<2) {
337 337
             // push this element name from stack
338 338
             // NB: if XML validates, correct opening/closing is guaranteed and
339 339
             // we do not have to check for $name == $currElem.
@@ -359,8 +359,8 @@  discard block
 block discarded – undo
359 359
                         // check if we are inside an array or struct:
360 360
                         // if value just built is inside an array, let's move it into array on the stack
361 361
                         $vscount = count($this->_xh['valuestack']);
362
-                        if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
363
-                            $this->_xh['valuestack'][$vscount - 1]['values'][] = $temp;
362
+                        if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
363
+                            $this->_xh['valuestack'][$vscount-1]['values'][] = $temp;
364 364
                         } else {
365 365
                             $this->_xh['value'] = $temp;
366 366
                         }
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
                         // check if we are inside an array or struct:
375 375
                         // if value just built is inside an array, let's move it into array on the stack
376 376
                         $vscount = count($this->_xh['valuestack']);
377
-                        if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
378
-                            $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
377
+                        if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
378
+                            $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
379 379
                         }
380 380
                     }
381 381
                     break;
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
                         $this->_xh['value'] = $this->_xh['ac'];
396 396
                     } elseif ($name == 'DATETIME.ISO8601') {
397 397
                         if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
398
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
398
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
399 399
                         }
400 400
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
401 401
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
                         } else {
415 415
                             // log if receiving something strange, even though we set the value to false anyway
416 416
                             if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
417
-                                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
417
+                                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
418 418
                             }
419 419
                             $this->_xh['value'] = false;
420 420
                         }
@@ -424,37 +424,37 @@  discard block
 block discarded – undo
424 424
                         // NOTE: regexp could be much stricter than this...
425 425
                         if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
426 426
                             /// @todo: find a better way of throwing an error than this!
427
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
427
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
428 428
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
429 429
                         } else {
430 430
                             // it's ok, add it on
431
-                            $this->_xh['value'] = (double)$this->_xh['ac'];
431
+                            $this->_xh['value'] = (double) $this->_xh['ac'];
432 432
                         }
433 433
                     } else {
434 434
                         // we have an I4/I8/INT
435 435
                         // we must check that only 0123456789-<space> are characters here
436 436
                         if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
437 437
                             /// @todo find a better way of throwing an error than this!
438
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
438
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
439 439
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
440 440
                         } else {
441 441
                             // it's ok, add it on
442
-                            $this->_xh['value'] = (int)$this->_xh['ac'];
442
+                            $this->_xh['value'] = (int) $this->_xh['ac'];
443 443
                         }
444 444
                     }
445 445
                     $this->_xh['lv'] = 3; // indicate we've found a value
446 446
                     break;
447 447
                 case 'NAME':
448
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
448
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
449 449
                     break;
450 450
                 case 'MEMBER':
451 451
                     // add to array in the stack the last element built,
452 452
                     // unless no VALUE was found
453 453
                     if ($this->_xh['vt']) {
454 454
                         $vscount = count($this->_xh['valuestack']);
455
-                        $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
455
+                        $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
456 456
                     } else {
457
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
457
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
458 458
                     }
459 459
                     break;
460 460
                 case 'DATA':
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
                         $this->_xh['params'][] = $this->_xh['value'];
478 478
                         $this->_xh['pt'][] = $this->_xh['vt'];
479 479
                     } else {
480
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
480
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
481 481
                     }
482 482
                     break;
483 483
                 case 'METHODNAME':
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
     public function xmlrpc_cd($parser, $data)
524 524
     {
525 525
         // skip processing if xml fault already detected
526
-        if ($this->_xh['isf'] < 2) {
526
+        if ($this->_xh['isf']<2) {
527 527
             // "lookforvalue==3" means that we've found an entire value
528 528
             // and should discard any further character data
529 529
             if ($this->_xh['lv'] != 3) {
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
     public function xmlrpc_dh($parser, $data)
542 542
     {
543 543
         // skip processing if xml fault already detected
544
-        if ($this->_xh['isf'] < 2) {
544
+        if ($this->_xh['isf']<2) {
545 545
             if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
546 546
                 $this->_xh['ac'] .= $data;
547 547
             }
@@ -612,8 +612,8 @@  discard block
 block discarded – undo
612 612
         // Details:
613 613
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
614 614
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
615
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
616
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
615
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
616
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
617 617
             $xmlChunk, $matches)) {
618 618
             return strtoupper(substr($matches[2], 1, -1));
619 619
         }
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
632 632
             // IANA also likes better US-ASCII, so go with it
633 633
             if ($enc == 'ASCII') {
634
-                $enc = 'US-' . $enc;
634
+                $enc = 'US-'.$enc;
635 635
             }
636 636
 
637 637
             return $enc;
@@ -666,8 +666,8 @@  discard block
 block discarded – undo
666 666
         // Details:
667 667
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
668 668
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
669
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
670
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
669
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
670
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
671 671
             $xmlChunk, $matches)) {
672 672
             return true;
673 673
         }
Please login to merge, or discard this patch.
src/Helper/Http.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 
23 23
         // read chunk-size, chunk-extension (if any) and crlf
24 24
         // get the position of the linebreak
25
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
25
+        $chunkEnd = strpos($buffer, "\r\n")+2;
26 26
         $temp = substr($buffer, 0, $chunkEnd);
27 27
         $chunkSize = hexdec(trim($temp));
28 28
         $chunkStart = $chunkEnd;
29
-        while ($chunkSize > 0) {
30
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
29
+        while ($chunkSize>0) {
30
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
31 31
 
32 32
             // just in case we got a broken connection
33 33
             if ($chunkEnd == false) {
@@ -39,19 +39,19 @@  discard block
 block discarded – undo
39 39
             }
40 40
 
41 41
             // read chunk-data and crlf
42
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
42
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
43 43
             // append chunk-data to entity-body
44 44
             $new .= $chunk;
45 45
             // length := length + chunk-size
46 46
             $length += strlen($chunk);
47 47
             // read chunk-size and crlf
48
-            $chunkStart = $chunkEnd + 2;
48
+            $chunkStart = $chunkEnd+2;
49 49
 
50
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
50
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
51 51
             if ($chunkEnd == false) {
52 52
                 break; //just in case we got a broken connection
53 53
             }
54
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
54
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
55 55
             $chunkSize = hexdec(trim($temp));
56 56
             $chunkStart = $chunkEnd;
57 57
         }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
      * @return array with keys 'headers' and 'cookies'
69 69
      * @throws \Exception
70 70
      */
71
-    public function parseResponseHeaders(&$data, $headersProcessed = false, $debug=0)
71
+    public function parseResponseHeaders(&$data, $headersProcessed = false, $debug = 0)
72 72
     {
73 73
         $httpResponse = array('raw_data' => $data, 'headers'=> array(), 'cookies' => array());
74 74
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
             // (even though it is not valid http)
79 79
             $pos = strpos($data, "\r\n\r\n");
80 80
             if ($pos || is_int($pos)) {
81
-                $bd = $pos + 4;
81
+                $bd = $pos+4;
82 82
             } else {
83 83
                 $pos = strpos($data, "\n\n");
84 84
                 if ($pos || is_int($pos)) {
85
-                    $bd = $pos + 2;
85
+                    $bd = $pos+2;
86 86
                 } else {
87 87
                     // No separation between response headers and body: fault?
88 88
                     $bd = 0;
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
                 // maybe we could take them into account, too?
94 94
                 $data = substr($data, $bd);
95 95
             } else {
96
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
97
-                throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
96
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
97
+                throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
98 98
             }
99 99
         }
100 100
 
@@ -120,20 +120,20 @@  discard block
 block discarded – undo
120 120
         }
121 121
 
122 122
         if (!preg_match('/^HTTP\/[0-9.]+ 200 /', $data)) {
123
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
124
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
125
-            throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error']);
123
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
124
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
125
+            throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error']);
126 126
         }
127 127
 
128 128
         // be tolerant to usage of \n instead of \r\n to separate headers and data
129 129
         // (even though it is not valid http)
130 130
         $pos = strpos($data, "\r\n\r\n");
131 131
         if ($pos || is_int($pos)) {
132
-            $bd = $pos + 4;
132
+            $bd = $pos+4;
133 133
         } else {
134 134
             $pos = strpos($data, "\n\n");
135 135
             if ($pos || is_int($pos)) {
136
-                $bd = $pos + 2;
136
+                $bd = $pos+2;
137 137
             } else {
138 138
                 // No separation between response headers and body: fault?
139 139
                 // we could take some action here instead of going on...
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
144 144
         // be tolerant to line endings, and extra empty lines
145 145
         $ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));
146 146
 
147
-        foreach($ar as $line) {
147
+        foreach ($ar as $line) {
148 148
             // take care of multi-line headers and cookies
149 149
             $arr = explode(':', $line, 2);
150
-            if (count($arr) > 1) {
150
+            if (count($arr)>1) {
151 151
                 $headerName = strtolower(trim($arr[0]));
152 152
                 /// @todo some other headers (the ones that allow a CSV list of values)
153 153
                 /// do allow many values to be passed using multiple header lines.
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                         // glue together all received cookies, using a comma to separate them
166 166
                         // (same as php does with getallheaders())
167 167
                         if (isset($httpResponse['headers'][$headerName])) {
168
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
168
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
169 169
                         } else {
170 170
                             $httpResponse['headers'][$headerName] = trim($cookie);
171 171
                         }
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                 }
195 195
             } elseif (isset($headerName)) {
196 196
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
197
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
197
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
198 198
             }
199 199
         }
200 200
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
             // Decode chunked encoding sent by http 1.1 servers
219 219
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
220 220
                 if (!$data = Http::decodeChunked($data)) {
221
-                    Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
221
+                    Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
222 222
                     throw new \Exception(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail']);
223 223
                 }
224 224
             }
@@ -233,19 +233,19 @@  discard block
 block discarded – undo
233 233
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
234 234
                             $data = $degzdata;
235 235
                             if ($debug) {
236
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
236
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
237 237
                             }
238 238
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
239 239
                             $data = $degzdata;
240 240
                             if ($debug) {
241
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
241
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
242 242
                             }
243 243
                         } else {
244
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
244
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
245 245
                             throw new \Exception(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail']);
246 246
                         }
247 247
                     } else {
248
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
248
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
249 249
                         throw new \Exception(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress']);
250 250
                     }
251 251
                 }
Please login to merge, or discard this patch.