Inspection of "fix tests for old php" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 2e14d2...e2ee8e )

by Gaetano

created 2023-01-17 12:26 UTC

Status

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.

demo/server/methodProviders/wrapper.php 1 patch

Spacing +7 added lines, -7 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);
     }
 }
 
@@ -124,13 +124,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();
@@ -139,7 +139,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/codegen.php 1 patch

Spacing +15 added lines, -15 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";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -22,19 +22,19 @@  discard block
 block discarded – undo
 // generate a file with a class definition
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 file_put_contents($targetClassFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     "class MyServerClass {\n\n"
 ) || die('uh oh');
 
 // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions
 
-foreach($code as $methodName => $methodDef) {
-    file_put_contents($targetClassFile, 'public static ' . $methodDef['source'] . "\n\n", FILE_APPEND) || die('uh oh');
-    $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function'];
+foreach ($code as $methodName => $methodDef) {
+    file_put_contents($targetClassFile, 'public static '.$methodDef['source']."\n\n", FILE_APPEND) || die('uh oh');
+    $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function'];
     unset($code[$methodName]['source']);
 }
 file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh');
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
 // generate the separate file with the xml-rpc server and dispatch map
 
 file_put_contents($targetServerFile,
-    "<?php\n\n" .
+    "<?php\n\n".
 
-    "require_once '$autoloader';\n\n" .
+    "require_once '$autoloader';\n\n".
 
-    "require_once '$targetClassFile';\n\n" .
+    "require_once '$targetClassFile';\n\n".
 
     // NB: since we are running the generated code within the same script, the existing CommentManager instance will be
     // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder
@@ -56,11 +56,11 @@  discard block
 block discarded – undo
     //     Wrapper::$objHolder['xmlrpc_CommentManager_addComment'] = $cm;
     //     Wrapper::$objHolder['xmlrpc_CommentManager_getComments'] = $cm;
 
-    '$dm = ' . var_export($code, true) . ";\n" .
-    '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" .
-    '$s->setDebug(2);' . "\n" .
-    '$s->exception_handling = 1;' . "\n" .
-    '$s->service();' . "\n"
+    '$dm = '.var_export($code, true).";\n".
+    '$s = new \PhpXmlRpc\Server($dm, false);'."\n".
+    '$s->setDebug(2);'."\n".
+    '$s->exception_handling = 1;'."\n".
+    '$s->service();'."\n"
 ) || die('uh oh');
 
 // test that everything worked by running it in realtime

Please login to merge, or discard this patch.

demo/server/server.php 1 patch

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
     die();
 }
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Server;
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
         } elseif ($_GET['FORCE_AUTH'] == 'Digest') {
             if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
                 header('HTTP/1.1 401 Unauthorized');
-                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
+                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
                 die('Text visible if user hits Cancel button');
             }
         }

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/client/_prepend.php 1 patch

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

@@ -8,7 +8,7 @@
 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();
 
 // Let unit tests run against localhost, 'plain' demos against a known public server

Please login to merge, or discard this patch.

debugger/controller.php 1 patch

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
@@ -33,27 +33,27 @@  discard block
 block discarded – undo
     /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
-            __DIR__ . '/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
         /// @todo for cases above 4, 5 and up, look at $controllerRootUrl and check if the web root is not pointing directly
         ///       at this folder, as in that case the link to the visualeditor will not
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
         echo ' document.forms[2].submit();';
     } ?>">
 <h1>XML-RPC
-    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     /
-    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     JSON-RPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>)
 </h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>

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,

		@@ -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
		@@ -124,13 +124,13 @@ discard block
		block discarded – undo
124	124
125	125	$findstate10_sig = array(
126	126	/// @todo add a demo and test with closure usage
127		- "function" => function ($req) { return exampleMethods::findState($req); },
	127	+ "function" => function($req) { return exampleMethods::findState($req); },
128	128	"signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
129		- "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
	129	+ "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
130	130	'index of that state name in an alphabetic order.',
131	131	);
132	132
133		-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
	133	+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
134	134
135	135	/// @todo do we really need a new instance ?
136	136	$c = new handlersContainer();
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139
140	140	$namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
141	141
142		-$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
	142	+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
