Inspection of "drop deprecated calls from demo and co" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( f91eab...402905 )

by Gaetano

created 2023-02-08 17:31 UTC

Status

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/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/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/server/methodProviders/testsuite.php 2 patches

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.

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

@@ -69,11 +69,12 @@
 block discarded – undo
     $a = $req->getParam(0);
     $b = $req->getParam(1);
 
-    if ($a->scalarTyp() == Value::$xmlrpcNull)
-        return new Response(new Value(plain_findstate($b->scalarVal())));
-    else
-        return new Response(new Value(plain_findstate($a->scalarVal())));
-}
+    if ($a->scalarTyp() == Value::$xmlrpcNull) {
+            return new Response(new Value(plain_findstate($b->scalarVal())));
+    } else {
+            return new Response(new Value(plain_findstate($a->scalarVal())));
+    }
+    }
 
 return array(
     "tests.getallheaders" => array(

Please login to merge, or discard this patch.

demo/server/methodProviders/wrapper.php 2 patches

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

@@ -26,7 +26,7 @@
 block discarded – undo
  */
 function plain_findstate($stateNo)
 {
-     if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
+        if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
         return exampleMethods::$stateNames[$stateNo - 1];
     } else {
         // not, there so complain

Please login to merge, or discard this patch.

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

@@ -26,11 +26,11 @@  discard block
 block discarded – undo
  */
 function plain_findstate($stateNo)
 {
-     if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
-        return exampleMethods::$stateNames[$stateNo - 1];
+     if (isset(exampleMethods::$stateNames[$stateNo-1])) {
+        return exampleMethods::$stateNames[$stateNo-1];
     } else {
         // not, there so complain
-        throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
+        throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
     }
 }
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
         if ($req->getNumParams()) {
             $p1 = $req->getParam(0);
             if ($p1->kindOf() === 'scalar') {
-                $errNum = (int)$p1->scalarVal();
+                $errNum = (int) $p1->scalarVal();
             }
         }
         throw new Exception("it's just a test", $errNum);
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
 
 $findstate10_sig = array(
     /// @todo add a demo and test with closure usage
-    "function" => function ($req) { return exampleMethods::findState($req); },
+    "function" => function($req) { return exampleMethods::findState($req); },
     "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
-    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
+    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
         'index of that state name in an alphabetic order.',
 );
 
-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
 
 /// @todo do we really need a new instance ?
 $c = new handlersContainer();
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
 
 $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
 
-$returnObj_sig =  $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
 
 return array_merge(
     array(

Please login to merge, or discard this patch.

demo/client/codegen.php 1 patch

Spacing +6 added lines, -6 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";
 
 /**
  * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
 );
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 $targetFile = '/tmp/MyClient.php';
 $generated = file_put_contents($targetFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     $code['code']
 );
 
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
 $client = new MyClient();
 $sorted = $client->examples_sortByAge(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),
 ));
 

Please login to merge, or discard this patch.

demo/server/_prepend.php 1 patch

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

@@ -8,5 +8,5 @@
 block discarded – undo
 }
 
 // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();

Please login to merge, or discard this patch.

demo/server/discuss.php 1 patch

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

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server();

Please login to merge, or discard this patch.

demo/client/windowscharset.php 1 patch

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,

Please login to merge, or discard this patch.

		@@ -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,

		@@ -69,11 +69,12 @@
		block discarded – undo
69	69	$a = $req->getParam(0);
70	70	$b = $req->getParam(1);
71	71
72		- if ($a->scalarTyp() == Value::$xmlrpcNull)
73		- return new Response(new Value(plain_findstate($b->scalarVal())));
74		- else
75		- return new Response(new Value(plain_findstate($a->scalarVal())));
76		-}
	72	+ if ($a->scalarTyp() == Value::$xmlrpcNull) {
	73	+ return new Response(new Value(plain_findstate($b->scalarVal())));
	74	+ } else {
	75	+ return new Response(new Value(plain_findstate($a->scalarVal())));
	76	+ }
	77	+ }
77	78
78	79	return array(
79	80	"tests.getallheaders" => array(

		@@ -26,11 +26,11 @@ discard block
		block discarded – undo
26	26	*/
27	27	function plain_findstate($stateNo)
28	28	{
29		- if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
30		- return exampleMethods::$stateNames[$stateNo - 1];
	29	+ if (isset(exampleMethods::$stateNames[$stateNo-1])) {
	30	+ return exampleMethods::$stateNames[$stateNo-1];
31	31	} else {
32	32	// not, there so complain
33		- throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
	33	+ throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
34	34	}
35	35	}
36	36
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	if ($req->getNumParams()) {
70	70	$p1 = $req->getParam(0);
71	71	if ($p1->kindOf() === 'scalar') {
72		- $errNum = (int)$p1->scalarVal();
	72	+ $errNum = (int) $p1->scalarVal();
73	73	}
74	74	}
75	75	throw new Exception("it's just a test", $errNum);
		@@ -141,13 +141,13 @@ discard block
		block discarded – undo
141	141
142	142	$findstate10_sig = array(
143	143	/// @todo add a demo and test with closure usage
144		- "function" => function ($req) { return exampleMethods::findState($req); },
	144	+ "function" => function($req) { return exampleMethods::findState($req); },
145	145	"signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
146		- "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
	146	+ "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
147	147	'index of that state name in an alphabetic order.',
148	148	);
149	149
150		-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
	150	+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
151	151
152	152	/// @todo do we really need a new instance ?
153	153	$c = new handlersContainer();
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156
157	157	$namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
158	158
159		-$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
	159	+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
160	160
161	161	return array_merge(
162	162	array(

		@@ -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>

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	*/
27	27	function plain_findstate($stateNo)
28	28	{
29		- if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
	29	+ if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
30	30	return exampleMethods::$stateNames[$stateNo - 1];
31	31	} else {
32	32	// not, there so complain

		@@ -8,5 +8,5 @@
		block discarded – undo
8	8	}
9	9
10	10	// Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
11		-include_once __DIR__ . '/../../src/Autoloader.php';
	11	+include_once __DIR__.'/../../src/Autoloader.php';
12	12	PhpXmlRpc\Autoloader::register();

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	* `$functions_parameters_type` and `$exception_handling`
9	9	*/
10	10
11		-require_once __DIR__ . "/_prepend.php";
	11	+require_once __DIR__."/_prepend.php";
12	12
13	13	require_once __DIR__.'/methodProviders/CommentManager.php';
14	14
		@@ -19,12 +19,12 @@ discard block
		block discarded – undo
19	19
20	20	$addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
21	21
22		-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
	22	+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
23	23	'and the third is the comment itself. Returns the number of comments against that ID.';
24	24
25	25	$getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
26	26
27		-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
	27	+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
28	28	'containing name and comment text.';
29	29
30	30	$srv = new Server();

gggeek / phpxmlrpc

Push — master ( f91eab...402905 )

Status

Category

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

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

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

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

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

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

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

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

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

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

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