Inspection of "Fixed utf8_encode and utf8_decode functions deprec..." - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#109)

unknown

created 2023-01-30 14:23 UTC

Status

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

@@ -6,7 +6,7 @@
 block discarded – undo
  * @license code licensed under the BSD License: see file license.txt
  **/
 
-$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
+$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
 
 // has to be the same value as used in index.php
 $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage';

Please login to merge, or discard this patch.

tests/parse_args.php 1 patch

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

@@ -46,7 +46,7 @@  discard block
 block discarded – undo
         // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST)
         // Note that the only usecase for web-page mode is when this is used by benchmark.php
         if (!isset($_SERVER['REQUEST_METHOD'])) {
-            foreach($_SERVER as $key => $val) {
+            foreach ($_SERVER as $key => $val) {
                 if (array_key_exists($key, $args)) {
                     $$key = $val;
                 }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
             //}
         }
         if ($HTTPURI[0] != '/') {
-            $HTTPURI = '/' . $HTTPURI;
+            $HTTPURI = '/'.$HTTPURI;
         }
         $args['HTTPURI'] = $HTTPURI;
 
@@ -105,21 +105,21 @@  discard block
 block discarded – undo
         }
 
         if (isset($HTTPSIGNOREPEER)) {
-            $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER;
+            $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER;
         }
 
         if (isset($HTTPSVERIFYHOST)) {
-            $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST;
+            $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST;
         }
 
         if (isset($SSLVERSION)) {
-            $args['SSLVERSION'] = (int)$SSLVERSION;
+            $args['SSLVERSION'] = (int) $SSLVERSION;
         }
 
         if (isset($PROXYSERVER)) {
             $arr = explode(':', $PROXYSERVER);
             $args['PROXYSERVER'] = $arr[0];
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $args['PROXYPORT'] = $arr[1];
             } else {
                 $args['PROXYPORT'] = 8080;

Please login to merge, or discard this patch.

demo/client/which.php 1 patch

Spacing +8 added lines, -8 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>phpxmlrpc - Which toolkit demo</title></head>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
     <methodName>interopEchoTests.whichToolkit</methodName>
     <params/>
 </methodCall>';
-output("XML custom request:<br/><pre>" . htmlspecialchars($payload) . "</pre>\n");
+output("XML custom request:<br/><pre>".htmlspecialchars($payload)."</pre>\n");
 
 $client = new Client(XMLRPCSERVER);
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 if (!$resp->faultCode()) {
 
     $xml = $resp->value();
-    output("XML response:<br/><pre>" . htmlspecialchars($xml) . "</pre>\n");
+    output("XML response:<br/><pre>".htmlspecialchars($xml)."</pre>\n");
 
     $encoder = new Encoder();
     // from xml to xml-rpc Response
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
 
     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");

Please login to merge, or discard this patch.

demo/client/getstatename.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>phpxmlrpc - Getstatename demo</title></head>
@@ -17,13 +17,13 @@  discard block
 block discarded – undo
 $stateNo = "";
 
 if (isset($_POST['stateno']) && $_POST['stateno'] != "") {
-    $stateNo = (integer)$_POST['stateno'];
+    $stateNo = (integer) $_POST['stateno'];
     $method = 'examples.getStateName';
     $arguments = array(
         new Value($stateNo, Value::$xmlrpcInt),
     );
     $req = new Request($method, $arguments);
-    output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) .
+    output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()).
         "\n\n</pre>Debug info of server data follows...\n\n");
     $client = new Client(XMLRPCSERVER);
     $client->setDebug(1);
@@ -32,12 +32,12 @@  discard block
 block discarded – undo
         $val = $resp->value();
         // NB: we are _assuming_ that the server did return a scalar xml-rpc value here.
         // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'`
-        output('<br/>State number <b>' . $stateNo . '</b> is <b>'
-            . htmlspecialchars($val->scalarval()) . '</b><br/><br/>');
+        output('<br/>State number <b>'.$stateNo.'</b> is <b>'
+            . htmlspecialchars($val->scalarval()).'</b><br/><br/>');
     } else {
         output('An error occurred: ');
-        output('<pre>Code: ' . htmlspecialchars($resp->faultCode())
-            . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>");
+        output('<pre>Code: '.htmlspecialchars($resp->faultCode())
+            . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>");
     }
 }
 

Please login to merge, or discard this patch.

demo/client/proxy.php 1 patch

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>phpxmlrpc - Proxy demo</title></head>

Please login to merge, or discard this patch.

demo/client/wrap.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>phpxmlrpc - Webservice wrapper 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;
         }