143	143
144	144	return array_merge(
145	145	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 - Introspect demo</title></head>
		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	function display_error($r)
18	18	{
19	19	output("An error occurred: ");
20		- output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>");
	20	+ output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>");
21	21	}
22	22
23	23	$client = new Client(XMLRPCSERVER);
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	$client->return_type = XMLRPCParser::RETURN_PHP;
26	26
27	27	// First off, let's retrieve the list of methods available on the remote server
28		-output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n");
	28	+output("<h3>methods available at http://".$client->server.$client->path."</h3>\n");
29	29	$req = new Request('system.listMethods');
30	30	$resp = $client->send($req);
31	31
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47
48	48	// Then, retrieve the signature and help text of each available method
49	49	foreach ($v as $methodName) {
50		- output("<h4>" . htmlspecialchars($methodName) . "</h4>\n");
	50	+ output("<h4>".htmlspecialchars($methodName)."</h4>\n");
51	51	// build requests first, add params later
52	52	$r1 = new PhpXmlRpc\Request('system.methodHelp');
53	53	$r2 = new PhpXmlRpc\Request('system.methodSignature');
		@@ -83,12 +83,12 @@ discard block
		block discarded – undo
83	83	continue;
84	84	}
85	85	$ret = $sig[0];
86		- output("<code>" . htmlspecialchars($ret) . " "
87		- . htmlspecialchars($methodName) . "(");
88		- if (count($sig) > 1) {
89		- for ($k = 1; $k < count($sig); $k++) {
	86	+ output("<code>".htmlspecialchars($ret)." "
	87	+ . htmlspecialchars($methodName)."(");
	88	+ if (count($sig)>1) {
	89	+ for ($k = 1; $k<count($sig); $k++) {
90	90	output(htmlspecialchars($sig[$k]));
91		- if ($k < count($sig) - 1) {
	91	+ if ($k<count($sig)-1) {
92	92	output(", ");
93	93	}
94	94	}

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	die();
22	22	}
23	23
24		-require_once __DIR__ . "/_prepend.php";
	24	+require_once __DIR__."/_prepend.php";
25	25
26	26	use PhpXmlRpc\PhpXmlRpc;
27	27	use PhpXmlRpc\Server;
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	} elseif ($_GET['FORCE_AUTH'] == 'Digest') {
81	81	if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
82	82	header('HTTP/1.1 401 Unauthorized');
83		- header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
	83	+ header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
84	84	die('Text visible if user hits Cancel button');
85	85	}
86	86	}

		@@ -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 @@
		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();
13	13
14	14	// Let unit tests run against localhost, 'plain' demos against a known public server

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	// Make sure we set the correct charset type for output, so that we can display all characters
18	18	header('Content-Type: text/html; charset=utf-8');
19	19
20		-include __DIR__ . '/common.php';
	20	+include __DIR__.'/common.php';
21	21	if ($action == '') {
22	22	$action = 'list';
23	23	}
		@@ -33,27 +33,27 @@ discard block
		block discarded – undo
33	33	/// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or
34	34	/// relative to this debugger's folder.
35	35	if (defined('JSXMLRPC_PATH')) {
36		- $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
	36	+ $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
37	37	} else {
38	38	$editorpaths = array(
39		- __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
40		- __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
41		- __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
42		- __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
43		- __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
44		- __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
45		- __DIR__ . '/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
	39	+ __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
	40	+ __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
	41	+ __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
	42	+ __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
	43	+ __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
	44	+ __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
	45	+ __DIR__.'/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
46	46	);
47	47	}
48		- foreach($editorpaths as $editorpath) {
49		- if (is_file(realpath($editorpath . 'visualeditor.html'))) {
	48	+ foreach ($editorpaths as $editorpath) {
	49	+ if (is_file(realpath($editorpath.'visualeditor.html'))) {
50	50	$haseditor = true;
51	51	break;
52	52	}
53	53	}
54	54	if ($haseditor) {
55		- $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
56		- $editorurlpath = $controllerRootUrl . '/' . preg_replace('\|^' . preg_quote(__DIR__, '\|') .'\|', '', $editorpath);
	55	+ $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
	56	+ $editorurlpath = $controllerRootUrl.'/'.preg_replace('\|^'.preg_quote(__DIR__, '\|').'\|', '', $editorpath);
57	57	/// @todo for cases above 4, 5 and up, look at $controllerRootUrl and check if the web root is not pointing directly
58	58	/// at this folder, as in that case the link to the visualeditor will not
59	59	/// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
		@@ -223,7 +223,7 @@ discard block
		block discarded – undo
223	223	}
224	224
225	225	function activateeditor() {
226		- var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>';
	226	+ var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
227	227	if (document.frmaction.wstype.value == "1")
228	228	url += '&type=jsonrpc';
229	229	var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
		@@ -260,9 +260,9 @@ discard block
		block discarded – undo
260	260	echo ' document.forms[2].submit();';
261	261	} ?>">
262	262	<h1>XML-RPC
263		- <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
	263	+ <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
264	264	/
265		- <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
	265	+ <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
266	266	JSON-RPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>)
267	267	</h1>
268	268	<form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	</select>
326	326	</td>
327	327	<td class="labelcell">Timeout:</td>
328		- <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
	328	+ <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
329	329	<td></td>
330	330	<td></td>
331	331	</tr>

gggeek / phpxmlrpc

Push — master ( 2e14d2...e2ee8e )

Status

Category

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

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

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

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

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

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

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

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