Inspection of "nitpicks" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 314870...f47fb2 )

by Gaetano

created 2022-11-25 16:41 UTC

Status

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Webservice wrappper demo</title></head>
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
 $resp = $client->send(new PhpXmlRpc\Request('system.listMethods'));
 if ($resp->faultCode()) {
-    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n");
+    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n");
 } else {
     output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n");
     flush();
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
         if ($methodName == 'examples.getStateName') {
             $callable = $wrapper->wrapXmlrpcMethod($client, $methodName);
             if ($callable) {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n");
             } else {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n");
             }
             break;
         }
@@ -53,4 +53,4 @@  discard block
 block discarded – undo
 
 output("</body></html>\n");
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

Please login to merge, or discard this patch.

demo/client/which.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Which toolkit demo</title></head>
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
     $value = $encoder->decode($resp->value());
     output("Toolkit info:<br/>\n");
     output("<pre>");
-    output("name: " . htmlspecialchars($value["toolkitName"]) . "\n");
-    output("version: " . htmlspecialchars($value["toolkitVersion"]) . "\n");
-    output("docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n");
-    output("os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n");
+    output("name: ".htmlspecialchars($value["toolkitName"])."\n");
+    output("version: ".htmlspecialchars($value["toolkitVersion"])."\n");
+    output("docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n");
+    output("os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n");
     output("</pre>");
 } else {
     output("An error occurred: ");
-    output("Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n");
+    output("Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n");
 }
 
 output("</body></html>\n");
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

Please login to merge, or discard this patch.

demo/client/proxy.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>xmlrpc - Proxy demo</title></head>
		@@ -77,4 +77,4 @@ discard block
		block discarded – undo
77	77
78	78	output("</body></html>\n");
79	79
80		-require_once __DIR__ . "/_append.php";
	80	+require_once __DIR__."/_append.php";

Please login to merge, or discard this patch.

demo/client/mail.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Mail demo</title></head>
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
         output("<font color=\"red\">");
         output("Mail send failed<br/>\n");
         output("Fault: ");
-        output("Code: " . htmlspecialchars($resp->faultCode()) .
-            " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>");
+        output("Code: ".htmlspecialchars($resp->faultCode()).
+            " Reason: '".htmlspecialchars($resp->faultString())."'<br/>");
         output("</font><br/>");
     }
 }
@@ -57,4 +57,4 @@  discard block
 block discarded – undo
 </html>
 ');
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

Please login to merge, or discard this patch.

extras/benchmark.php 1 patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -19,9 +19,9 @@  discard block
 block discarded – undo
 use PhpXmlRpc\Encoder;
 
 /// @todo allow autoloading when the library is installed as dependency
-include_once __DIR__ . '/../vendor/autoload.php';
+include_once __DIR__.'/../vendor/autoload.php';
 
-include __DIR__ . '/../tests/parse_args.php';
+include __DIR__.'/../tests/parse_args.php';
 $args = argParser::getArgs();
 
 function begin_test($test_name, $test_case)
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     if (!isset($test_results[$test_name][$test_case])) {
         trigger_error('ending test that was not started');
     }
-    $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
+    $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
     $test_results[$test_name][$test_case]['result'] = $test_result;
     echo '.';
     flush();
