@@ -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 | |
@@ -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(); |
@@ -304,8 +304,7 @@ discard block |
||
| 304 | 304 | if (!function_exists('curl_init')) |
| 305 | 305 | { |
| 306 | 306 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
| 307 | - } |
|
| 308 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 307 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 309 | 308 | { |
| 310 | 309 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
| 311 | 310 | } |
@@ -480,8 +479,7 @@ discard block |
||
| 480 | 479 | if (!function_exists('curl_init')) |
| 481 | 480 | { |
| 482 | 481 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
| 483 | - } |
|
| 484 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 482 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 485 | 483 | { |
| 486 | 484 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
| 487 | 485 | } |
@@ -505,12 +503,10 @@ discard block |
||
| 505 | 503 | if (!function_exists('curl_init')) |
| 506 | 504 | { |
| 507 | 505 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
| 508 | - } |
|
| 509 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 506 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 510 | 507 | { |
| 511 | 508 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
| 512 | - } |
|
| 513 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 509 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 514 | 510 | { |
| 515 | 511 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
| 516 | 512 | } |
@@ -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 | |