@@ -3,7 +3,7 @@ |
||
3 | 3 | if (isset($_GET['run'])) { |
4 | 4 | $path = parse_url($_GET['run']); |
5 | 5 | if (isset($path['query'])) { |
6 | - $query = '?' . $path['query']; |
|
6 | + $query = '?'.$path['query']; |
|
7 | 7 | } |
8 | 8 | } |
9 | 9 | ?> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/parse_args.php'; |
|
3 | +include_once __DIR__.'/parse_args.php'; |
|
4 | 4 | |
5 | 5 | abstract class PhpXmlRpc_LocalFileTestCase extends PHPUnit_Framework_TestCase |
6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | public function run(PHPUnit_Framework_TestResult $result = NULL) |
17 | 17 | { |
18 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
18 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
19 | 19 | |
20 | 20 | if ($result === NULL) { |
21 | 21 | $result = $this->createResult(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | protected function request($file, $method = 'GET', $payload = '', $emptyPageOk = false) |
45 | 45 | { |
46 | - $url = $this->baseUrl . $file; |
|
46 | + $url = $this->baseUrl.$file; |
|
47 | 47 | |
48 | 48 | $ch = curl_init($url); |
49 | 49 | curl_setopt_array($ch, array( |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | { |
62 | 62 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); |
63 | 63 | } |
64 | - if ($this->args['DEBUG'] > 0) { |
|
64 | + if ($this->args['DEBUG']>0) { |
|
65 | 65 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
66 | 66 | } |
67 | 67 | $page = curl_exec($ch); |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | // test for php version |
18 | 18 | $ver = phpversion(); |
19 | 19 | $tests['php_version'] = array(); |
20 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
21 | - if (version_compare($ver, '5.3.0') < 0) { |
|
20 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
21 | + if (version_compare($ver, '5.3.0')<0) { |
|
22 | 22 | $tests['php_version']['status'] = 0; |
23 | 23 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later'; |
24 | 24 | } else { |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | // test for php version |
52 | 52 | $ver = phpversion(); |
53 | 53 | $tests['php_version'] = array(); |
54 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
55 | - if (version_compare($ver, '5.3.0') < 0) { |
|
54 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
55 | + if (version_compare($ver, '5.3.0')<0) { |
|
56 | 56 | $tests['php_version']['status'] = 0; |
57 | 57 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later'; |
58 | 58 | } else { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $info = curl_version(); |
80 | 80 | $tests['curl']['status'] = 2; |
81 | 81 | $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols"; |
82 | - if (version_compare($ver, '4.3.8') < 0) { |
|
82 | + if (version_compare($ver, '4.3.8')<0) { |
|
83 | 83 | $tests['curl']['status'] = 1; |
84 | 84 | $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives"; |
85 | 85 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | <?php |
168 | 168 | $res = phpxmlrpc_verify_compat('server'); |
169 | 169 | foreach ($res as $test => $result) { |
170 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
170 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
171 | 171 | } |
172 | 172 | ?> |
173 | 173 | </tbody> |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | <?php |
185 | 185 | $res = phpxmlrpc_verify_compat('client'); |
186 | 186 | foreach ($res as $test => $result) { |
187 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
187 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
188 | 188 | } |
189 | 189 | ?> |
190 | 190 | </tbody> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LocalFileTestCase.php'; |
|
3 | +include_once __DIR__.'/LocalFileTestCase.php'; |
|
4 | 4 | |
5 | 5 | class DebuggerTest extends PhpXmlRpc_LocalFileTestCase |
6 | 6 | { |
@@ -8,9 +8,9 @@ discard block |
||
8 | 8 | { |
9 | 9 | $this->args = argParser::getArgs(); |
10 | 10 | |
11 | - $this->baseUrl = $this->args['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['URI'] ); |
|
11 | + $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['URI']); |
|
12 | 12 | |
13 | - $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); |
|
13 | + $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function testIndex() |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
5 | 5 | |
6 | -include_once __DIR__ . '/parse_args.php'; |
|
6 | +include_once __DIR__.'/parse_args.php'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/3LocalhostTest.php'; |
|
8 | +include_once __DIR__.'/3LocalhostTest.php'; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * Tests which stress http features of the library. |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | function _runtests() |
21 | 21 | { |
22 | 22 | $unsafeMethods = array('testHttps', 'testCatchExceptions', 'testUtf8Method', 'testServerComments', 'testExoticCharsetsRequests', 'testExoticCharsetsRequests2', 'testExoticCharsetsRequests3'); |
23 | - foreach(get_class_methods('LocalhostTest') as $method) |
|
23 | + foreach (get_class_methods('LocalhostTest') as $method) |
|
24 | 24 | { |
25 | - if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
|
25 | + if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
|
26 | 26 | { |
27 | 27 | if (!isset(self::$failed_tests[$method])) |
28 | 28 | $this->$method(); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | function testDeflate() |
38 | 38 | { |
39 | - if(!function_exists('gzdeflate')) |
|
39 | + if (!function_exists('gzdeflate')) |
|
40 | 40 | { |
41 | 41 | $this->markTestSkipped('Zlib missing: cannot test deflate functionality'); |
42 | 42 | return; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | function testGzip() |
50 | 50 | { |
51 | - if(!function_exists('gzdeflate')) |
|
51 | + if (!function_exists('gzdeflate')) |
|
52 | 52 | { |
53 | 53 | $this->markTestSkipped('Zlib missing: cannot test gzip functionality'); |
54 | 54 | return; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | function testKeepAlives() |
62 | 62 | { |
63 | - if(!function_exists('curl_init')) |
|
63 | + if (!function_exists('curl_init')) |
|
64 | 64 | { |
65 | 65 | $this->markTestSkipped('CURL missing: cannot test http 1.1'); |
66 | 66 | return; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | function testHttp11() |
85 | 85 | { |
86 | - if(!function_exists('curl_init')) |
|
86 | + if (!function_exists('curl_init')) |
|
87 | 87 | { |
88 | 88 | $this->markTestSkipped('CURL missing: cannot test http 1.1'); |
89 | 89 | return; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | function testHttp11Gzip() |
100 | 100 | { |
101 | - if(!function_exists('curl_init')) |
|
101 | + if (!function_exists('curl_init')) |
|
102 | 102 | { |
103 | 103 | $this->markTestSkipped('CURL missing: cannot test http 1.1'); |
104 | 104 | return; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | function testHttp11Deflate() |
115 | 115 | { |
116 | - if(!function_exists('curl_init')) |
|
116 | + if (!function_exists('curl_init')) |
|
117 | 117 | { |
118 | 118 | $this->markTestSkipped('CURL missing: cannot test http 1.1'); |
119 | 119 | return; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | function testHttp11Proxy() |
130 | 130 | { |
131 | - if(!function_exists('curl_init')) |
|
131 | + if (!function_exists('curl_init')) |
|
132 | 132 | { |
133 | 133 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
134 | 134 | return; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | function testHttps() |
151 | 151 | { |
152 | - if(!function_exists('curl_init')) |
|
152 | + if (!function_exists('curl_init')) |
|
153 | 153 | { |
154 | 154 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
155 | 155 | return; |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | |
167 | 167 | function testHttpsProxy() |
168 | 168 | { |
169 | - if(!function_exists('curl_init')) |
|
169 | + if (!function_exists('curl_init')) |
|
170 | 170 | { |
171 | 171 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
172 | 172 | return; |
@@ -24,8 +24,9 @@ discard block |
||
24 | 24 | { |
25 | 25 | if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
26 | 26 | { |
27 | - if (!isset(self::$failed_tests[$method])) |
|
28 | - $this->$method(); |
|
27 | + if (!isset(self::$failed_tests[$method])) { |
|
28 | + $this->$method(); |
|
29 | + } |
|
29 | 30 | } |
30 | 31 | /*if ($this->_failed) |
31 | 32 | { |
@@ -76,9 +77,9 @@ discard block |
||
76 | 77 | { |
77 | 78 | $this->client->setProxy($this->args['PROXYSERVER'], $this->args['PROXYPORT']); |
78 | 79 | $this->_runtests(); |
80 | + } else { |
|
81 | + $this->markTestSkipped('PROXY definition missing: cannot test proxy'); |
|
79 | 82 | } |
80 | - else |
|
81 | - $this->markTestSkipped('PROXY definition missing: cannot test proxy'); |
|
82 | 83 | } |
83 | 84 | |
84 | 85 | function testHttp11() |
@@ -132,8 +133,7 @@ discard block |
||
132 | 133 | { |
133 | 134 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
134 | 135 | return; |
135 | - } |
|
136 | - else if ($this->args['PROXYSERVER'] == '') |
|
136 | + } else if ($this->args['PROXYSERVER'] == '') |
|
137 | 137 | { |
138 | 138 | $this->markTestSkipped('PROXY definition missing: cannot test proxy w. http 1.1'); |
139 | 139 | return; |
@@ -170,8 +170,7 @@ discard block |
||
170 | 170 | { |
171 | 171 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
172 | 172 | return; |
173 | - } |
|
174 | - else if ($this->args['PROXYSERVER'] == '') |
|
173 | + } else if ($this->args['PROXYSERVER'] == '') |
|
175 | 174 | { |
176 | 175 | $this->markTestSkipped('PROXY definition missing: cannot test proxy w. http 1.1'); |
177 | 176 | return; |
@@ -1,14 +1,14 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Benchmarking suite for the PHP-XMLRPC lib. |
|
4 | - * |
|
5 | - * @author Gaetano Giunta |
|
6 | - * @copyright (c) 2005-2015 G. Giunta |
|
7 | - * @license code licensed under the BSD License: see file license.txt |
|
8 | - * |
|
9 | - * @todo add a test for response ok in call testing |
|
10 | - * @todo add support for --help option to give users the list of supported parameters |
|
11 | - **/ |
|
3 | + * Benchmarking suite for the PHP-XMLRPC lib. |
|
4 | + * |
|
5 | + * @author Gaetano Giunta |
|
6 | + * @copyright (c) 2005-2015 G. Giunta |
|
7 | + * @license code licensed under the BSD License: see file license.txt |
|
8 | + * |
|
9 | + * @todo add a test for response ok in call testing |
|
10 | + * @todo add support for --help option to give users the list of supported parameters |
|
11 | + **/ |
|
12 | 12 | |
13 | 13 | use PhpXmlRpc\PhpXmlRpc; |
14 | 14 | use PhpXmlRpc\Value; |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | use PhpXmlRpc\Response; |
18 | 18 | use PhpXmlRpc\Encoder; |
19 | 19 | |
20 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
20 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
21 | 21 | |
22 | -include __DIR__ . '/parse_args.php'; |
|
22 | +include __DIR__.'/parse_args.php'; |
|
23 | 23 | $args = argParser::getArgs(); |
24 | 24 | |
25 | 25 | function begin_test($test_name, $test_case) |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | if (!isset($test_results[$test_name][$test_case])) { |
40 | 40 | trigger_error('ending test that was not started'); |
41 | 41 | } |
42 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
42 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
43 | 43 | $test_results[$test_name][$test_case]['result'] = $test_result; |
44 | 44 | echo '.'; |
45 | 45 | flush(); |
@@ -73,24 +73,24 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | if ($is_web) { |
76 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
76 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
77 | 77 | if ($xd) { |
78 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
78 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
79 | 79 | } |
80 | 80 | flush(); |
81 | 81 | ob_flush(); |
82 | 82 | } else { |
83 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
83 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
84 | 84 | if ($xd) { |
85 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
85 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | |
89 | 89 | // test 'manual style' data encoding vs. 'automatic style' encoding |
90 | 90 | begin_test('Data encoding (large array)', 'manual encoding'); |
91 | -for ($i = 0; $i < $num_tests; $i++) { |
|
91 | +for ($i = 0; $i<$num_tests; $i++) { |
|
92 | 92 | $vals = array(); |
93 | - for ($j = 0; $j < 10; $j++) { |
|
93 | + for ($j = 0; $j<10; $j++) { |
|
94 | 94 | $valarray = array(); |
95 | 95 | foreach ($data[$j] as $key => $val) { |
96 | 96 | $values = array(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | begin_test('Data encoding (large array)', 'automatic encoding'); |
117 | 117 | $encoder = new Encoder(); |
118 | -for ($i = 0; $i < $num_tests; $i++) { |
|
118 | +for ($i = 0; $i<$num_tests; $i++) { |
|
119 | 119 | $value = $encoder->encode($data, array('auto_dates')); |
120 | 120 | $out = $value->serialize(); |
121 | 121 | } |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | |
124 | 124 | if (function_exists('xmlrpc_set_type')) { |
125 | 125 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
126 | - for ($i = 0; $i < $num_tests; $i++) { |
|
127 | - for ($j = 0; $j < 10; $j++) { |
|
126 | + for ($i = 0; $i<$num_tests; $i++) { |
|
127 | + for ($j = 0; $j<10; $j++) { |
|
128 | 128 | foreach ($keys as $k) { |
129 | 129 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
130 | 130 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -138,18 +138,18 @@ discard block |
||
138 | 138 | // test 'old style' data decoding vs. 'automatic style' decoding |
139 | 139 | $dummy = new Request(''); |
140 | 140 | $out = new Response($value); |
141 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
141 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
142 | 142 | |
143 | 143 | begin_test('Data decoding (large array)', 'manual decoding'); |
144 | -for ($i = 0; $i < $num_tests; $i++) { |
|
144 | +for ($i = 0; $i<$num_tests; $i++) { |
|
145 | 145 | $response = $dummy->ParseResponse($in, true); |
146 | 146 | $value = $response->value(); |
147 | 147 | $result = array(); |
148 | - foreach($value as $val1) { |
|
148 | + foreach ($value as $val1) { |
|
149 | 149 | $out = array(); |
150 | - foreach($val1 as $name => $val) { |
|
150 | + foreach ($val1 as $name => $val) { |
|
151 | 151 | $out[$name] = array(); |
152 | - foreach($val as $data) { |
|
152 | + foreach ($val as $data) { |
|
153 | 153 | $out[$name][] = $data->scalarval(); |
154 | 154 | } |
155 | 155 | } |
@@ -159,18 +159,18 @@ discard block |
||
159 | 159 | end_test('Data decoding (large array)', 'manual decoding', $result); |
160 | 160 | |
161 | 161 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
162 | -for ($i = 0; $i < $num_tests; $i++) { |
|
162 | +for ($i = 0; $i<$num_tests; $i++) { |
|
163 | 163 | $response = $dummy->ParseResponse($in, true); |
164 | 164 | $value = $response->value(); |
165 | 165 | $result = array(); |
166 | 166 | $l = $value->arraysize(); |
167 | - for ($k = 0; $k < $l; $k++) { |
|
167 | + for ($k = 0; $k<$l; $k++) { |
|
168 | 168 | $val1 = $value->arraymem($k); |
169 | 169 | $out = array(); |
170 | 170 | while (list($name, $val) = $val1->structeach()) { |
171 | 171 | $out[$name] = array(); |
172 | 172 | $m = $val->arraysize(); |
173 | - for ($j = 0; $j < $m; $j++) { |
|
173 | + for ($j = 0; $j<$m; $j++) { |
|
174 | 174 | $data = $val->arraymem($j); |
175 | 175 | $out[$name][] = $data->scalarval(); |
176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
182 | 182 | |
183 | 183 | begin_test('Data decoding (large array)', 'automatic decoding'); |
184 | -for ($i = 0; $i < $num_tests; $i++) { |
|
184 | +for ($i = 0; $i<$num_tests; $i++) { |
|
185 | 185 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
186 | 186 | $value = $response->value(); |
187 | 187 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | if (function_exists('xmlrpc_decode')) { |
191 | 191 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
192 | - for ($i = 0; $i < $num_tests; $i++) { |
|
192 | + for ($i = 0; $i<$num_tests; $i++) { |
|
193 | 193 | $response = $dummy->ParseResponse($in, true, 'xml'); |
194 | 194 | $value = xmlrpc_decode($response->value()); |
195 | 195 | } |
@@ -203,15 +203,15 @@ discard block |
||
203 | 203 | $value = $encoder->encode($data1, array('auto_dates')); |
204 | 204 | $req = new Request('interopEchoTests.echoValue', array($value)); |
205 | 205 | $reqs = array(); |
206 | - for ($i = 0; $i < 25; $i++) { |
|
206 | + for ($i = 0; $i<25; $i++) { |
|
207 | 207 | $reqs[] = $req; |
208 | 208 | } |
209 | 209 | $server = explode(':', $args['LOCALSERVER']); |
210 | - if (count($server) > 1) { |
|
211 | - $srv = $server[1] . '://' . $server[0] . $args['URI']; |
|
210 | + if (count($server)>1) { |
|
211 | + $srv = $server[1].'://'.$server[0].$args['URI']; |
|
212 | 212 | $c = new Client($args['URI'], $server[0], $server[1]); |
213 | 213 | } else { |
214 | - $srv = $args['LOCALSERVER'] . $args['URI']; |
|
214 | + $srv = $args['LOCALSERVER'].$args['URI']; |
|
215 | 215 | $c = new Client($args['URI'], $args['LOCALSERVER']); |
216 | 216 | } |
217 | 217 | // do not interfere with http compression |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | begin_test($testName, 'http 10'); |
227 | 227 | $response = array(); |
228 | - for ($i = 0; $i < 25; $i++) { |
|
228 | + for ($i = 0; $i<25; $i++) { |
|
229 | 229 | $resp = $c->send($req); |
230 | 230 | $response[] = $resp->value(); |
231 | 231 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | if (function_exists('curl_init')) { |
235 | 235 | begin_test($testName, 'http 11 w. keep-alive'); |
236 | 236 | $response = array(); |
237 | - for ($i = 0; $i < 25; $i++) { |
|
237 | + for ($i = 0; $i<25; $i++) { |
|
238 | 238 | $resp = $c->send($req, 10, 'http11'); |
239 | 239 | $response[] = $resp->value(); |
240 | 240 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | $c->keepalive = false; |
244 | 244 | begin_test($testName, 'http 11'); |
245 | 245 | $response = array(); |
246 | - for ($i = 0; $i < 25; $i++) { |
|
246 | + for ($i = 0; $i<25; $i++) { |
|
247 | 247 | $resp = $c->send($req, 10, 'http11'); |
248 | 248 | $response[] = $resp->value(); |
249 | 249 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | begin_test($testName, 'http 10 w. compression'); |
265 | 265 | $response = array(); |
266 | - for ($i = 0; $i < 25; $i++) { |
|
266 | + for ($i = 0; $i<25; $i++) { |
|
267 | 267 | $resp = $c->send($req); |
268 | 268 | $response[] = $resp->value(); |
269 | 269 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | if (function_exists('curl_init')) { |
273 | 273 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
274 | 274 | $response = array(); |
275 | - for ($i = 0; $i < 25; $i++) { |
|
275 | + for ($i = 0; $i<25; $i++) { |
|
276 | 276 | $resp = $c->send($req, 10, 'http11'); |
277 | 277 | $response[] = $resp->value(); |
278 | 278 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | $c->keepalive = false; |
282 | 282 | begin_test($testName, 'http 11 w. compression'); |
283 | 283 | $response = array(); |
284 | - for ($i = 0; $i < 25; $i++) { |
|
284 | + for ($i = 0; $i<25; $i++) { |
|
285 | 285 | $resp = $c->send($req, 10, 'http11'); |
286 | 286 | $response[] = $resp->value(); |
287 | 287 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | foreach ($test_results as $test => $results) { |
303 | 303 | echo "\nTEST: $test\n"; |
304 | 304 | foreach ($results as $case => $data) { |
305 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
305 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
306 | 306 | } |
307 | 307 | } |
308 | 308 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | if (isset($argv)) { |
42 | 42 | foreach ($argv as $param) { |
43 | 43 | $param = explode('=', $param); |
44 | - if (count($param) > 1) { |
|
44 | + if (count($param)>1) { |
|
45 | 45 | $pname = strtoupper(ltrim($param[0], '-')); |
46 | 46 | $$pname = $param[1]; |
47 | 47 | } |
@@ -72,18 +72,18 @@ discard block |
||
72 | 72 | $args['HTTPSURI'] = $HTTPSURI; |
73 | 73 | } |
74 | 74 | if (isset($HTTPSIGNOREPEER)) { |
75 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
75 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
76 | 76 | } |
77 | 77 | if (isset($HTTPSVERIFYHOST)) { |
78 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
78 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
79 | 79 | } |
80 | 80 | if (isset($SSLVERSION)) { |
81 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
81 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
82 | 82 | } |
83 | 83 | if (isset($PROXY)) { |
84 | 84 | $arr = explode(':', $PROXY); |
85 | 85 | $args['PROXYSERVER'] = $arr[0]; |
86 | - if (count($arr) > 1) { |
|
86 | + if (count($arr)>1) { |
|
87 | 87 | $args['PROXYPORT'] = $arr[1]; |
88 | 88 | } else { |
89 | 89 | $args['PROXYPORT'] = 8080; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | } |
114 | 114 | if ($URI[0] != '/') { |
115 | - $URI = '/' . $URI; |
|
115 | + $URI = '/'.$URI; |
|
116 | 116 | } |
117 | 117 | $args['URI'] = $URI; |
118 | 118 | if (isset($LOCALPATH)) { |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Used to serve back the server-side code coverage results to phpunit-selenium |
|
4 | - * |
|
5 | - * @copyright (C) 2007-2015 G. Giunta |
|
6 | - * @license code licensed under the BSD License: see file license.txt |
|
7 | - **/ |
|
3 | + * Used to serve back the server-side code coverage results to phpunit-selenium |
|
4 | + * |
|
5 | + * @copyright (C) 2007-2015 G. Giunta |
|
6 | + * @license code licensed under the BSD License: see file license.txt |
|
7 | + **/ |
|
8 | 8 | |
9 | 9 | $coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
10 | 10 |
@@ -6,7 +6,7 @@ |
||
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 server.php |
12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | 4 | |
5 | -include_once __DIR__ . '/parse_args.php'; |
|
5 | +include_once __DIR__.'/parse_args.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Tests involving requests sent to non-existing servers |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | // make sure there's no freaking catchall DNS in effect |
56 | 56 | $dnsinfo = dns_get_record($this->client->server); |
57 | 57 | if ($dnsinfo) { |
58 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
58 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
59 | 59 | } else { |
60 | 60 | $this->assertEquals(5, $r->faultCode()); |
61 | 61 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | // now test a successful connection |
82 | 82 | $server = explode(':', $this->args['LOCALSERVER']); |
83 | - if (count($server) > 1) { |
|
83 | + if (count($server)>1) { |
|
84 | 84 | $this->client->port = $server[1]; |
85 | 85 | } |
86 | 86 | $this->client->server = $server[0]; |
@@ -20,14 +20,16 @@ |
||
20 | 20 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['LOCALSERVER'], 80); |
21 | 21 | $this->client->setDebug($this->args['DEBUG']); |
22 | 22 | |
23 | - if ($this->args['DEBUG'] == 1) |
|
24 | - ob_start(); |
|
23 | + if ($this->args['DEBUG'] == 1) { |
|
24 | + ob_start(); |
|
25 | + } |
|
25 | 26 | } |
26 | 27 | |
27 | 28 | protected function tearDown() |
28 | 29 | { |
29 | - if ($this->args['DEBUG'] != 1) |
|
30 | - return; |
|
30 | + if ($this->args['DEBUG'] != 1) { |
|
31 | + return; |
|
32 | + } |
|
31 | 33 | $out = ob_get_clean(); |
32 | 34 | $status = $this->getStatus(); |
33 | 35 | if ($status == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR |