@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for the bundled debugger. |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | $this->args = argParser::getArgs(); |
13 | 13 | |
14 | 14 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
15 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
16 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
15 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
16 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function testIndex() |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/parse_args.php'; |
|
3 | +include_once __DIR__.'/parse_args.php'; |
|
4 | 4 | |
5 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
5 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
6 | 6 | |
7 | 7 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
8 | 8 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public function _run($result = NULL) |
27 | 27 | { |
28 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
28 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
29 | 29 | |
30 | 30 | if ($result === NULL) { |
31 | 31 | $result = $this->createResult(); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
62 | 62 | { |
63 | - $url = $this->baseUrl . $path; |
|
63 | + $url = $this->baseUrl.$path; |
|
64 | 64 | |
65 | 65 | $ch = curl_init($url); |
66 | 66 | curl_setopt_array($ch, array( |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
80 | 80 | } |
81 | - if ($this->args['DEBUG'] > 0) { |
|
81 | + if ($this->args['DEBUG']>0) { |
|
82 | 82 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
83 | 83 | } |
84 | 84 | $page = curl_exec($ch); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | protected function getClient($path) |
98 | 98 | { |
99 | - $client = new xmlrpc_client($this->baseUrl . $path); |
|
99 | + $client = new xmlrpc_client($this->baseUrl.$path); |
|
100 | 100 | if ($this->collectCodeCoverageInformation) { |
101 | 101 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
102 | 102 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for php files in the 'demo' directory. |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | $this->args = argParser::getArgs(); |
15 | 15 | |
16 | 16 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
17 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
18 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
17 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
18 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function testVardemo() |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
2 | +require_once __DIR__."/client/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
11 | 11 | |
12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
14 | 14 | |
15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
17 | 17 | |
18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
20 | 20 | |
21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
23 | 23 | |
24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
28 | 28 | |
29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
31 | -output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>"); |
|
30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
31 | +output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>"); |
|
32 | 32 | |
33 | 33 | $v = new PhpXmlRpc\Value( |
34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | ), |
42 | 42 | "array" |
43 | 43 | ); |
44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
45 | 45 | |
46 | 46 | $v = new PhpXmlRpc\Value( |
47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | ), |
62 | 62 | "struct" |
63 | 63 | ); |
64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
65 | 65 | |
66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
68 | 68 | |
69 | 69 | class MyClass |
70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
80 | 80 | |
81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
88 | 88 | |
89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
90 | 90 | // The greek word 'kosme' |
91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
94 | 94 | if (function_exists('mb_convert_encoding')) { |
95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
100 | 100 | $req->method('examples.getStateName'); |
101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
103 | 103 | |
104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
107 | 107 | |
108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
109 | 109 | $t = time(); |
110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
111 | 111 | output("Now is $t --> $date\n"); |
112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
114 | 114 | output("That is to say $date --> $tb\n"); |
115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
117 | 117 | output("</pre>\n"); |
118 | 118 | |
119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
123 | 123 | |
124 | 124 | output('</body></html>'); |
@@ -26,11 +26,11 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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( |