@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | /** |
3 | 3 | * NB: do not let your IDE fool you. The correct encoding for this file is NOT UTF8. |
4 | 4 | */ |
5 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
6 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
5 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
6 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/parse_args.php'; |
|
8 | +include_once __DIR__.'/parse_args.php'; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * Tests involving parsing of xml and handling of xmlrpc values |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | public function testUnicodeInMemberName() |
63 | 63 | { |
64 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
64 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
65 | 65 | $v = array($str => new xmlrpcval(1)); |
66 | 66 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
67 | 67 | $r = $r->serialize(); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | <!-- $Id --> |
79 | 79 | <!-- found by G. giunta, covers what happens when lib receives |
80 | 80 | UTF8 chars in response text and comments --> |
81 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
81 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
82 | 82 | <methodResponse> |
83 | 83 | <fault> |
84 | 84 | <value> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | </member> |
90 | 90 | <member> |
91 | 91 | <name>faultString</name> |
92 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
92 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
93 | 93 | </member> |
94 | 94 | </struct> |
95 | 95 | </value> |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $m = $this->newMsg('dummy'); |
99 | 99 | $r = $m->parseResponse($response); |
100 | 100 | $v = $r->faultString(); |
101 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
101 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | public function testValidNumbers() |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | public function testI8() |
161 | 161 | { |
162 | - if (PHP_INT_SIZE == 4 ) { |
|
162 | + if (PHP_INT_SIZE == 4) { |
|
163 | 163 | $this->markTestSkipped('did not find a locale which sets decimal separator to comma'); |
164 | 164 | return; |
165 | 165 | } |
@@ -482,11 +482,11 @@ discard block |
||
482 | 482 | |
483 | 483 | public function testUTF8Response() |
484 | 484 | { |
485 | - $string = chr(224) . chr(252) . chr(232); |
|
485 | + $string = chr(224).chr(252).chr(232); |
|
486 | 486 | |
487 | 487 | $s = $this->newMsg('dummy'); |
488 | - $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> |
|
489 | -<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> |
|
488 | + $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> |
|
489 | +<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> |
|
490 | 490 | '; |
491 | 491 | $r = $s->parseResponse($f, false, 'phpvals'); |
492 | 492 | $v = $r->value(); |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | $this->assertEquals($string, $v); |
495 | 495 | |
496 | 496 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
497 | -<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> |
|
497 | +<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> |
|
498 | 498 | '; |
499 | 499 | $r = $s->parseResponse($f, false, 'phpvals'); |
500 | 500 | $v = $r->value(); |
@@ -509,11 +509,11 @@ discard block |
||
509 | 509 | |
510 | 510 | public function testLatin1Response() |
511 | 511 | { |
512 | - $string = chr(224) . chr(252) . chr(232); |
|
512 | + $string = chr(224).chr(252).chr(232); |
|
513 | 513 | |
514 | 514 | $s = $this->newMsg('dummy'); |
515 | - $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> |
|
516 | -<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> |
|
515 | + $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> |
|
516 | +<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> |
|
517 | 517 | '; |
518 | 518 | $r = $s->parseResponse($f, false, 'phpvals'); |
519 | 519 | $v = $r->value(); |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | $this->assertEquals($string, $v); |
522 | 522 | |
523 | 523 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
524 | -<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> |
|
524 | +<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> |
|
525 | 525 | '; |
526 | 526 | $r = $s->parseResponse($f, false, 'phpvals'); |
527 | 527 | $v = $r->value(); |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | $this->assertequals(1, count($v1)); |
617 | 617 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
618 | 618 | |
619 | - foreach($v1 as $key => $val) |
|
619 | + foreach ($v1 as $key => $val) |
|
620 | 620 | { |
621 | 621 | $this->assertContains($key, $out); |
622 | 622 | $expected = $out[$key]; |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | $this->assertequals(2, count($v2)); |
632 | 632 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
633 | 633 | $i = 0; |
634 | - foreach($v2 as $key => $val) |
|
634 | + foreach ($v2 as $key => $val) |
|
635 | 635 | { |
636 | 636 | $expected = $out[$i]; |
637 | 637 | $this->assertequals($expected['key'], $key); |