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-31 13:01 UTC

Status

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

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }
 
 $targetFile = null;
@@ -38,5 +38,5 @@  discard block
 block discarded – undo
 }
 
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }

Please login to merge, or discard this patch.

debugger/index.php 2 patches

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

@@ -4,7 +4,7 @@
 block discarded – undo
 if (isset($_GET['run'])) {
     $path = parse_url($_GET['run']);
     if (isset($path['query'])) {
-        $query = '?' . $path['query'];
+        $query = '?'.$path['query'];
     }
 }
 

Please login to merge, or discard this 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.

tests/phpunit_coverage.php 1 patch

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

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

@@ -66,11 +66,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.

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/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/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/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.

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

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

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
16	16	}
17	17
18		- include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
	18	+ include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
19	19	}
20	20
21	21	$targetFile = null;
		@@ -38,5 +38,5 @@ discard block
		block discarded – undo
38	38	}
39	39
40	40	if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
41		- include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
	41	+ include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
42	42	}

		@@ -4,7 +4,7 @@
		block discarded – undo
4	4	if (isset($_GET['run'])) {
5	5	$path = parse_url($_GET['run']);
6	6	if (isset($path['query'])) {
7		- $query = '?' . $path['query'];
	7	+ $query = '?'.$path['query'];
8	8	}
9	9	}
10	10

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

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

		@@ -66,11 +66,12 @@
		block discarded – undo
66	66	$a = $req->getParam(0);
67	67	$b = $req->getParam(1);
68	68
69		- if ($a->scalartyp() == Value::$xmlrpcNull)
70		- return new Response(new Value(plain_findstate($b->scalarval())));
71		- else
72		- return new Response(new Value(plain_findstate($a->scalarval())));
73		-}
	69	+ if ($a->scalartyp() == Value::$xmlrpcNull) {
	70	+ return new Response(new Value(plain_findstate($b->scalarval())));
	71	+ } else {
	72	+ return new Response(new Value(plain_findstate($a->scalarval())));
	73	+ }
	74	+ }
74	75
75	76	return array(
76	77	"tests.getallheaders" => 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

gggeek / phpxmlrpc

Pull Request — master (#109)

Status

Category

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

Braces +6 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 +6 added lines, -6 removed lines patch added patch discarded remove patch

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

Spacing +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 +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

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