Inspection of "Merge pull request #124 from theodorejb/switch-cas..." - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( e50480...053866 )

by Gaetano

created 2024-11-11 11:27 UTC

Status

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

@@ -141,9 +141,9 @@
 block discarded – undo
  * @deprecated
  */
 function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName,
-     $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
-     $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
-     $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
+        $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
+        $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
+        $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
     if ($clientCopyMode < 2) {

Please login to merge, or discard this patch.

src/Helper/Charset.php 1 patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -176,8 +176,7 @@
 block discarded – undo
                         } else {
                             $escapedData .= $ch;
                         }
-                    }
-                    else if ($ii < 128) {
+                    } else if ($ii < 128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {

Please login to merge, or discard this patch.

demo/server/methodProviders/wrapper.php 1 patch

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.

debugger/action.php 1 patch

Braces +9 added lines, -2 removed lines patch added patch discarded remove patch

@@ -15,7 +15,12 @@  discard block
 block discarded – undo
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <style type="text/css">
         <!--
@@ -367,7 +372,9 @@  discard block
 block discarded – undo
                                 echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
                                 if ($x->count() > 1) {
                                     foreach($x as $k => $y) {
-                                        if ($k == 0) continue;
+                                        if ($k == 0) {
+                                            continue;
+                                        }
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype == 1) {
                                             switch($y->scalarval()) {

Please login to merge, or discard this patch.

debugger/index.php 1 patch

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

@@ -13,7 +13,12 @@
 block discarded – undo
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
 </head>
 <frameset rows="360,*">
     <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0"

Please login to merge, or discard this patch.

debugger/controller.php 1 patch

Braces +16 added lines, -4 removed lines patch added patch discarded remove patch

@@ -66,7 +66,12 @@  discard block
 block discarded – undo
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <script type="text/javascript" language="Javascript">
         if (window.name != 'frmcontroller')
@@ -266,19 +271,26 @@  discard block
 block discarded – undo
     </script>
 </head>
 <body
-    onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
+    onload="<?php if ($hasjsonrpcclient) {
+    echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
         echo ' document.frmaction.submit();';
+}
     } ?>">
 <h1>XML-RPC
 <?php if ($hasjsonrpcclient) {
     echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"';
     // q: does this if make sense at all?
-    if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"';
+    if (!class_exists('\PhpXmlRpc\Client')) {
+        echo ' disabled="disabled"';
+    }
     echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>
     JSON-RPC';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) {
+    echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion);
+}
+?>)</h3>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">

Please login to merge, or discard this patch.

src/Wrapper.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -605,8 +605,9 @@
 block discarded – undo
         }
         foreach ($parsVariations as $i => $pars) {
             $innerCode .= "  if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
-            if ($i < (count($parsVariations) - 1))
-                $innerCode .= "  else\n";
+            if ($i < (count($parsVariations) - 1)) {
+                            $innerCode .= "  else\n";
+            }
         }
         $innerCode .= "  if (is_a(\$retVal, '" . static::$namespace . "Response'))\n    return \$retVal;\n  else\n";
         /// q: why not do the same for int, float, bool, string?

Please login to merge, or discard this patch.

tests/09HTTPTest.php 1 patch

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

@@ -201,8 +201,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
             return;
@@ -226,8 +225,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
             return;
@@ -278,13 +276,11 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
             return;

Please login to merge, or discard this patch.

src/Client.php 1 patch

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

@@ -2011,9 +2011,9 @@
 block discarded – undo
      * @return false|\CurlHandle|resource
      */
     protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
