|
@@ -2,10 +2,10 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
} |
|
@@ -483,11 +483,11 @@ discard block |
|
|
block discarded – undo |
|
483
|
483
|
|
|
484
|
484
|
public function testUTF8Response() |
|
485
|
485
|
{ |
|
486
|
|
- $string = chr(224) . chr(252) . chr(232); |
|
|
486
|
+ $string = chr(224).chr(252).chr(232); |
|
487
|
487
|
|
|
488
|
488
|
$s = $this->newMsg('dummy'); |
|
489
|
|
- $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> |
|
490
|
|
-<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> |
|
|
489
|
+ $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> |
|
|
490
|
+<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> |
|
491
|
491
|
'; |
|
492
|
492
|
$r = $s->parseResponse($f, false, 'phpvals'); |
|
493
|
493
|
$v = $r->value(); |
|
@@ -495,7 +495,7 @@ discard block |
|
|
block discarded – undo |
|
495
|
495
|
$this->assertEquals($string, $v); |
|
496
|
496
|
|
|
497
|
497
|
$f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
498
|
|
-<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
|
+<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> |
|
499
|
499
|
'; |
|
500
|
500
|
$r = $s->parseResponse($f, false, 'phpvals'); |
|
501
|
501
|
$v = $r->value(); |
|
@@ -510,11 +510,11 @@ discard block |
|
|
block discarded – undo |
|
510
|
510
|
|
|
511
|
511
|
public function testLatin1Response() |
|
512
|
512
|
{ |
|
513
|
|
- $string = chr(224) . chr(252) . chr(232); |
|
|
513
|
+ $string = chr(224).chr(252).chr(232); |
|
514
|
514
|
|
|
515
|
515
|
$s = $this->newMsg('dummy'); |
|
516
|
|
- $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> |
|
517
|
|
-<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> |
|
|
516
|
+ $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> |
|
|
517
|
+<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> |
|
518
|
518
|
'; |
|
519
|
519
|
$r = $s->parseResponse($f, false, 'phpvals'); |
|
520
|
520
|
$v = $r->value(); |
|
@@ -522,7 +522,7 @@ discard block |
|
|
block discarded – undo |
|
522
|
522
|
$this->assertEquals($string, $v); |
|
523
|
523
|
|
|
524
|
524
|
$f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
525
|
|
-<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
|
+<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> |
|
526
|
526
|
'; |
|
527
|
527
|
$r = $s->parseResponse($f, false, 'phpvals'); |
|
528
|
528
|
$v = $r->value(); |
|
@@ -616,7 +616,7 @@ discard block |
|
|
block discarded – undo |
|
616
|
616
|
$v1 = new xmlrpcval(array(new xmlrpcval('one'), new xmlrpcval('two')), 'array'); |
|
617
|
617
|
$this->assertequals(1, count($v1)); |
|
618
|
618
|
$out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
|
619
|
|
- foreach($v1 as $key => $val) |
|
|
619
|
+ foreach ($v1 as $key => $val) |
|
620
|
620
|
{ |
|
621
|
621
|
$expected = each($out); |
|
622
|
622
|
$this->assertequals($expected['key'], $key); |
|
@@ -630,7 +630,7 @@ discard block |
|
|
block discarded – undo |
|
630
|
630
|
$v2 = new \PhpXmlRpc\Value(array(new \PhpXmlRpc\Value('one'), new \PhpXmlRpc\Value('two')), 'array'); |
|
631
|
631
|
$this->assertequals(2, count($v2)); |
|
632
|
632
|
$out = array(0 => 'object', 1 => 'object'); |
|
633
|
|
- foreach($v2 as $key => $val) |
|
|
633
|
+ foreach ($v2 as $key => $val) |
|
634
|
634
|
{ |
|
635
|
635
|
$expected = each($out); |
|
636
|
636
|
$this->assertequals($expected['key'], $key); |