@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests involving Requests and Responses, except for the parsing part |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests involving automatic encoding/decoding of php values into xmlrpc values (the Encoder class). |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing. |
76 | 76 | /// We should fix that, then re-enable this test |
77 | 77 | if (version_compare(PHP_VERSION, '5.6.0', '>=')) { |
78 | - $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>'); |
|
78 | + $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>'); |
|
79 | 79 | $this->assertEquals($string, $i->scalarVal()); |
80 | 80 | } |
81 | 81 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests involving the Client class (and no server). |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $this->client->server .= 'XXX'; |
36 | 36 | $dnsinfo = @dns_get_record($this->client->server); |
37 | 37 | if ($dnsinfo) { |
38 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
38 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
39 | 39 | } else { |
40 | 40 | $r = $this->client->send($m, 5); |
41 | 41 | // make sure there's no freaking catchall DNS in effect |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | // now test a successful connection |
64 | 64 | $server = explode(':', $this->args['HTTPSERVER']); |
65 | - if (count($server) > 1) { |
|
65 | + if (count($server)>1) { |
|
66 | 66 | $this->client->port = $server[1]; |
67 | 67 | } |
68 | 68 | $this->client->server = $server[0]; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests involving the Value class. |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $this->assertequals(1, count($v1)); |
156 | 156 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
157 | 157 | |
158 | - foreach($v1 as $key => $val) |
|
158 | + foreach ($v1 as $key => $val) |
|
159 | 159 | { |
160 | 160 | $this->assertArrayHasKey($key, $out); |
161 | 161 | $expected = $out[$key]; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $this->assertequals(2, count($v2)); |
171 | 171 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
172 | 172 | $i = 0; |
173 | - foreach($v2 as $key => $val) |
|
173 | + foreach ($v2 as $key => $val) |
|
174 | 174 | { |
175 | 175 | $expected = $out[$i]; |
176 | 176 | $this->assertequals($expected['key'], $key); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | { |
185 | 185 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
186 | 186 | $data = array(); |
187 | - for ($i = 0; $i < 500000; $i++ ) { |
|
187 | + for ($i = 0; $i<500000; $i++) { |
|
188 | 188 | $data[] = 'hello world'; |
189 | 189 | } |
190 | 190 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests involving xml parsing. |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | public function testI8() |
103 | 103 | { |
104 | - if (PHP_INT_SIZE == 4 ) { |
|
104 | + if (PHP_INT_SIZE == 4) { |
|
105 | 105 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
106 | 106 | return; |
107 | 107 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | public function testUnicodeInMemberName() |
178 | 178 | { |
179 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
179 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
180 | 180 | $v = array($str => new xmlrpcval(1)); |
181 | 181 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
182 | 182 | $r = $r->serialize(); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $response = @utf8_encode( |
193 | 193 | '<?xml version="1.0"?> |
194 | 194 | <!-- covers what happens when lib receives UTF8 chars in response text and comments --> |
195 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
195 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
196 | 196 | <methodResponse> |
197 | 197 | <fault> |
198 | 198 | <value> |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | </member> |
204 | 204 | <member> |
205 | 205 | <name>faultString</name> |
206 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
206 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
207 | 207 | </member> |
208 | 208 | </struct> |
209 | 209 | </value> |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $m = $this->newRequest('dummy'); |
213 | 213 | $r = $m->parseResponse($response); |
214 | 214 | $v = $r->faultString(); |
215 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
215 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | public function testBrokenRequests() |
@@ -419,8 +419,8 @@ discard block |
||
419 | 419 | $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values; |
420 | 420 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true; |
421 | 421 | |
422 | - foreach($values as $value) { |
|
423 | - $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> '; |
|
422 | + foreach ($values as $value) { |
|
423 | + $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> '; |
|
424 | 424 | $r = $s->parseResponse($f); |
425 | 425 | $v = $r->faultCode(); |
426 | 426 | $this->assertEquals(2, $v, "Testing $value"); |
@@ -524,11 +524,11 @@ discard block |
||
524 | 524 | |
525 | 525 | public function testUTF8Response() |
526 | 526 | { |
527 | - $string = chr(224) . chr(252) . chr(232); |
|
527 | + $string = chr(224).chr(252).chr(232); |
|
528 | 528 | |
529 | 529 | $s = $this->newRequest('dummy'); |
530 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
531 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
530 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
531 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
532 | 532 | '; |
533 | 533 | $r = $s->parseResponse($f, false, 'phpvals'); |
534 | 534 | $v = $r->value(); |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | $this->assertEquals($string, $v); |
537 | 537 | |
538 | 538 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
539 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
539 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
540 | 540 | '; |
541 | 541 | $r = $s->parseResponse($f, false, 'phpvals'); |
542 | 542 | $v = $r->value(); |
@@ -552,11 +552,11 @@ discard block |
||
552 | 552 | |
553 | 553 | public function testLatin1Response() |
554 | 554 | { |
555 | - $string = chr(224) . chr(252) . chr(232); |
|
555 | + $string = chr(224).chr(252).chr(232); |
|
556 | 556 | |
557 | 557 | $s = $this->newRequest('dummy'); |
558 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
559 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
558 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
559 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
560 | 560 | '; |
561 | 561 | $r = $s->parseResponse($f, false, 'phpvals'); |
562 | 562 | $v = $r->value(); |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | $this->assertEquals($string, $v); |
565 | 565 | |
566 | 566 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
567 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
567 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
568 | 568 | '; |
569 | 569 | $r = $s->parseResponse($f, false, 'phpvals'); |
570 | 570 | $v = $r->value(); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
6 | 6 | use PHPUnit\Framework\TestResult; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function _run($result = NULL) |
30 | 30 | { |
31 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
31 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
32 | 32 | |
33 | 33 | if ($result === NULL) { |
34 | 34 | $result = $this->createResult(); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | parent::set_up(); |
60 | 60 | |
61 | 61 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
62 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
63 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
62 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
63 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
64 | 64 | } |
65 | 65 | } |