@@ -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 | } |
@@ -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 | * @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 | |
@@ -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; |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function _run($result = NULL) |
| 32 | 32 | { |
| 33 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 33 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 34 | 34 | |
| 35 | 35 | if ($result === NULL) { |
| 36 | 36 | $result = $this->createResult(); |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | // Set up a database connection or other fixture which needs to be available. |
| 64 | 64 | self::$randId = uniqid(); |
| 65 | - file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', self::$randId); |
|
| 65 | + file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', self::$randId); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | public static function tear_down_after_class() |
| 69 | 69 | { |
| 70 | - if (is_file(sys_get_temp_dir() . '/phpunit_rand_id.txt')) { |
|
| 71 | - unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt'); |
|
| 70 | + if (is_file(sys_get_temp_dir().'/phpunit_rand_id.txt')) { |
|
| 71 | + unlink(sys_get_temp_dir().'/phpunit_rand_id.txt'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | parent::tear_down_after_class(); |
@@ -79,15 +79,15 @@ discard block |
||
| 79 | 79 | parent::set_up(); |
| 80 | 80 | |
| 81 | 81 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
| 82 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 83 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 82 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 83 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | protected function getClient() |
| 87 | 87 | { |
| 88 | 88 | $server = explode(':', $this->args['HTTPSERVER']); |
| 89 | 89 | /// @todo use the non-legacy API calling convention, except in a dedicated test |
| 90 | - if (count($server) > 1) { |
|
| 90 | + if (count($server)>1) { |
|
| 91 | 91 | $client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
| 92 | 92 | } else { |
| 93 | 93 | $client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/08ServerTest.php'; |
|
| 3 | +include_once __DIR__.'/08ServerTest.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests which stress http features of the library. |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | { |
| 35 | 35 | $methods = array(); |
| 36 | 36 | // as long as we are descendants, get_class_methods will list private/protected methods |
| 37 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 37 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 38 | 38 | { |
| 39 | 39 | if (strpos($method, 'test') === 0 && !in_array($method, $this->unsafeMethods)) |
| 40 | 40 | { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | // this checks for a non-failed call |
| 149 | 149 | $time = microtime(true); |
| 150 | 150 | $this->send($m); |
| 151 | - $time = microtime(true) - $time; |
|
| 151 | + $time = microtime(true)-$time; |
|
| 152 | 152 | $this->assertGreaterThan(1.0, $time); |
| 153 | 153 | $this->assertLessThan(2.0, $time); |
| 154 | 154 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $m = new xmlrpcmsg('tests.sleep', array(new xmlrpcval(5, 'int'))); |
| 157 | 157 | $time = microtime(true); |
| 158 | 158 | $r = $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail'])); |
| 159 | - $time = microtime(true) - $time; |
|
| 159 | + $time = microtime(true)-$time; |
|
| 160 | 160 | $this->assertGreaterThan(2.0, $time); |
| 161 | 161 | $this->assertLessThan(4.0, $time); |
| 162 | 162 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $this->addQueryParams(array('SLOW_LORIS' => 1)); |
| 177 | 177 | $time = microtime(true); |
| 178 | 178 | $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail'])); |
| 179 | - $time = microtime(true) - $time; |
|
| 179 | + $time = microtime(true)-$time; |
|
| 180 | 180 | $this->assertGreaterThan(2.0, $time); |
| 181 | 181 | $this->assertLessThan(4.0, $time); |
| 182 | 182 | } |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
| 356 | 356 | $ubuntuVersion = @$matches[1]; |
| 357 | 357 | } |
| 358 | - if ($ubuntuVersion >= 20 && $this->args['SSLVERSION'] != 6) { |
|
| 358 | + if ($ubuntuVersion>=20 && $this->args['SSLVERSION'] != 6) { |
|
| 359 | 359 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | $this->client->setOption(\PhpXmlRpc\Client::OPT_EXTRA_SOCKET_OPTS, |
| 381 | 381 | array('ssl' => array( |
| 382 | 382 | // security level is available as of php 7.2.0 + openssl 1.1.0 according to the docs |
| 383 | - 'security_level' => min(1 + $version[1], 5), |
|
| 383 | + 'security_level' => min(1+$version[1], 5), |
|
| 384 | 384 | // capture_session_meta was deprecated in php 7.0 |
| 385 | 385 | //'capture_session_meta' => true, |
| 386 | 386 | )) |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | if (version_compare(PHP_VERSION, '8.0', '>=') && $this->args['SSLVERSION'] == 0) |
| 529 | 529 | { |
| 530 | 530 | $version = explode('.', PHP_VERSION); |
| 531 | - $this->client->setSSLVersion(min(4 + $version[1], 7)); |
|
| 531 | + $this->client->setSSLVersion(min(4+$version[1], 7)); |
|
| 532 | 532 | } |
| 533 | 533 | |
| 534 | 534 | $this->$method(); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function echoInput() |
| 56 | 56 | { |
| 57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
| 57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
| 58 | 58 | print $r->serialize(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function &__get($name) |
| 67 | 67 | { |
| 68 | - switch($name) { |
|
| 68 | + switch ($name) { |
|
| 69 | 69 | case 'dmap': |
| 70 | 70 | return $this->dmap; |
| 71 | 71 | default: |
@@ -96,30 +96,30 @@ discard block |
||
| 96 | 96 | Server::xmlrpc_debugmsg($m); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
| 99 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
| 100 | 100 | { |
| 101 | 101 | return Server::_xmlrpcs_getCapabilities($server, $m); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 105 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 106 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
| 107 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
| 104 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 105 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 106 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
| 107 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
| 108 | 108 | { |
| 109 | 109 | return Server::_xmlrpcs_listMethods($server, $m); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString)); |
|
| 113 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 114 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 112 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString)); |
|
| 113 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 114 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 115 | 115 | function _xmlrpcs_methodSignature($server, $m) |
| 116 | 116 | { |
| 117 | 117 | return Server::_xmlrpcs_methodSignature($server, $m); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | -$_xmlrpcs_methodHelp_sig=array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString)); |
|
| 121 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 122 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
| 120 | +$_xmlrpcs_methodHelp_sig = array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString)); |
|
| 121 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 122 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
| 123 | 123 | function _xmlrpcs_methodHelp($server, $m) |
| 124 | 124 | { |
| 125 | 125 | return Server::_xmlrpcs_methodHelp($server, $m); |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods |
@@ -26,12 +26,12 @@ discard block |
||
| 26 | 26 | ); |
| 27 | 27 | |
| 28 | 28 | // the generated code does not have an autoloader included - we need to add in one |
| 29 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 29 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 30 | 30 | |
| 31 | -$targetFile = sys_get_temp_dir() . '/MyClient.php'; |
|
| 31 | +$targetFile = sys_get_temp_dir().'/MyClient.php'; |
|
| 32 | 32 | $generated = file_put_contents($targetFile, |
| 33 | - "<?php\n\n" . |
|
| 34 | - "require_once '$autoloader';\n\n" . |
|
| 33 | + "<?php\n\n". |
|
| 34 | + "require_once '$autoloader';\n\n". |
|
| 35 | 35 | $code['code'] |
| 36 | 36 | ); |
| 37 | 37 | |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | $client = new MyClient(); |
| 52 | 52 | $sorted = $client->examples_sortByAge(array( |
| 53 | 53 | array('name' => 'Dave', 'age' => 24), |
| 54 | - array('name' => 'Edd', 'age' => 45), |
|
| 55 | - array('name' => 'Joe', 'age' => 37), |
|
| 54 | + array('name' => 'Edd', 'age' => 45), |
|
| 55 | + array('name' => 'Joe', 'age' => 37), |
|
| 56 | 56 | array('name' => 'Fred', 'age' => 27), |
| 57 | 57 | )); |
| 58 | 58 | |