View GitHub Repository phpxmlrpc

Schedule Inspection
Subscribe
Completed
Push — master ( 3ba560...87b7a4 )
by Gaetano
07:45
created
Status
Category
Toggle Patches
demo/vardemo.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -3,16 +3,16 @@  discard block
 
 block discarded – undo
3 3 
 <body>
4 4 
 <?php
5 5
6 
-include_once __DIR__ . "/../vendor/autoload.php";
6 
+include_once __DIR__."/../vendor/autoload.php";
7 7
8 8 
 $req = new PhpXmlRpc\Request('examples.getStateName');
9 9
10 10 
 print "<h3>Testing value serialization</h3>\n";
11 11
12 12 
 $v = new PhpXmlRpc\Value(23, "int");
13 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
13 
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
14 14 
 $v = new PhpXmlRpc\Value("What are you saying? >> << &&");
15 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
15 
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
16 16
17 17 
 $v = new PhpXmlRpc\Value(
18 18 
     array(
 
@@ -23,7 +23,7 @@  discard block
 
 block discarded – undo
23 23 
     "array"
24 24 
 );
25 25
26 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
26 
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
27 27
28 28 
 $v = new PhpXmlRpc\Value(
29 29 
     array(
 
@@ -51,11 +51,11 @@  discard block
 
 block discarded – undo
51 51 
     "struct"
52 52 
 );
53 53
54 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
54 
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
55 55
56 56 
 $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
57 57
58 
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
58 
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
59 59
60 60 
 $w = new PhpXmlRpc\Value("Mary had a little lamb,
61 61 
 Whose fleece was white as snow,
 
@@ -67,26 +67,26 @@  discard block
 
 block discarded – undo
67 67 
 Ten thousand volts went down its back
68 68 
 And turned it into nylon", "base64"
69 69 
 );
70 
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
71 
-print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
70 
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
71 
+print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
72 72
73 73 
 $req->method('');
74 74 
 $req->addParam(new PhpXmlRpc\Value("41", "int"));
75 75
76 76 
 print "<h3>Testing request serialization</h3>\n";
77 77 
 $op = $req->serialize();
78 
-print "<PRE>" . htmlentities($op) . "</PRE>";
78 
+print "<PRE>".htmlentities($op)."</PRE>";
79 79
80 80 
 print "<h3>Testing ISO date format</h3><pre>\n";
81 81
82 82 
 $t = time();
83 83 
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
84 84 
 print "Now is $t --> $date\n";
85 
-print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n";
85 
+print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n";
86 86 
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
87 87 
 print "That is to say $date --> $tb\n";
88 
-print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n";
89 
-print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($date, 1) . "\n";
88 
+print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n";
89 
+print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($date, 1)."\n";
90 90
91 91 
 print "</pre>\n";
92 92
Please login to merge, or discard this patch.
tests/4LocalhostMultiTest.php 2 patches
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -182,8 +182,7 @@  discard block
 
 block discarded – undo
182 182 
         {
183 183 
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
184 184 
             return;
185 
-        }
186 
-        else if ($this->args['PROXYSERVER'] == '')
185 
+        } else if ($this->args['PROXYSERVER'] == '')
187 186 
         {
188 187 
             $this->markTestSkipped('PROXY definition missing: cannot test proxy w. http 1.1');
189 188 
             return;
 
@@ -207,8 +206,7 @@  discard block
 
 block discarded – undo
207 206 
         {
208 207 
             $this->markTestSkipped('CURL missing: cannot test https functionality');
209 208 
             return;
210 
-        }
211 
-        else if ($this->args['HTTPSSERVER'] == '')
209 
+        } else if ($this->args['HTTPSSERVER'] == '')
212 210 
         {
213 211 
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
214 212 
             return;
 
@@ -235,13 +233,11 @@  discard block
 
 block discarded – undo
235 233 
         {
236 234 
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
237 235 
             return;
238 
-        }
239 
-        else if ($this->args['PROXYSERVER'] == '')
236 
+        } else if ($this->args['PROXYSERVER'] == '')
240 237 
         {
241 238 
             $this->markTestSkipped('PROXY definition missing: cannot test proxy w. https');
242 239 
             return;
243 
-        }
244 
-        else if ($this->args['HTTPSSERVER'] == '')
240 
+        } else if ($this->args['HTTPSSERVER'] == '')
245 241 
         {
246 242 
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
247 243 
             return;
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch 
@@ -1,11 +1,11 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2
3 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
4 
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
3 
+include_once __DIR__.'/../lib/xmlrpc.inc';
4 
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
5 5
6 
-include_once __DIR__ . '/parse_args.php';
6 
+include_once __DIR__.'/parse_args.php';
7 7
8 
-include_once __DIR__ . '/3LocalhostTest.php';
8 
+include_once __DIR__.'/3LocalhostTest.php';
9 9
10 10 
 /**
11 11 
  * Tests which stress http features of the library.
 
@@ -27,9 +27,9 @@  discard block
 
 block discarded – undo
27 27 
         );
28 28
29 29 
         $methods = array();
30 
-        foreach(get_class_methods('LocalhostTest') as $method)
30 
+        foreach (get_class_methods('LocalhostTest') as $method)
31 31 
         {
32 
-            if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
32 
+            if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
33 33 
             {
34 34 
                 if (!isset(self::$failed_tests[$method])) {
35 35 
                     $methods[$method] = array($method);
 
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46 
      */
47 47 
     public function testDeflate($method)
48 48 
     {
49 
-        if(!function_exists('gzdeflate'))
49 
+        if (!function_exists('gzdeflate'))
50 50 
         {
51 51 
             $this->markTestSkipped('Zlib missing: cannot test deflate functionality');
52 52 
             return;
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
      */
65 65 
     public function testGzip($method)
66 66 
     {
67 
-        if(!function_exists('gzdeflate'))
67 
+        if (!function_exists('gzdeflate'))
68 68 
         {
69 69 
             $this->markTestSkipped('Zlib missing: cannot test gzip functionality');
70 70 
             return;
 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78
79 79 
     public function testKeepAlives()
80 80 
     {
81 
-        if(!function_exists('curl_init'))
81 
+        if (!function_exists('curl_init'))
82 82 
         {
83 83 
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
84 84 
             return;
 
@@ -118,7 +118,7 @@  discard block
 
 block discarded – undo
118 118 
      */
119 119 
     public function testHttp11($method)
120 120 
     {
121 
-        if(!function_exists('curl_init'))
121 
+        if (!function_exists('curl_init'))
122 122 
         {
123 123 
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
124 124 
             return;
 
@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
      */
138 138 
     public function testHttp10Curl($method)
139 139 
     {
140 
-        if(!function_exists('curl_init'))
140 
+        if (!function_exists('curl_init'))
141 141 
         {
142 142 
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
143 143 
             return;
 
@@ -157,7 +157,7 @@  discard block
 
 block discarded – undo
157 157 
      */
158 158 
     public function testHttp11Gzip($method)
159 159 
     {
160 
-        if(!function_exists('curl_init'))
160 
+        if (!function_exists('curl_init'))
161 161 
         {
162 162 
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
163 163 
             return;
 
@@ -177,7 +177,7 @@  discard block
 
 block discarded – undo
177 177 
      */
178 178 
     public function testHttp11Deflate($method)
179 179 
     {
180 
-        if(!function_exists('curl_init'))
180 
+        if (!function_exists('curl_init'))
181 181 
         {
182 182 
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
183 183 
             return;
 
@@ -197,7 +197,7 @@  discard block
 
 block discarded – undo
197 197 
      */
198 198 
     public function testHttp11Proxy($method)
199 199 
     {
200 
-        if(!function_exists('curl_init'))
200 
+        if (!function_exists('curl_init'))
201 201 
         {
202 202 
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
203 203 
             return;
 
@@ -222,7 +222,7 @@  discard block
 
 block discarded – undo
222 222 
      */
223 223 
     public function testHttps($method)
224 224 
     {
225 
-        if(!function_exists('curl_init'))
225 
+        if (!function_exists('curl_init'))
226 226 
         {
227 227 
             $this->markTestSkipped('CURL missing: cannot test https functionality');
228 228 
             return;
 
@@ -274,7 +274,7 @@  discard block
 
 block discarded – undo
274 274 
      */
275 275 
     public function testHttpsProxy($method)
276 276 
     {
277 
-        if(!function_exists('curl_init'))
277 
+        if (!function_exists('curl_init'))
278 278 
         {
279 279 
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
280 280 
             return;
Please login to merge, or discard this patch.
lib/xmlrpcs.inc 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -52,7 +52,7 @@  discard block
 
 block discarded – undo
52 52 
      */
53 53 
     public function echoInput()
54 54 
     {
55 
-        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
55 
+        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
56 56 
         print $r->serialize();
57 57 
     }
58 58 
 }
 
@@ -68,30 +68,30 @@  discard block
 
 block discarded – undo
68 68 
     PhpXmlRpc\Server::xmlrpc_debugmsg($m);
69 69 
 }
70 70
71 
-function _xmlrpcs_getCapabilities($server, $m=null)
71 
+function _xmlrpcs_getCapabilities($server, $m = null)
72 72 
 {
73 73 
     return PhpXmlRpc\Server::_xmlrpcs_getCapabilities($server, $m);
74 74 
 }
75 75
76 
-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
77 
-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
78 
-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
79 
-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
76 
+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
77 
+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
78 
+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
79 
+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
80 80 
 {
81 81 
     return PhpXmlRpc\Server::_xmlrpcs_listMethods($server, $m);
82 82 
 }
83 83
84 
-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
85 
-$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
86 
-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
84 
+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
85 
+$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
86 
+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
87 87 
 function _xmlrpcs_methodSignature($server, $m)
88 88 
 {
89 89 
     return PhpXmlRpc\Server::_xmlrpcs_methodSignature($server, $m);
90 90 
 }
91 91
92 
-$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
93 
-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
94 
-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
92 
+$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
93 
+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
94 
+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
95 95 
 function _xmlrpcs_methodHelp($server, $m)
96 96 
 {
97 97 
     return PhpXmlRpc\Server::_xmlrpcs_methodHelp($server, $m);
Please login to merge, or discard this patch.
demo/client/mail.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -20,7 +20,7 @@  discard block
 
 block discarded – undo
20 20 
     method)</p>
21 21 
 <?php
22 22
23 
-include_once __DIR__ . "/../../src/Autoloader.php";
23 
+include_once __DIR__."/../../src/Autoloader.php";
24 24 
 PhpXmlRpc\Autoloader::register();
25 25
26 26 
 if (isset($_POST["mailto"]) && $_POST["mailto"]) {
 
@@ -44,8 +44,8 @@  discard block
 
 block discarded – undo
44 44 
         print "<font color=\"red\">";
45 45 
         print "Mail send failed<br/>\n";
46 46 
         print "Fault: ";
47 
-        print "Code: " . htmlspecialchars($resp->faultCode()) .
48 
-            " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>";
47 
+        print "Code: ".htmlspecialchars($resp->faultCode()).
48 
+            " Reason: '".htmlspecialchars($resp->faultString())."'<br/>";
49 49 
         print "</font><br/>";
50 50 
     }
51 51 
 }
Please login to merge, or discard this patch.
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/Helper/XMLParser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -75,7 +75,7 @@
 
 block discarded – undo
75 75 
     protected $maxChunkLength = 4194304;
76 76
77 77 
     /**
78 
-     * @param array $options passed to the xml parser
78 
+     * @param string[] $options passed to the xml parser
79 79 
      */
80 80 
     public function __construct(array $options = array())
81 81 
     {
Please login to merge, or discard this 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.