gggeek / phpxmlrpc

src/Helper/Charset.php

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
                         } 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) {

src/Wrapper.php

Braces +3 added lines, -2 removed lines

@@ -605,8 +605,9 @@
         }
         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?

demo/server/methodProviders/testsuite.php

Braces +6 added lines, -5 removed lines

@@ -88,11 +88,12 @@
     $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())));
+    }
+    }
 
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';

tests/09HTTPTest.php

Braces +4 added lines, -8 removed lines

@@ -304,8 +304,7 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
         }
@@ -480,8 +479,7 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
         }
@@ -505,12 +503,10 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
         }

src/Client.php

Braces +18 added lines, -6 removed lines

@@ -1274,19 +1274,25 @@ 
             $this->errstr = 'no response';
             $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
                 ': ' . curl_error($curl));
-            if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+            if (PHP_MAJOR_VERSION < 8) {
+                curl_close($curl);
+            }
             if ($opts['keepalive']) {
                 $this->xmlrpc_curl_handle = null;
             }
         } else {
             if (!$opts['keepalive']) {
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                if (PHP_MAJOR_VERSION < 8) {
+                    curl_close($curl);
+                }
             }
             $resp = $req->parseResponse($result, true, $opts['return_type']);
             if ($opts['keepalive']) {
                 /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls
                 if ($resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) {
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) {
+                        curl_close($curl);
+                    }
                     $this->xmlrpc_curl_handle = null;
                 }
             }
@@ -1442,7 +1448,9 @@ 
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) {
+                        curl_close($curl);
+                    }
                     return false;
                 }
                 break;
@@ -1457,7 +1465,9 @@ 
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
             } elseif ($opts['authtype'] != 1) {
                 $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                if (PHP_MAJOR_VERSION < 8) {
+                    curl_close($curl);
+                }
                 return false;
             }
         }
@@ -1508,7 +1518,9 @@ 
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
                 } elseif ($opts['proxy_authtype'] != 1) {
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) {
+                        curl_close($curl);
+                    }
                     return false;
                 }
             }

src/Helper/XMLParser.php

Braces +9 added lines, -3 removed lines

@@ -272,19 +272,25 @@
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION < 8) {
+            xml_parser_free($parser);
+        }
         $this->current_parsing_options = array();
 
         // BC

tests/WebTestCase.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
+        if (PHP_MAJOR_VERSION < 8) {
+            curl_close($ch);
+        }
 
         $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
         if (!$emptyPageOk) {

debugger/controller.php

Braces +16 added lines, -4 removed lines

@@ -71,7 +71,12 @@ 
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) {
+    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')
@@ -279,14 +284,18 @@ 
     </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>';
     echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>
     JSON-RPC 2.0 ';
@@ -294,7 +303,10 @@ 
     JSON-RPC 1.0 ';
 } ?>
 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">

debugger/index.php

Braces +6 added lines, -1 removed lines

@@ -13,7 +13,12 @@
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) {
+    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"