Please login to merge, or discard this patch.

demo/client/agesort.php 1 patch

Spacing +10 added lines, -10 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>phpxmlrpc - Agesort demo</title></head>
@@ -17,21 +17,21 @@  discard block
 block discarded – undo
 
 $inAr = array(
     array('name' => 'Dave', 'age' => 24),
-    array('name' => 'Edd',  'age' => 45),
-    array('name' => 'Joe',  'age' => 37),
+    array('name' => 'Edd', 'age' => 45),
+    array('name' => 'Joe', 'age' => 37),
     array('name' => 'Fred', 'age' => 27),
 );
 
 output('This is the input data:<br/><pre>');
 foreach ($inAr as $val) {
-    output($val['name'] . ", " . $val['age'] . "\n");
+    output($val['name'].", ".$val['age']."\n");
 }
 output('</pre>');
 
 // Create xml-rpc parameters from the input array: an array of structs
 $encoder = new Encoder();
 $v = $encoder->encode($inAr);
-output("Encoded into xml-rpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n");
+output("Encoded into xml-rpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n");
 
 // create client and request objects
 $req = new Request('examples.sortByAge', array($v));
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
     $value = $resp->value();
     foreach ($encoder->decode($value) as $struct) {
         // note: here we are trusting the server's response to have the expected format
-        output(htmlspecialchars($struct['name']) . ", " . htmlspecialchars($struct['age']) . "\n");
+        output(htmlspecialchars($struct['name']).", ".htmlspecialchars($struct['age'])."\n");
     }
 
-    output('</pre><hr/>For nerds: I got this value back<br/><pre>' .
-        htmlentities($resp->serialize()) . "</pre><hr/>\n");
+    output('</pre><hr/>For nerds: I got this value back<br/><pre>'.
+        htmlentities($resp->serialize())."</pre><hr/>\n");
 } else {
     output('An error occurred:<pre>');
-    output('Code: ' . htmlspecialchars($resp->faultCode()) .
-        "\nReason: '" . htmlspecialchars($resp->faultString()) . "'</pre><hr/>");
+    output('Code: '.htmlspecialchars($resp->faultCode()).
+        "\nReason: '".htmlspecialchars($resp->faultString())."'</pre><hr/>");
 }
 
 output("</body></html>\n");

Please login to merge, or discard this patch.

demo/client/introspect.php 1 patch

Spacing +9 added lines, -9 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>phpxmlrpc - Introspect demo</title></head>
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 function display_error($r)
 {
     output("An error occurred: ");
-    output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>");
+    output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>");
 }
 
 $client = new Client(XMLRPCSERVER);
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 $client->return_type = XMLRPCParser::RETURN_PHP;
 
 // First off, let's retrieve the list of methods available on the remote server
