@@ -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() |
@@ -445,11 +445,11 @@ discard block |
||
445 | 445 | |
446 | 446 | public function testUTF8Response() |
447 | 447 | { |
448 | - $string = chr(224) . chr(252) . chr(232); |
|
448 | + $string = chr(224).chr(252).chr(232); |
|
449 | 449 | |
450 | 450 | $s = $this->newMsg('dummy'); |
451 | - $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> |
|
452 | -<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> |
|
451 | + $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> |
|
452 | +<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> |
|
453 | 453 | '; |
454 | 454 | $r = $s->parseResponse($f, false, 'phpvals'); |
455 | 455 | $v = $r->value(); |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | $this->assertEquals($string, $v); |
458 | 458 | |
459 | 459 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
460 | -<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> |
|
460 | +<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> |
|
461 | 461 | '; |
462 | 462 | $r = $s->parseResponse($f, false, 'phpvals'); |
463 | 463 | $v = $r->value(); |
@@ -472,11 +472,11 @@ discard block |
||
472 | 472 | |
473 | 473 | public function testLatin1Response() |
474 | 474 | { |
475 | - $string = chr(224) . chr(252) . chr(232); |
|
475 | + $string = chr(224).chr(252).chr(232); |
|
476 | 476 | |
477 | 477 | $s = $this->newMsg('dummy'); |
478 | - $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> |
|
479 | -<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> |
|
478 | + $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> |
|
479 | +<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> |
|
480 | 480 | '; |
481 | 481 | $r = $s->parseResponse($f, false, 'phpvals'); |
482 | 482 | $v = $r->value(); |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | $this->assertEquals($string, $v); |
485 | 485 | |
486 | 486 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
487 | -<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> |
|
487 | +<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> |
|
488 | 488 | '; |
489 | 489 | $r = $s->parseResponse($f, false, 'phpvals'); |
490 | 490 | $v = $r->value(); |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | $v1 = new xmlrpcval(array(new xmlrpcval('one'), new xmlrpcval('two')), 'array'); |
579 | 579 | $this->assertequals(1, count($v1)); |
580 | 580 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
581 | - foreach($v1 as $key => $val) |
|
581 | + foreach ($v1 as $key => $val) |
|
582 | 582 | { |
583 | 583 | $expected = each($out); |
584 | 584 | $this->assertequals($expected['key'], $key); |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | $v2 = new \PhpXmlRpc\Value(array(new \PhpXmlRpc\Value('one'), new \PhpXmlRpc\Value('two')), 'array'); |
593 | 593 | $this->assertequals(2, count($v2)); |
594 | 594 | $out = array(0 => 'object', 1 => 'object'); |
595 | - foreach($v2 as $key => $val) |
|
595 | + foreach ($v2 as $key => $val) |
|
596 | 596 | { |
597 | 597 | $expected = each($out); |
598 | 598 | $this->assertequals($expected['key'], $key); |