@@ -75,24 +75,24 @@  discard block
 block discarded – undo
 }
 
 if ($is_web) {
-    echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
+    echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
     if ($xd) {
-        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
+        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
     }
     flush();
     ob_flush();
 } else {
-    echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
+    echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
     if ($xd) {
-        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
+        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
     }
 }
 
 // test 'manual style' data encoding vs. 'automatic style' encoding
 begin_test('Data encoding (large array)', 'manual encoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $vals = array();
-    for ($j = 0; $j < 10; $j++) {
+    for ($j = 0; $j<10; $j++) {
         $valarray = array();
         foreach ($data[$j] as $key => $val) {
             $values = array();
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
 
 begin_test('Data encoding (large array)', 'automatic encoding');
 $encoder = new Encoder();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $value = $encoder->encode($data, array('auto_dates'));
     $out = $value->serialize();
 }
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
 
 if (function_exists('xmlrpc_set_type')) {
     begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
-    for ($i = 0; $i < $num_tests; $i++) {
-        for ($j = 0; $j < 10; $j++) {
+    for ($i = 0; $i<$num_tests; $i++) {
+        for ($j = 0; $j<10; $j++) {
             foreach ($keys as $k) {
                 xmlrpc_set_type($data[$j][$k][4], 'datetime');
                 xmlrpc_set_type($data[$j][$k][8], 'datetime');
@@ -140,18 +140,18 @@  discard block
 block discarded – undo
 // test 'old style' data decoding vs. 'automatic style' decoding
 $dummy = new Request('');
 $out = new Response($value);
-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
 
 begin_test('Data decoding (large array)', 'manual decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
-    foreach($value as $val1) {
+    foreach ($value as $val1) {
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
-            foreach($val as $data) {
+            foreach ($val as $data) {
                 $out[$name][] = $data->scalarval();
             }
         }
@@ -161,18 +161,18 @@  discard block
 block discarded – undo
 end_test('Data decoding (large array)', 'manual decoding', $result);
 
 begin_test('Data decoding (large array)', 'manual decoding deprecated');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
     $l = $value->arraysize();
-    for ($k = 0; $k < $l; $k++) {
+    for ($k = 0; $k<$l; $k++) {
         $val1 = $value->arraymem($k);
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
             $m = $val->arraysize();
-            for ($j = 0; $j < $m; $j++) {
+            for ($j = 0; $j<$m; $j++) {
                 $data = $val->arraymem($j);
                 $out[$name][] = $data->scalarval();
             }
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
 
 begin_test('Data decoding (large array)', 'automatic decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true, 'phpvals');
     $value = $response->value();
 }
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 
 if (function_exists('xmlrpc_decode')) {
     begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $response = $dummy->ParseResponse($in, true, 'xml');
         $value = xmlrpc_decode($response->value());
     }
@@ -208,16 +208,16 @@  discard block
 block discarded – undo
     $value = $encoder->encode($data1, array('auto_dates'));
     $req = new Request('interopEchoTests.echoValue', array($value));
     $reqs = array();
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $reqs[] = $req;
     }
 
     $server = explode(':', $args['HTTPSERVER']);
-    if (count($server) > 1) {
-        $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI'];
+    if (count($server)>1) {
+        $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $server[0], $server[1]);
     } else {
-        $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI'];
+        $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $args['HTTPSERVER']);
     }
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
 
     begin_test($testName, 'http 10');
     $response = array();
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $resp = $c->send($req);
         $response[] = $resp->value();
     }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
         $c->keepalive = false;
         begin_test($testName, 'http 11 no keepalive');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
 
         begin_test($testName, 'http 11 w. keep-alive');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
 
         begin_test($testName, 'http 10 w. compression');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
             $c->keepalive = false;
             begin_test($testName, 'http 11 w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
             $c->keepalive = true;
             begin_test($testName, 'http 11 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -309,11 +309,11 @@  discard block
 block discarded – undo
         /// test multicall vs. many calls vs. keep-alives - HTTPS
 
         $server = explode(':', $args['HTTPSSERVER']);
-        if (count($server) > 1) {
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
+        if (count($server)>1) {
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
         } else {
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https');
         }
         $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
         begin_test($testName, 'https no keep-alive');
         $c->keepalive = false;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
         begin_test($testName, 'https w. keep-alive');
         $c->keepalive = true;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10);
             $response[] = $resp->value();
         }
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
             $c->keepalive = false;
             begin_test($testName, 'https w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req);
                 $response[] = $resp->value();
             }
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
             $c->keepalive = true;
             begin_test($testName, 'https w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10);
                 $response[] = $resp->value();
             }
@@ -387,11 +387,11 @@  discard block
 block discarded – undo
         /// test multicall vs. many calls vs. keep-alives - HTTP/2
 
         $server = explode(':', $args['HTTPSSERVER']);
-        if (count($server) > 1) {
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
+        if (count($server)>1) {
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
         } else {
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2');
         }
         $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
         begin_test($testName, 'http2 no keep-alive');
         $c->keepalive = false;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
         begin_test($testName, 'http2 w. keep-alive');
         $c->keepalive = true;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10);
             $response[] = $resp->value();
         }
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
             $c->keepalive = false;
             begin_test($testName, 'http2 w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req);
                 $response[] = $resp->value();
             }
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
             $c->keepalive = true;
             begin_test($testName, 'http2 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10);
                 $response[] = $resp->value();
             }
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
 foreach ($test_results as $test => $results) {
     echo "\nTEST: $test\n";
     foreach ($results as $case => $data) {
-        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
+        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
     }
 }
 

Please login to merge, or discard this patch.

src/Value.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -119,7 +119,7 @@  discard block
 block discarded – undo
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -279,19 +279,19 @@  discard block
 block discarded – undo
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
+                        $rs .= "<${typ}>".base64_encode($val)."</${typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+                        $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs .= "<${typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>";
+                        $rs .= "<${typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs .= "<${typ}>" . (int)$val . "</${typ}>";
+                        $rs .= "<${typ}>".(int) $val."</${typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -299,16 +299,16 @@  discard block
 block discarded – undo
                         // sprintf('%F') could be most likely ok but it fails eg. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</${typ}>";
+                        $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</${typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs .= "<${typ}>${val}</${typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>";
+                            $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";
                         } elseif (is_int($val)) {
-                            $rs .= "<${typ}>" . date('Ymd\TH:i:s', $val) . "</${typ}>";
+                            $rs .= "<${typ}>".date('Ymd\TH:i:s', $val)."</${typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs .= "<${typ}>${val}</${typ}>";
@@ -330,14 +330,14 @@  discard block
 block discarded – undo
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs .= '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs .= "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**

Please login to merge, or discard this patch.

tests/PolyfillTestCase.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -2,20 +2,20 @@
 block discarded – undo
 
 use PHPUnit\Runner\Version as PHPUnit_Version;
 
-if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true
-    && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false
+if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true
+    && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false
 ) {
-    class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' );
+    class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage');
 }
 
-if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true
-    && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false
+if (class_exists('PHPUnit_Runner_BaseTestRunner') === true
+    && class_exists('PHPUnit\Runner\BaseTestRunner') === false
 ) {
-    class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' );
+    class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner');
 }
 
 if (class_exists('PHPUnit\Runner\Version') === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) {
-    include_once __DIR__ . '/PolyfillTestCase7.php';
+    include_once __DIR__.'/PolyfillTestCase7.php';
 } else {
-    include_once __DIR__ . '/PolyfillTestCase8.php';
+    include_once __DIR__.'/PolyfillTestCase8.php';
 }

Please login to merge, or discard this patch.

src/Response.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -151,35 +151,35 @@  discard block
 block discarded – undo
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
                 "</struct>\n</value>\n</fault>";
         } else {
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
                 if (is_string($this->val) && $this->valtyp == 'xml') {
-                    $result .= "<params>\n<param>\n" .
-                        $this->val .
+                    $result .= "<params>\n<param>\n".
+                        $this->val.
                         "</param>\n</params>";
                 } else {
                     /// @todo try to build something serializable using the Encoder...
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
                 }
             } else {
-                $result .= "<params>\n<param>\n" .
-                    $this->val->serialize($charsetEncoding) .
+                $result .= "<params>\n<param>\n".
+                    $this->val->serialize($charsetEncoding).
                     "</param>\n</params>";
             }
         }
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
     {
         //trigger_error('getting property Response::' . $name . ' is deprecated', E_USER_DEPRECATED);
 
-        switch($name) {
+        switch ($name) {
             case 'hdrs':
                 return $this->httpResponse['headers'];
             case '_cookies':
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
                 return $this->httpResponse['raw_data'];
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 return null;
         }
     }
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
     {
         //trigger_error('setting property Response::' . $name . ' is deprecated', E_USER_DEPRECATED);
 
-        switch($name) {
+        switch ($name) {
             case 'hdrs':
                 $this->httpResponse['headers'] = $value;
                 break;
@@ -225,13 +225,13 @@  discard block
 block discarded – undo
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
     public function __isset($name)
     {
-        switch($name) {
+        switch ($name) {
             case 'hdrs':
                 return isset($this->httpResponse['headers']);
             case '_cookies':
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 
     public function __unset($name)
     {
-        switch($name) {
+        switch ($name) {
             case 'hdrs':
                 unset($this->httpResponse['headers']);
                 break;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

Please login to merge, or discard this patch.

src/Request.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -90,9 +90,9 @@  discard block
 block discarded – undo
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -112,16 +112,16 @@  discard block
 block discarded – undo
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
         // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -286,9 +286,9 @@  discard block
 block discarded – undo
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
             }
         }
 
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
                     if (extension_loaded('mbstring')) {
                         $data = mb_convert_encoding($data, 'UTF-8', $respEncoding);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -332,12 +332,12 @@  discard block
 block discarded – undo
         $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
 
         // first error check: xml not well formed
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
 
             // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
         // second error check: xml well formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
                 '', $this->httpResponse
             );
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debugMessage(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );

Please login to merge, or discard this patch.

		@@ -151,35 +151,35 @@ discard block
		block discarded – undo
151	151	public function serialize($charsetEncoding = '')
152	152	{
153	153	if ($charsetEncoding != '') {
154		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	154	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
155	155	} else {
156	156	$this->content_type = 'text/xml';
157	157	}
158	158	if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
159		- $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
	159	+ $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
160	160	} else {
161	161	$result = "<methodResponse>\n";
162	162	}
163	163	if ($this->errno) {
164	164	// Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
165		- $result .= "<fault>\n" .
166		- "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
167		- "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
168		- Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
	165	+ $result .= "<fault>\n".
	166	+ "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
	167	+ "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
	168	+ Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
169	169	"</struct>\n</value>\n</fault>";
170	170	} else {
171	171	if (!is_object($this->val) \|\| !is_a($this->val, 'PhpXmlRpc\Value')) {
172	172	if (is_string($this->val) && $this->valtyp == 'xml') {
173		- $result .= "<params>\n<param>\n" .
174		- $this->val .
	173	+ $result .= "<params>\n<param>\n".
	174	+ $this->val.
175	175	"</param>\n</params>";
176	176	} else {
177	177	/// @todo try to build something serializable using the Encoder...
178	178	throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
179	179	}
180	180	} else {
181		- $result .= "<params>\n<param>\n" .
182		- $this->val->serialize($charsetEncoding) .
	181	+ $result .= "<params>\n<param>\n".
	182	+ $this->val->serialize($charsetEncoding).
183	183	"</param>\n</params>";
184	184	}
185	185	}
		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	{
196	196	//trigger_error('getting property Response::' . $name . ' is deprecated', E_USER_DEPRECATED);
197	197
198		- switch($name) {
	198	+ switch ($name) {
199	199	case 'hdrs':
200	200	return $this->httpResponse['headers'];
201	201	case '_cookies':
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	return $this->httpResponse['raw_data'];
205	205	default:
206	206	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
207		- trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	207	+ trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
208	208	return null;
209	209	}
210	210	}
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	{
214	214	//trigger_error('setting property Response::' . $name . ' is deprecated', E_USER_DEPRECATED);
215	215
216		- switch($name) {
	216	+ switch ($name) {
217	217	case 'hdrs':
218	218	$this->httpResponse['headers'] = $value;
219	219	break;
		@@ -225,13 +225,13 @@ discard block
		block discarded – undo
225	225	break;
226	226	default:
227	227	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
228		- trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	228	+ trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
229	229	}
230	230	}
231	231
232	232	public function __isset($name)
233	233	{
234		- switch($name) {
	234	+ switch ($name) {
235	235	case 'hdrs':
236	236	return isset($this->httpResponse['headers']);
237	237	case '_cookies':
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245
246	246	public function __unset($name)
247	247	{
248		- switch($name) {
	248	+ switch ($name) {
249	249	case 'hdrs':
250	250	unset($this->httpResponse['headers']);
251	251	break;
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	break;
258	258	default:
259	259	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
260		- trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	260	+ trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
261	261	}
262	262	}
263	263	}

		@@ -19,9 +19,9 @@ discard block
		block discarded – undo
19	19	use PhpXmlRpc\Encoder;
20	20
21	21	/// @todo allow autoloading when the library is installed as dependency
22		-include_once __DIR__ . '/../vendor/autoload.php';
	22	+include_once __DIR__.'/../vendor/autoload.php';
23	23
24		-include __DIR__ . '/../tests/parse_args.php';
	24	+include __DIR__.'/../tests/parse_args.php';
25	25	$args = argParser::getArgs();
26	26
27	27	function begin_test($test_name, $test_case)
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	if (!isset($test_results[$test_name][$test_case])) {
42	42	trigger_error('ending test that was not started');
43	43	}
44		- $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
	44	+ $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
45	45	$test_results[$test_name][$test_case]['result'] = $test_result;
46	46	echo '.';
47	47	flush();
		@@ -75,24 +75,24 @@ discard block
		block discarded – undo
75	75	}
76	76
77	77	if ($is_web) {
78		- echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
	78	+ echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
79	79	if ($xd) {
80		- echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
	80	+ echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
81	81	}
82	82	flush();
83	83	ob_flush();
84	84	} else {
85		- echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
	85	+ echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
86	86	if ($xd) {
87		- echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
	87	+ echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
88	88	}
89	89	}
90	90
91	91	// test 'manual style' data encoding vs. 'automatic style' encoding
92	92	begin_test('Data encoding (large array)', 'manual encoding');
93		-for ($i = 0; $i < $num_tests; $i++) {
	93	+for ($i = 0; $i<$num_tests; $i++) {
94	94	$vals = array();
95		- for ($j = 0; $j < 10; $j++) {
	95	+ for ($j = 0; $j<10; $j++) {
96	96	$valarray = array();
97	97	foreach ($data[$j] as $key => $val) {
98	98	$values = array();
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117
118	118	begin_test('Data encoding (large array)', 'automatic encoding');
119	119	$encoder = new Encoder();
120		-for ($i = 0; $i < $num_tests; $i++) {
	120	+for ($i = 0; $i<$num_tests; $i++) {
121	121	$value = $encoder->encode($data, array('auto_dates'));
122	122	$out = $value->serialize();
123	123	}
		@@ -125,8 +125,8 @@ discard block
		block discarded – undo
125	125
126	126	if (function_exists('xmlrpc_set_type')) {
127	127	begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
128		- for ($i = 0; $i < $num_tests; $i++) {
129		- for ($j = 0; $j < 10; $j++) {
	128	+ for ($i = 0; $i<$num_tests; $i++) {
	129	+ for ($j = 0; $j<10; $j++) {
130	130	foreach ($keys as $k) {
131	131	xmlrpc_set_type($data[$j][$k][4], 'datetime');
132	132	xmlrpc_set_type($data[$j][$k][8], 'datetime');
		@@ -140,18 +140,18 @@ discard block
		block discarded – undo
140	140	// test 'old style' data decoding vs. 'automatic style' decoding
141	141	$dummy = new Request('');
142	142	$out = new Response($value);
143		-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
	143	+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
144	144
145	145	begin_test('Data decoding (large array)', 'manual decoding');
146		-for ($i = 0; $i < $num_tests; $i++) {
	146	+for ($i = 0; $i<$num_tests; $i++) {
147	147	$response = $dummy->ParseResponse($in, true);
148	148	$value = $response->value();
149	149	$result = array();
150		- foreach($value as $val1) {
	150	+ foreach ($value as $val1) {
151	151	$out = array();
152		- foreach($val1 as $name => $val) {
	152	+ foreach ($val1 as $name => $val) {
153	153	$out[$name] = array();
154		- foreach($val as $data) {
	154	+ foreach ($val as $data) {
155	155	$out[$name][] = $data->scalarval();
156	156	}
157	157	}
		@@ -161,18 +161,18 @@ discard block
		block discarded – undo
161	161	end_test('Data decoding (large array)', 'manual decoding', $result);
162	162
163	163	begin_test('Data decoding (large array)', 'manual decoding deprecated');
164		-for ($i = 0; $i < $num_tests; $i++) {
	164	+for ($i = 0; $i<$num_tests; $i++) {
165	165	$response = $dummy->ParseResponse($in, true);
166	166	$value = $response->value();
167	167	$result = array();
168	168	$l = $value->arraysize();
169		- for ($k = 0; $k < $l; $k++) {
	169	+ for ($k = 0; $k<$l; $k++) {
170	170	$val1 = $value->arraymem($k);
171	171	$out = array();
172		- foreach($val1 as $name => $val) {
	172	+ foreach ($val1 as $name => $val) {
173	173	$out[$name] = array();
174	174	$m = $val->arraysize();
175		- for ($j = 0; $j < $m; $j++) {
	175	+ for ($j = 0; $j<$m; $j++) {
176	176	$data = $val->arraymem($j);
177	177	$out[$name][] = $data->scalarval();
178	178	}
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
184	184
185	185	begin_test('Data decoding (large array)', 'automatic decoding');
186		-for ($i = 0; $i < $num_tests; $i++) {
	186	+for ($i = 0; $i<$num_tests; $i++) {
187	187	$response = $dummy->ParseResponse($in, true, 'phpvals');
188	188	$value = $response->value();
189	189	}
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191
192	192	if (function_exists('xmlrpc_decode')) {
193	193	begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
194		- for ($i = 0; $i < $num_tests; $i++) {
	194	+ for ($i = 0; $i<$num_tests; $i++) {
195	195	$response = $dummy->ParseResponse($in, true, 'xml');
196	196	$value = xmlrpc_decode($response->value());
197	197	}
		@@ -208,16 +208,16 @@ discard block
		block discarded – undo
208	208	$value = $encoder->encode($data1, array('auto_dates'));
209	209	$req = new Request('interopEchoTests.echoValue', array($value));
210	210	$reqs = array();
211		- for ($i = 0; $i < $num_tests; $i++) {
	211	+ for ($i = 0; $i<$num_tests; $i++) {
212	212	$reqs[] = $req;
213	213	}
214	214
215	215	$server = explode(':', $args['HTTPSERVER']);
216		- if (count($server) > 1) {
217		- $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI'];
	216	+ if (count($server)>1) {
	217	+ $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI'];
218	218	$c = new Client($args['HTTPURI'], $server[0], $server[1]);
219	219	} else {
220		- $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI'];
	220	+ $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI'];
221	221	$c = new Client($args['HTTPURI'], $args['HTTPSERVER']);
222	222	}
223	223
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229
230	230	begin_test($testName, 'http 10');
231	231	$response = array();
232		- for ($i = 0; $i < $num_tests; $i++) {
	232	+ for ($i = 0; $i<$num_tests; $i++) {
233	233	$resp = $c->send($req);
234	234	$response[] = $resp->value();
235	235	}
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239	$c->keepalive = false;
240	240	begin_test($testName, 'http 11 no keepalive');
241	241	$response = array();
242		- for ($i = 0; $i < $num_tests; $i++) {
	242	+ for ($i = 0; $i<$num_tests; $i++) {
243	243	$resp = $c->send($req, 10, 'http11');
244	244	$response[] = $resp->value();
245	245	}
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247
248	248	begin_test($testName, 'http 11 w. keep-alive');
249	249	$response = array();
250		- for ($i = 0; $i < $num_tests; $i++) {
	250	+ for ($i = 0; $i<$num_tests; $i++) {
251	251	$resp = $c->send($req, 10, 'http11');
252	252	$response[] = $resp->value();
253	253	}
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269
270	270	begin_test($testName, 'http 10 w. compression');
271	271	$response = array();
272		- for ($i = 0; $i < $num_tests; $i++) {
	272	+ for ($i = 0; $i<$num_tests; $i++) {
273	273	$resp = $c->send($req);
274	274	$response[] = $resp->value();
275	275	}
		@@ -279,7 +279,7 @@ discard block
		block discarded – undo
279	279	$c->keepalive = false;
280	280	begin_test($testName, 'http 11 w. compression and no keepalive');
281	281	$response = array();
282		- for ($i = 0; $i < $num_tests; $i++) {
	282	+ for ($i = 0; $i<$num_tests; $i++) {
283	283	$resp = $c->send($req, 10, 'http11');
284	284	$response[] = $resp->value();
285	285	}
		@@ -288,7 +288,7 @@ discard block
		block discarded – undo
288	288	$c->keepalive = true;
289	289	begin_test($testName, 'http 11 w. keep-alive and compression');
290	290	$response = array();
291		- for ($i = 0; $i < $num_tests; $i++) {
	291	+ for ($i = 0; $i<$num_tests; $i++) {
292	292	$resp = $c->send($req, 10, 'http11');
293	293	$response[] = $resp->value();
294	294	}
		@@ -309,11 +309,11 @@ discard block
		block discarded – undo
309	309	/// test multicall vs. many calls vs. keep-alives - HTTPS
310	310
311	311	$server = explode(':', $args['HTTPSSERVER']);
312		- if (count($server) > 1) {
313		- $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
	312	+ if (count($server)>1) {
	313	+ $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
314	314	$c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
315	315	} else {
316		- $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
	316	+ $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
317	317	$c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https');
318	318	}
319	319	$c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
		@@ -327,7 +327,7 @@ discard block
		block discarded – undo
327	327	begin_test($testName, 'https no keep-alive');
328	328	$c->keepalive = false;
329	329	$response = array();
330		- for ($i = 0; $i < $num_tests; $i++) {
	330	+ for ($i = 0; $i<$num_tests; $i++) {
331	331	$resp = $c->send($req);
332	332	$response[] = $resp->value();
333	333	}
		@@ -336,7 +336,7 @@ discard block
		block discarded – undo
336	336	begin_test($testName, 'https w. keep-alive');
337	337	$c->keepalive = true;
338	338	$response = array();
339		- for ($i = 0; $i < $num_tests; $i++) {
	339	+ for ($i = 0; $i<$num_tests; $i++) {
340	340	$resp = $c->send($req, 10);
341	341	$response[] = $resp->value();
342	342	}
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357	$c->keepalive = false;
358	358	begin_test($testName, 'https w. compression and no keepalive');
359	359	$response = array();
360		- for ($i = 0; $i < $num_tests; $i++) {
	360	+ for ($i = 0; $i<$num_tests; $i++) {
361	361	$resp = $c->send($req);
362	362	$response[] = $resp->value();
363	363	}
		@@ -366,7 +366,7 @@ discard block
		block discarded – undo
366	366	$c->keepalive = true;
367	367	begin_test($testName, 'https w. keep-alive and compression');
368	368	$response = array();
369		- for ($i = 0; $i < $num_tests; $i++) {
	369	+ for ($i = 0; $i<$num_tests; $i++) {
370	370	$resp = $c->send($req, 10);
371	371	$response[] = $resp->value();
372	372	}
		@@ -387,11 +387,11 @@ discard block
		block discarded – undo
387	387	/// test multicall vs. many calls vs. keep-alives - HTTP/2
388	388
389	389	$server = explode(':', $args['HTTPSSERVER']);
390		- if (count($server) > 1) {
391		- $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
	390	+ if (count($server)>1) {
	391	+ $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
392	392	$c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
393	393	} else {
394		- $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
	394	+ $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
395	395	$c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2');
396	396	}
397	397	$c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
		@@ -405,7 +405,7 @@ discard block
		block discarded – undo
405	405	begin_test($testName, 'http2 no keep-alive');
406	406	$c->keepalive = false;
407	407	$response = array();
408		- for ($i = 0; $i < $num_tests; $i++) {
	408	+ for ($i = 0; $i<$num_tests; $i++) {
409	409	$resp = $c->send($req);
410	410	$response[] = $resp->value();
411	411	}
		@@ -414,7 +414,7 @@ discard block
		block discarded – undo
414	414	begin_test($testName, 'http2 w. keep-alive');
415	415	$c->keepalive = true;
416	416	$response = array();
417		- for ($i = 0; $i < $num_tests; $i++) {
	417	+ for ($i = 0; $i<$num_tests; $i++) {
418	418	$resp = $c->send($req, 10);
419	419	$response[] = $resp->value();
420	420	}
		@@ -435,7 +435,7 @@ discard block
		block discarded – undo
435	435	$c->keepalive = false;
436	436	begin_test($testName, 'http2 w. compression and no keepalive');
437	437	$response = array();
438		- for ($i = 0; $i < $num_tests; $i++) {
	438	+ for ($i = 0; $i<$num_tests; $i++) {
439	439	$resp = $c->send($req);
440	440	$response[] = $resp->value();
441	441	}
		@@ -444,7 +444,7 @@ discard block
		block discarded – undo
444	444	$c->keepalive = true;
445	445	begin_test($testName, 'http2 w. keep-alive and compression');
446	446	$response = array();
447		- for ($i = 0; $i < $num_tests; $i++) {
	447	+ for ($i = 0; $i<$num_tests; $i++) {
448	448	$resp = $c->send($req, 10);
449	449	$response[] = $resp->value();
450	450	}
		@@ -466,7 +466,7 @@ discard block
		block discarded – undo
466	466	foreach ($test_results as $test => $results) {
467	467	echo "\nTEST: $test\n";
468	468	foreach ($results as $case => $data) {
469		- echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
	469	+ echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
470	470	}
471	471	}
472	472

		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	$this->me['struct'] = $val;
120	120	break;
121	121	default:
122		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
	122	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
123	123	}
124	124	}
125	125	}
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	}
145	145
146	146	if ($typeOf !== 1) {
147		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
	147	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
148	148	return 0;
149	149	}
150	150
		@@ -161,10 +161,10 @@ discard block
		block discarded – undo
161	161
162	162	switch ($this->mytype) {
163	163	case 1:
164		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
	164	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
165	165	return 0;
166	166	case 3:
167		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
	167	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
168	168	return 0;
169	169	case 2:
170	170	// we're adding a scalar value to an array here
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206
207	207	return 1;
208	208	} else {
209		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	209	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
210	210	return 0;
211	211	}
212	212	}
		@@ -237,7 +237,7 @@ discard block
		block discarded – undo
237	237
238	238	return 1;
239	239	} else {
240		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	240	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
241	241	return 0;
242	242	}
243	243	}
		@@ -279,19 +279,19 @@ discard block
		block discarded – undo
279	279	case 1:
280	280	switch ($typ) {
281	281	case static::$xmlrpcBase64:
282		- $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
	282	+ $rs .= "<${typ}>".base64_encode($val)."</${typ}>";
283	283	break;
284	284	case static::$xmlrpcBoolean:
285		- $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
	285	+ $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>";
286	286	break;
287	287	case static::$xmlrpcString:
288	288	// Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
289		- $rs .= "<${typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>";
	289	+ $rs .= "<${typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>";
290	290	break;
291	291	case static::$xmlrpcInt:
292	292	case static::$xmlrpcI4:
293	293	case static::$xmlrpcI8:
294		- $rs .= "<${typ}>" . (int)$val . "</${typ}>";
	294	+ $rs .= "<${typ}>".(int) $val."</${typ}>";
295	295	break;
296	296	case static::$xmlrpcDouble:
297	297	// avoid using standard conversion of float to string because it is locale-dependent,
		@@ -299,16 +299,16 @@ discard block
		block discarded – undo
299	299	// sprintf('%F') could be most likely ok but it fails eg. on 2e-14.
300	300	// The code below tries its best at keeping max precision while avoiding exp notation,
301	301	// but there is of course no limit in the number of decimal places to be used...
302		- $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</${typ}>";
	302	+ $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</${typ}>";
303	303	break;
304	304	case static::$xmlrpcDateTime:
305	305	if (is_string($val)) {
306	306	$rs .= "<${typ}>${val}</${typ}>";
307	307	// DateTimeInterface is not present in php 5.4...
308	308	} elseif (is_a($val, 'DateTimeInterface') \|\| is_a($val, 'DateTime')) {
309		- $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>";
	309	+ $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";
310	310	} elseif (is_int($val)) {
311		- $rs .= "<${typ}>" . date('Ymd\TH:i:s', $val) . "</${typ}>";
	311	+ $rs .= "<${typ}>".date('Ymd\TH:i:s', $val)."</${typ}>";
312	312	} else {
313	313	// not really a good idea here: but what should we output anyway? left for backward compat...
314	314	$rs .= "<${typ}>${val}</${typ}>";
		@@ -330,14 +330,14 @@ discard block
		block discarded – undo
330	330	case 3:
331	331	// struct
332	332	if ($this->_php_class) {
333		- $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
	333	+ $rs .= '<struct php_class="'.$this->_php_class."\">\n";
334	334	} else {
335	335	$rs .= "<struct>\n";
336	336	}
337	337	$charsetEncoder = $this->getCharsetEncoder();
338	338	/** @var Value $val2 */
339	339	foreach ($val as $key2 => $val2) {
340		- $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
	340	+ $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
341	341	//$rs.=$this->serializeval($val2);
342	342	$rs .= $val2->serialize($charsetEncoding);
343	343	$rs .= "</member>\n";
		@@ -373,7 +373,7 @@ discard block
		block discarded – undo
373	373	$val = reset($this->me);
374	374	$typ = key($this->me);
375	375
376		- return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
	376	+ return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
377	377	}
378	378
379	379	/**

		@@ -2,20 +2,20 @@
		block discarded – undo
2	2
3	3	use PHPUnit\Runner\Version as PHPUnit_Version;
4	4
5		-if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true
6		- && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false
	5	+if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true
	6	+ && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false
7	7	) {
8		- class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' );
	8	+ class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage');
9	9	}
10	10
11		-if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true
12		- && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false
	11	+if (class_exists('PHPUnit_Runner_BaseTestRunner') === true
	12	+ && class_exists('PHPUnit\Runner\BaseTestRunner') === false
13	13	) {
14		- class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' );
	14	+ class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner');
15	15	}
16	16
17	17	if (class_exists('PHPUnit\Runner\Version') === false \|\| version_compare(PHPUnit_Version::id(), '8.0.0', '<')) {
18		- include_once __DIR__ . '/PolyfillTestCase7.php';
	18	+ include_once __DIR__.'/PolyfillTestCase7.php';
19	19	} else {
20		- include_once __DIR__ . '/PolyfillTestCase8.php';
	20	+ include_once __DIR__.'/PolyfillTestCase8.php';
21	21	}

		@@ -90,9 +90,9 @@ discard block
		block discarded – undo
90	90	public function xml_header($charsetEncoding = '')
91	91	{
92	92	if ($charsetEncoding != '') {
93		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
	93	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
94	94	} else {
95		- return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
	95	+ return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
96	96	}
97	97	}
98	98
		@@ -112,16 +112,16 @@ discard block
		block discarded – undo
112	112	public function createPayload($charsetEncoding = '')
113	113	{
114	114	if ($charsetEncoding != '') {
115		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	115	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
116	116	} else {
117	117	$this->content_type = 'text/xml';
118	118	}
119	119	$this->payload = $this->xml_header($charsetEncoding);
120		- $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
121		- $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
	120	+ $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
	121	+ $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
122	122	$this->payload .= "<params>\n";
123	123	foreach ($this->params as $p) {
124		- $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
	124	+ $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
125	125	"</param>\n";
126	126	}
127	127	$this->payload .= "</params>\n";
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	$this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
249	249
250	250	if ($data == '') {
251		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
	251	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
252	252	return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
253	253	}
254	254
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	// failed processing of HTTP response headers
262	262	// save into response obj the full payload received, for debugging
263	263	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
264		- } catch(\Exception $e) {
	264	+ } catch (\Exception $e) {
265	265	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
266	266	}
267	267	}
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	// idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
276	276	$pos = strrpos($data, '</methodResponse>');
277	277	if ($pos !== false) {
278		- $data = substr($data, 0, $pos + 17);
	278	+ $data = substr($data, 0, $pos+17);
279	279	}
280	280
281	281	// try to 'guestimate' the character encoding of the received response
		@@ -286,9 +286,9 @@ discard block
		block discarded – undo
286	286	if ($start) {
287	287	$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
288	288	$end = strpos($data, '-->', $start);
289		- $comments = substr($data, $start, $end - $start);
290		- $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
291		- str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
	289	+ $comments = substr($data, $start, $end-$start);
	290	+ $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
	291	+ str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
292	292	}
293	293	}
294	294
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	if (extension_loaded('mbstring')) {
312	312	$data = mb_convert_encoding($data, 'UTF-8', $respEncoding);
313	313	} else {
314		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
	314	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
315	315	}
316	316	}
317	317	}
		@@ -332,12 +332,12 @@ discard block
		block discarded – undo
332	332	$xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
333	333
334	334	// first error check: xml not well formed
335		- if ($xmlRpcParser->_xh['isf'] > 2) {
	335	+ if ($xmlRpcParser->_xh['isf']>2) {
336	336
337	337	// BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
338	338
339	339	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
340		- PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	340	+ PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
341	341	$this->httpResponse
342	342	);
343	343
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	// second error check: xml well formed but not xml-rpc compliant
349	349	elseif ($xmlRpcParser->_xh['isf'] == 2) {
350	350	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
351		- PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	351	+ PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
352	352	$this->httpResponse
353	353	);
354	354
		@@ -364,7 +364,7 @@ discard block
		block discarded – undo
364	364	'', $this->httpResponse
365	365	);
366	366	} else {
367		- if ($this->debug > 1) {
	367	+ if ($this->debug>1) {
368	368	$this->getLogger()->debugMessage(
369	369	"---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
370	370	);

gggeek / phpxmlrpc

Push — master ( 314870...f47fb2 )

Status

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch