@@ -24,7 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -require_once __DIR__ . "/_prepend.php"; |
|
| 27 | +require_once __DIR__."/_prepend.php"; |
|
| 28 | 28 | |
| 29 | 29 | use PhpXmlRpc\PhpXmlRpc; |
| 30 | 30 | use PhpXmlRpc\Server; |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | // That is generally a good idea security-wise, but you might want to allow it in case of specific needs. |
| 11 | 11 | // Look at the code in demo/server.php for an example of how to enable that. |
| 12 | 12 | |
| 13 | -require_once __DIR__ . "/../../lib/xmlrpc.inc"; |
|
| 14 | -require_once __DIR__ . "/../../lib/xmlrpcs.inc"; |
|
| 13 | +require_once __DIR__."/../../lib/xmlrpc.inc"; |
|
| 14 | +require_once __DIR__."/../../lib/xmlrpcs.inc"; |
|
| 15 | 15 | |
| 16 | 16 | $signatures1 = include(__DIR__.'/methodProviders/functions.php'); |
| 17 | 17 | $signatures2 = include(__DIR__.'/methodProviders/interop.php'); |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 5 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Tests which involve interaction with the server - carried out via the client. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | // (but only if not called from subclass objects / multitests) |
| 31 | 31 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'servertest') { |
| 32 | 32 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 33 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 33 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 34 | 34 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 35 | 35 | self::$failed_tests[$trace[$i]['function']] = true; |
| 36 | 36 | break; |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | $this->validateResponse($r); |
| 81 | 81 | if (is_array($errorCode)) { |
| 82 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 82 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 83 | 83 | } else { |
| 84 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 84 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 85 | 85 | } |
| 86 | 86 | if (!$r->faultCode()) { |
| 87 | 87 | if ($returnResponse) { |
@@ -108,20 +108,20 @@ discard block |
||
| 108 | 108 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 109 | 109 | parse_str($query, $vars); |
| 110 | 110 | $query = http_build_query(array_merge($vars, $data)); |
| 111 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 111 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | public function testString() |
| 115 | 115 | { |
| 116 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 117 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 118 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 119 | - " also don't want to miss out on \$item[0]. " . |
|
| 120 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 121 | - "a simple CR here" . chr(13) . |
|
| 122 | - "a simple LF here" . chr(10) . |
|
| 123 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 124 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 116 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 117 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 118 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 119 | + " also don't want to miss out on \$item[0]. ". |
|
| 120 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 121 | + "a simple CR here".chr(13). |
|
| 122 | + "a simple LF here".chr(10). |
|
| 123 | + "and then LFCR".chr(10).chr(13). |
|
| 124 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 125 | 125 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 126 | 126 | new xmlrpcval($sendString, 'string'), |
| 127 | 127 | )); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | public function testLatin1String() |
| 143 | 143 | { |
| 144 | 144 | $sendString = |
| 145 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 145 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 146 | 146 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 147 | 147 | $sendString. |
| 148 | 148 | '</value></param></params></methodCall>'; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function testUtf8Method() |
| 252 | 252 | { |
| 253 | 253 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 254 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 254 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 255 | 255 | new xmlrpcval('hello') |
| 256 | 256 | )); |
| 257 | 257 | $v = $this->send($m); |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | )); |
| 273 | 273 | $v = $this->send($m); |
| 274 | 274 | if ($v) { |
| 275 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 275 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | )); |
| 285 | 285 | $v = $this->send($m); |
| 286 | 286 | if ($v) { |
| 287 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 287 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | if ($v) { |
| 324 | 324 | $sz = $v->arraysize(); |
| 325 | 325 | $got = ''; |
| 326 | - for ($i = 0; $i < $sz; $i++) { |
|
| 326 | + for ($i = 0; $i<$sz; $i++) { |
|
| 327 | 327 | $b = $v->arraymem($i); |
| 328 | 328 | if ($b->scalarval()) { |
| 329 | 329 | $got .= '1'; |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $got = ''; |
| 371 | 371 | $expected = '37210'; |
| 372 | 372 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 373 | - foreach($expect_array as $val) { |
|
| 373 | + foreach ($expect_array as $val) { |
|
| 374 | 374 | $b = $v->structmem($val); |
| 375 | 375 | $got .= $b->scalarVal(); |
| 376 | 376 | } |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | { |
| 874 | 874 | // make a 'deep client copy' as the original one might have many properties set |
| 875 | 875 | // also for speed only wrap one method of the whole server |
| 876 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 876 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 877 | 877 | if ($class == '') { |
| 878 | 878 | $this->fail('Registration of remote server failed'); |
| 879 | 879 | } else { |
@@ -912,9 +912,9 @@ discard block |
||
| 912 | 912 | $cookies = array( |
| 913 | 913 | //'c1' => array(), |
| 914 | 914 | 'c2' => array('value' => 'c2'), |
| 915 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 916 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 915 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 916 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 918 | 918 | ); |
| 919 | 919 | $cookiesval = php_xmlrpc_encode($cookies); |
| 920 | 920 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -962,10 +962,10 @@ discard block |
||
| 962 | 962 | $m = new xmlrpcmsg('tests.getcookies', array()); |
| 963 | 963 | foreach ($cookies as $cookie => $val) { |
| 964 | 964 | $this->client->setCookie($cookie, $val); |
| 965 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 965 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 966 | 966 | } |
| 967 | 967 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 968 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 968 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 969 | 969 | if (!$r->faultCode()) { |
| 970 | 970 | $v = $r->value(); |
| 971 | 971 | $v = php_xmlrpc_decode($v); |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also |
| 8 | 8 | // write a specific file to disk. |
| 9 | 9 | // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file |
| 10 | -$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt'; |
|
| 10 | +$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt'; |
|
| 11 | 11 | $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : ''; |
| 12 | 12 | $fileId = file_exists($idFile) ? file_get_contents($idFile) : ''; |
| 13 | 13 | if ($randId == '' || $fileId == '' || $fileId !== $randId) { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 34 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $targetFile = null; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 57 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 57 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
| 88 | 88 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
| 89 | 89 | header('HTTP/1.1 401 Unauthorized'); |
| 90 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
| 90 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
| 91 | 91 | die('Text visible if user hits Cancel button'); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -95,11 +95,11 @@ discard block |
||
| 95 | 95 | if (isset($_GET['FORCE_REDIRECT'])) { |
| 96 | 96 | header('HTTP/1.0 302 Found'); |
| 97 | 97 | unset($_GET['FORCE_REDIRECT']); |
| 98 | - header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : '')); |
|
| 98 | + header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : '')); |
|
| 99 | 99 | die(); |
| 100 | 100 | } |
| 101 | - if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS'] > 0) { |
|
| 102 | - slowLoris((int)$_GET['SLOW_LORIS'], $s); |
|
| 101 | + if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS']>0) { |
|
| 102 | + slowLoris((int) $_GET['SLOW_LORIS'], $s); |
|
| 103 | 103 | die(); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | /// @todo as is, this method can not be used by eg. jsonrpc servers. We could look at the value $s::$responseClass |
| 115 | 115 | /// to improve that |
| 116 | - $strings = array('<?xml version="1.0"?>','<methodResponse>','<params>','<param>','<value>','<string></string>','</value>','</param>','</params>','</methodResponse>'); |
|
| 116 | + $strings = array('<?xml version="1.0"?>', '<methodResponse>', '<params>', '<param>', '<value>', '<string></string>', '</value>', '</param>', '</params>', '</methodResponse>'); |
|
| 117 | 117 | |
| 118 | 118 | header('Content-type: xml; charset=utf-8'); |
| 119 | - foreach($strings as $i => $string) { |
|
| 119 | + foreach ($strings as $i => $string) { |
|
| 120 | 120 | echo $string; |
| 121 | 121 | flush(); |
| 122 | - if ($i < count($strings) && $secs > 0 && $secs <= 60) { |
|
| 122 | + if ($i<count($strings) && $secs>0 && $secs<=60) { |
|
| 123 | 123 | sleep($secs); |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -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. |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | if (version_compare(PHP_VERSION, '8.0', '>=')) { |
| 139 | 139 | $str = sprintf("%f", $v->scalarval()); |
| 140 | 140 | } else { |
| 141 | - $str = (string)$v->scalarval(); |
|
| 141 | + $str = (string) $v->scalarval(); |
|
| 142 | 142 | } |
| 143 | 143 | if (strpos($str, ',') == 1) { |
| 144 | 144 | $r = $v->serialize(); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $this->assertequals(1, count($v1)); |
| 160 | 160 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 161 | 161 | |
| 162 | - foreach($v1 as $key => $val) |
|
| 162 | + foreach ($v1 as $key => $val) |
|
| 163 | 163 | { |
| 164 | 164 | $this->assertArrayHasKey($key, $out); |
| 165 | 165 | $expected = $out[$key]; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $this->assertequals(2, count($v2)); |
| 175 | 175 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 176 | 176 | $i = 0; |
| 177 | - foreach($v2 as $key => $val) |
|
| 177 | + foreach ($v2 as $key => $val) |
|
| 178 | 178 | { |
| 179 | 179 | $expected = $out[$i]; |
| 180 | 180 | $this->assertequals($expected['key'], $key); |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
| 203 | 203 | $data = array(); |
| 204 | - for ($i = 0; $i < 500000; $i++ ) { |
|
| 204 | + for ($i = 0; $i<500000; $i++) { |
|
| 205 | 205 | $data[] = 'hello world'; |
| 206 | 206 | } |
| 207 | 207 | |
@@ -6,15 +6,15 @@ discard block |
||
| 6 | 6 | |
| 7 | 7 | echo "Legacy Loader Test\n\n"; |
| 8 | 8 | |
| 9 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 9 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 10 | 10 | |
| 11 | -include_once __DIR__ . '/parse_args.php'; |
|
| 11 | +include_once __DIR__.'/parse_args.php'; |
|
| 12 | 12 | |
| 13 | 13 | $args = argParser::getArgs(); |
| 14 | -$baseurl = 'http://' . $args['HTTPSERVER'] . str_replace('/server.php', '/legacy.php', $args['HTTPURI']); |
|
| 14 | +$baseurl = 'http://'.$args['HTTPSERVER'].str_replace('/server.php', '/legacy.php', $args['HTTPURI']); |
|
| 15 | 15 | |
| 16 | 16 | $randId = uniqid(); |
| 17 | -file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', $randId); |
|
| 17 | +file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', $randId); |
|
| 18 | 18 | |
| 19 | 19 | $client = new xmlrpc_client($baseurl); |
| 20 | 20 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', $randId); |
@@ -22,11 +22,11 @@ discard block |
||
| 22 | 22 | $req = new xmlrpcmsg('system.listMethods', array()); |
| 23 | 23 | $resp = $client->send($req); |
| 24 | 24 | if ($resp->faultCode() !== 0) { |
| 25 | - unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt'); |
|
| 26 | - throw new \Exception("system.listMethods returned fault " . $resp->faultCode()); |
|
| 25 | + unlink(sys_get_temp_dir().'/phpunit_rand_id.txt'); |
|
| 26 | + throw new \Exception("system.listMethods returned fault ".$resp->faultCode()); |
|
| 27 | 27 | } |
| 28 | 28 | echo ". 1/1 (100%)\n\n"; |
| 29 | 29 | |
| 30 | 30 | echo "OK (1 test, 1 assertion)\n"; |
| 31 | 31 | |
| 32 | -unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt'); |
|
| 32 | +unlink(sys_get_temp_dir().'/phpunit_rand_id.txt'); |
|
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests involving the Client class features (and mostly no server). |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $this->client->server .= 'XXX'; |
| 63 | 63 | $dnsinfo = @dns_get_record($this->client->server); |
| 64 | 64 | if ($dnsinfo) { |
| 65 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 65 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 66 | 66 | } else { |
| 67 | 67 | $m = new xmlrpcmsg('examples.echo', array( |
| 68 | 68 | new xmlrpcval('hello', 'string'), |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | // now test a successful connection |
| 93 | 93 | $server = explode(':', $this->args['HTTPSERVER']); |
| 94 | - if (count($server) > 1) { |
|
| 94 | + if (count($server)>1) { |
|
| 95 | 95 | $this->client->port = $server[1]; |
| 96 | 96 | } |
| 97 | 97 | $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 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 | } |
| 107 | 107 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | public function testUnicodeInMemberName() |
| 177 | 177 | { |
| 178 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 178 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
| 179 | 179 | $v = array($str => new xmlrpcval(1)); |
| 180 | 180 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
| 181 | 181 | $r = $r->serialize(); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $response = @utf8_encode( |
| 192 | 192 | '<?xml version="1.0"?> |
| 193 | 193 | <!-- covers what happens when lib receives UTF8 chars in response text and comments --> |
| 194 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
| 194 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
| 195 | 195 | <methodResponse> |
| 196 | 196 | <fault> |
| 197 | 197 | <value> |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | </member> |
| 203 | 203 | <member> |
| 204 | 204 | <name>faultString</name> |
| 205 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
| 205 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
| 206 | 206 | </member> |
| 207 | 207 | </struct> |
| 208 | 208 | </value> |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $m = $this->newRequest('dummy'); |
| 212 | 212 | $r = $m->parseResponse($response); |
| 213 | 213 | $v = $r->faultString(); |
| 214 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
| 214 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | public function testBrokenRequests() |
@@ -468,8 +468,8 @@ discard block |
||
| 468 | 468 | $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values; |
| 469 | 469 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true; |
| 470 | 470 | |
| 471 | - foreach($values as $value) { |
|
| 472 | - $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> '; |
|
| 471 | + foreach ($values as $value) { |
|
| 472 | + $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> '; |
|
| 473 | 473 | $r = $s->parseResponse($f); |
| 474 | 474 | $v = $r->faultCode(); |
| 475 | 475 | $this->assertEquals(2, $v, "Testing $value"); |
@@ -574,11 +574,11 @@ discard block |
||
| 574 | 574 | |
| 575 | 575 | public function testUTF8Response() |
| 576 | 576 | { |
| 577 | - $string = chr(224) . chr(252) . chr(232); |
|
| 577 | + $string = chr(224).chr(252).chr(232); |
|
| 578 | 578 | |
| 579 | 579 | $s = $this->newRequest('dummy'); |
| 580 | - $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> |
|
| 581 | -<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> |
|
| 580 | + $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> |
|
| 581 | +<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> |
|
| 582 | 582 | '; |
| 583 | 583 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 584 | 584 | $v = $r->value(); |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | $this->assertEquals($string, $v); |
| 587 | 587 | |
| 588 | 588 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 589 | -<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> |
|
| 589 | +<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> |
|
| 590 | 590 | '; |
| 591 | 591 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 592 | 592 | $v = $r->value(); |
@@ -602,11 +602,11 @@ discard block |
||
| 602 | 602 | |
| 603 | 603 | public function testLatin1Response() |
| 604 | 604 | { |
| 605 | - $string = chr(224) . chr(252) . chr(232); |
|
| 605 | + $string = chr(224).chr(252).chr(232); |
|
| 606 | 606 | |
| 607 | 607 | $s = $this->newRequest('dummy'); |
| 608 | - $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> |
|
| 609 | -<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> |
|
| 608 | + $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> |
|
| 609 | +<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> |
|
| 610 | 610 | '; |
| 611 | 611 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 612 | 612 | $v = $r->value(); |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | $this->assertEquals($string, $v); |
| 615 | 615 | |
| 616 | 616 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 617 | -<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> |
|
| 617 | +<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> |
|
| 618 | 618 | '; |
| 619 | 619 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 620 | 620 | $v = $r->value(); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * @todo Long-term, this should replace all testing of the legacy API done via the main test-suite... |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | /// @todo pass on as cli args for the executed script all the args that are already parsed by now, plus $this->testId |
| 16 | 16 | |
| 17 | - exec('php ' . __DIR__ . '/legacy_loader_test.php', $out, $result); |
|
| 17 | + exec('php '.__DIR__.'/legacy_loader_test.php', $out, $result); |
|
| 18 | 18 | |
| 19 | 19 | /// @todo dump output if in debug mode or if test fails |
| 20 | 20 | |