-output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n");
+output("<h3>methods available at http://".$client->server.$client->path."</h3>\n");
 $req = new Request('system.listMethods');
 $resp = $client->send($req);
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 
     // Then, retrieve the signature and help text of each available method
     foreach ($v as $methodName) {
-        output("<h4>" . htmlspecialchars($methodName) . "</h4>\n");
+        output("<h4>".htmlspecialchars($methodName)."</h4>\n");
         // build requests first, add params later
         $r1 = new PhpXmlRpc\Request('system.methodHelp');
         $r2 = new PhpXmlRpc\Request('system.methodSignature');
@@ -83,12 +83,12 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $ret = $sig[0];
-                    output("<code>" . htmlspecialchars($ret) . " "
-                        . htmlspecialchars($methodName) . "(");
-                    if (count($sig) > 1) {
-                        for ($k = 1; $k < count($sig); $k++) {
+                    output("<code>".htmlspecialchars($ret)." "
+                        . htmlspecialchars($methodName)."(");
+                    if (count($sig)>1) {
+                        for ($k = 1; $k<count($sig); $k++) {
                             output(htmlspecialchars($sig[$k]));
-                            if ($k < count($sig) - 1) {
+                            if ($k<count($sig)-1) {
                                 output(", ");
                             }
                         }

Please login to merge, or discard this patch.

demo/server/methodProviders/testsuite.php 1 patch

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

@@ -91,7 +91,7 @@
 block discarded – undo
 
     // Greek word 'kosme'. NB: NOT a valid ISO8859 string!
     // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
-    "tests.utf8methodname." . 'κόσμε' => array(
+    "tests.utf8methodname.".'κόσμε' => array(
         "function" => "exampleMethods::stringEcho",
         "signature" => exampleMethods::$stringecho_sig,
         "docstring" => exampleMethods::$stringecho_doc,

Please login to merge, or discard this patch.

		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	// check for command line params (passed as env vars) vs. web page input params (passed as GET/POST)
47	47	// Note that the only usecase for web-page mode is when this is used by benchmark.php
48	48	if (!isset($_SERVER['REQUEST_METHOD'])) {
49		- foreach($_SERVER as $key => $val) {
	49	+ foreach ($_SERVER as $key => $val) {
50	50	if (array_key_exists($key, $args)) {
51	51	$$key = $val;
52	52	}
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	//}
92	92	}
93	93	if ($HTTPURI[0] != '/') {
94		- $HTTPURI = '/' . $HTTPURI;
	94	+ $HTTPURI = '/'.$HTTPURI;
95	95	}
96	96	$args['HTTPURI'] = $HTTPURI;
97	97
		@@ -105,21 +105,21 @@ discard block
		block discarded – undo
105	105	}
106	106
107	107	if (isset($HTTPSIGNOREPEER)) {
108		- $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER;
	108	+ $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER;
109	109	}
110	110
111	111	if (isset($HTTPSVERIFYHOST)) {
112		- $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST;
	112	+ $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST;
113	113	}
114	114
115	115	if (isset($SSLVERSION)) {
116		- $args['SSLVERSION'] = (int)$SSLVERSION;
	116	+ $args['SSLVERSION'] = (int) $SSLVERSION;
117	117	}
118	118
119	119	if (isset($PROXYSERVER)) {
120	120	$arr = explode(':', $PROXYSERVER);
121	121	$args['PROXYSERVER'] = $arr[0];
122		- if (count($arr) > 1) {
	122	+ if (count($arr)>1) {
123	123	$args['PROXYPORT'] = $arr[1];
124	124	} else {
125	125	$args['PROXYPORT'] = 8080;

		@@ -91,7 +91,7 @@
		block discarded – undo
91	91
92	92	// Greek word 'kosme'. NB: NOT a valid ISO8859 string!
93	93	// NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
94		- "tests.utf8methodname." . 'κόσμε' => array(
	94	+ "tests.utf8methodname.".'κόσμε' => array(
95	95	"function" => "exampleMethods::stringEcho",
96	96	"signature" => exampleMethods::$stringecho_sig,
97	97	"docstring" => exampleMethods::$stringecho_doc,

		@@ -6,7 +6,7 @@
		block discarded – undo
6	6	* @license code licensed under the BSD License: see file license.txt
7	7	**/
8	8
9		-$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
	9	+$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
10	10
11	11	// has to be the same value as used in index.php
12	12	$GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage';

		@@ -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>phpxmlrpc - Which toolkit demo</title></head>
		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	<methodName>interopEchoTests.whichToolkit</methodName>
20	20	<params/>
21	21	</methodCall>';
22		-output("XML custom request:<br/><pre>" . htmlspecialchars($payload) . "</pre>\n");
	22	+output("XML custom request:<br/><pre>".htmlspecialchars($payload)."</pre>\n");
23	23
24	24	$client = new Client(XMLRPCSERVER);
25	25
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	if (!$resp->faultCode()) {
41	41
42	42	$xml = $resp->value();
43		- output("XML response:<br/><pre>" . htmlspecialchars($xml) . "</pre>\n");
	43	+ output("XML response:<br/><pre>".htmlspecialchars($xml)."</pre>\n");
44	44
45	45	$encoder = new Encoder();
46	46	// from xml to xml-rpc Response
		@@ -52,14 +52,14 @@ discard block
		block discarded – undo
52	52
53	53	output("Toolkit info:<br/>\n");
54	54	output("<pre>");
55		- output("name: " . htmlspecialchars($value["toolkitName"]) . "\n");
56		- output("version: " . htmlspecialchars($value["toolkitVersion"]) . "\n");
57		- output("docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n");
58		- output("os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n");
	55	+ output("name: ".htmlspecialchars($value["toolkitName"])."\n");
	56	+ output("version: ".htmlspecialchars($value["toolkitVersion"])."\n");
	57	+ output("docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n");
	58	+ output("os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n");
59	59	output("</pre>");
60	60	} else {
61	61	output("An error occurred: ");
62		- output("Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n");
	62	+ output("Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n");
63	63	}
64	64
65	65	output("</body></html>\n");

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>phpxmlrpc - Proxy demo</title></head>

gggeek / phpxmlrpc

Pull Request — master (#109)

Status

Category

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

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

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

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

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

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

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

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

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