-         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
-         $keyPass = '', $sslVersion = 0)
+            $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
+            $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
+            $keyPass = '', $sslVersion = 0)
     {
         $this->logDeprecationUnlessCalledBy('sendViaCURL');
 

Please login to merge, or discard this patch.

		@@ -141,9 +141,9 @@
		block discarded – undo
141	141	* @deprecated
142	142	*/
143	143	function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName,
144		- $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
145		- $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
146		- $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
	144	+ $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
	145	+ $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
	146	+ $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
147	147	{
148	148	$code = "function $xmlrpcFuncName (";
149	149	if ($clientCopyMode < 2) {

		@@ -176,8 +176,7 @@
		block discarded – undo
176	176	} else {
177	177	$escapedData .= $ch;
178	178	}
179		- }
180		- else if ($ii < 128) {
	179	+ } else if ($ii < 128) {
181	180	/// @todo shall we replace this with a (supposedly) faster str_replace?
182	181	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
183	182	switch ($ii) {

		@@ -605,8 +605,9 @@
		block discarded – undo
605	605	}
606	606	foreach ($parsVariations as $i => $pars) {
607	607	$innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
608		- if ($i < (count($parsVariations) - 1))
609		- $innerCode .= " else\n";
	608	+ if ($i < (count($parsVariations) - 1)) {
	609	+ $innerCode .= " else\n";
	610	+ }
610	611	}
611	612	$innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n";
612	613	/// q: why not do the same for int, float, bool, string?

		@@ -201,8 +201,7 @@ discard block
		block discarded – undo
201	201	{
202	202	$this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
203	203	return;
204		- }
205		- else if ($this->args['PROXYSERVER'] == '')
	204	+ } else if ($this->args['PROXYSERVER'] == '')
206	205	{
207	206	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
208	207	return;
		@@ -226,8 +225,7 @@ discard block
		block discarded – undo
226	225	{
227	226	$this->markTestSkipped('CURL missing: cannot test https functionality');
228	227	return;
229		- }
230		- else if ($this->args['HTTPSSERVER'] == '')
	228	+ } else if ($this->args['HTTPSSERVER'] == '')
231	229	{
232	230	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
233	231	return;
		@@ -278,13 +276,11 @@ discard block
		block discarded – undo
278	276	{
279	277	$this->markTestSkipped('CURL missing: cannot test https w. proxy');
280	278	return;
281		- }
282		- else if ($this->args['PROXYSERVER'] == '')
	279	+ } else if ($this->args['PROXYSERVER'] == '')
283	280	{
284	281	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
285	282	return;
286		- }
287		- else if ($this->args['HTTPSSERVER'] == '')
	283	+ } else if ($this->args['HTTPSSERVER'] == '')
288	284	{
289	285	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
290	286	return;

		@@ -2011,9 +2011,9 @@
		block discarded – undo
2011	2011	* @return false\|\CurlHandle\|resource
2012	2012	*/
2013	2013	protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
2014		- $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
2015		- $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
2016		- $keyPass = '', $sslVersion = 0)
	2014	+ $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
	2015	+ $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
	2016	+ $keyPass = '', $sslVersion = 0)
2017	2017	{
2018	2018	$this->logDeprecationUnlessCalledBy('sendViaCURL');
2019	2019

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

		@@ -15,7 +15,12 @@ discard block
		block discarded – undo
15	15	<html lang="en">
16	16	<head>
17	17	<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
18		- <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
	18	+ <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
	19	+ echo 'JSON-RPC';
	20	+} else {
	21	+ echo 'XML-RPC';
	22	+}
	23	+?> Debugger</title>
19	24	<meta name="robots" content="index,nofollow"/>
20	25	<style type="text/css">
21	26	<!--
		@@ -367,7 +372,9 @@ discard block
		block discarded – undo
367	372	echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
368	373	if ($x->count() > 1) {
369	374	foreach($x as $k => $y) {
370		- if ($k == 0) continue;
	375	+ if ($k == 0) {
	376	+ continue;
	377	+ }
371	378	echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
372	379	if ($wstype == 1) {
373	380	switch($y->scalarval()) {

		@@ -13,7 +13,12 @@
		block discarded – undo
13	13	<html lang="en">
14	14	<head>
15	15	<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
16		- <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
	16	+ <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
	17	+ echo 'JSON-RPC';
	18	+} else {
	19	+ echo 'XML-RPC';
	20	+}
	21	+?> Debugger</title>
17	22	</head>
18	23	<frameset rows="360,*">
19	24	<frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0"

		@@ -66,7 +66,12 @@ discard block
		block discarded – undo
66	66	<html lang="en">
67	67	<head>
68	68	<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
69		- <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
	69	+ <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
	70	+ echo 'JSON-RPC';
	71	+} else {
	72	+ echo 'XML-RPC';
	73	+}
	74	+?> Debugger</title>
70	75	<meta name="robots" content="index,nofollow"/>
71	76	<script type="text/javascript" language="Javascript">
72	77	if (window.name != 'frmcontroller')
		@@ -266,19 +271,26 @@ discard block
		block discarded – undo
266	271	</script>
267	272	</head>
268	273	<body
269		- onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
	274	+ onload="<?php if ($hasjsonrpcclient) {
	275	+ echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
270	276	echo ' document.frmaction.submit();';
	277	+}
271	278	} ?>">
272	279	<h1>XML-RPC
273	280	<?php if ($hasjsonrpcclient) {
274	281	echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"';
275	282	// q: does this if make sense at all?
276		- if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"';
	283	+ if (!class_exists('\PhpXmlRpc\Client')) {
	284	+ echo ' disabled="disabled"';
	285	+ }
277	286	echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>
278	287	JSON-RPC';
279	288	} ?>
280	289	Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
281		-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
	290	+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) {
	291	+ echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion);
	292	+}
	293	+?>)</h3>
282	294	<form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
283	295
284	296	<table id="serverblock">

gggeek / phpxmlrpc

Push — master ( e50480...053866 )

Status

Category

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

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +9 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +16 added lines, -4 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

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