@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/parse_args.php'; |
|
| 3 | +include_once __DIR__.'/parse_args.php'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 5 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
| 8 | 8 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function _run($result = NULL) |
| 27 | 27 | { |
| 28 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 28 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 29 | 29 | |
| 30 | 30 | if ($result === NULL) { |
| 31 | 31 | $result = $this->createResult(); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 62 | 62 | { |
| 63 | - $url = $this->baseUrl . $path; |
|
| 63 | + $url = $this->baseUrl.$path; |
|
| 64 | 64 | |
| 65 | 65 | $ch = curl_init($url); |
| 66 | 66 | curl_setopt_array($ch, array( |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
| 80 | 80 | } |
| 81 | - if ($this->args['DEBUG'] > 0) { |
|
| 81 | + if ($this->args['DEBUG']>0) { |
|
| 82 | 82 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 83 | 83 | } |
| 84 | 84 | $page = curl_exec($ch); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | protected function getClient($path) |
| 98 | 98 | { |
| 99 | - $client = new xmlrpc_client($this->baseUrl . $path); |
|
| 99 | + $client = new xmlrpc_client($this->baseUrl.$path); |
|
| 100 | 100 | if ($this->collectCodeCoverageInformation) { |
| 101 | 101 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
| 102 | 102 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
| 3 | +include_once __DIR__.'/WebTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests for php files in the 'demo' directory. |
@@ -14,8 +14,8 @@ discard block |
||
| 14 | 14 | $this->args = argParser::getArgs(); |
| 15 | 15 | |
| 16 | 16 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
| 17 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 18 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 17 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 18 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | public function testVardemo() |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
| 2 | +require_once __DIR__."/client/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
| 10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
| 13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
| 16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 17 | 17 | |
| 18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
| 19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 20 | 20 | |
| 21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
| 22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 23 | 23 | |
| 24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
| 25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
| 27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 28 | 28 | |
| 29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
| 30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 31 | -output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>"); |
|
| 30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 31 | +output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>"); |
|
| 32 | 32 | |
| 33 | 33 | $v = new PhpXmlRpc\Value( |
| 34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ), |
| 42 | 42 | "array" |
| 43 | 43 | ); |
| 44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 45 | 45 | |
| 46 | 46 | $v = new PhpXmlRpc\Value( |
| 47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | ), |
| 62 | 62 | "struct" |
| 63 | 63 | ); |
| 64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 65 | 65 | |
| 66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
| 67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 68 | 68 | |
| 69 | 69 | class MyClass |
| 70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
| 76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
| 77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
| 78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
| 79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 80 | 80 | |
| 81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
| 82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
| 83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
| 85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
| 87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 88 | 88 | |
| 89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
| 90 | 90 | // The greek word 'kosme' |
| 91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
| 92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
| 92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
| 94 | 94 | if (function_exists('mb_convert_encoding')) { |
| 95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
| 95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
| 99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 100 | 100 | $req->method('examples.getStateName'); |
| 101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
| 102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
| 102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
| 103 | 103 | |
| 104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
| 105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
| 106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
| 106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
| 107 | 107 | |
| 108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
| 109 | 109 | $t = time(); |
| 110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 111 | 111 | output("Now is $t --> $date\n"); |
| 112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
| 112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
| 113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 114 | 114 | output("That is to say $date --> $tb\n"); |
| 115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
| 116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
| 115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
| 116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
| 117 | 117 | output("</pre>\n"); |
| 118 | 118 | |
| 119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
| 120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
| 121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
| 122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 123 | 123 | |
| 124 | 124 | output('</body></html>'); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
| 3 | +include_once __DIR__.'/WebTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests for php files in the 'extras' directory. |
@@ -12,8 +12,8 @@ discard block |
||
| 12 | 12 | $this->args = argParser::getArgs(); |
| 13 | 13 | |
| 14 | 14 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
| 15 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 16 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 15 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 16 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function testBenchmark() |
@@ -1,10 +1,10 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/parse_args.php'; |
|
| 5 | +include_once __DIR__.'/parse_args.php'; |
|
| 6 | 6 | |
| 7 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 7 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 8 | 8 | |
| 9 | 9 | use PHPUnit\Runner\BaseTestRunner; |
| 10 | 10 | |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | $this->client->setDebug($this->args['DEBUG']); |
| 27 | 27 | |
| 28 | 28 | // in debug mode, the client will be very verbose. Avoid showing its output unless there are errors |
| 29 | - if ($this->args['DEBUG'] >= 1) |
|
| 29 | + if ($this->args['DEBUG']>=1) |
|
| 30 | 30 | ob_start(); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | protected function tear_down() |
| 34 | 34 | { |
| 35 | - if ($this->args['DEBUG'] < 1) |
|
| 35 | + if ($this->args['DEBUG']<1) |
|
| 36 | 36 | return; |
| 37 | 37 | $out = ob_get_clean(); |
| 38 | 38 | $status = $this->getStatus(); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $this->client->server .= 'XXX'; |
| 60 | 60 | $dnsinfo = @dns_get_record($this->client->server); |
| 61 | 61 | if ($dnsinfo) { |
| 62 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 62 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 63 | 63 | } else { |
| 64 | 64 | $r = $this->client->send($m, 5); |
| 65 | 65 | // make sure there's no freaking catchall DNS in effect |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | // now test a successful connection |
| 88 | 88 | $server = explode(':', $this->args['HTTPSERVER']); |
| 89 | - if (count($server) > 1) { |
|
| 89 | + if (count($server)>1) { |
|
| 90 | 90 | $this->client->port = $server[1]; |
| 91 | 91 | } |
| 92 | 92 | $this->client->server = $server[0]; |
@@ -26,14 +26,16 @@ |
||
| 26 | 26 | $this->client->setDebug($this->args['DEBUG']); |
| 27 | 27 | |
| 28 | 28 | // in debug mode, the client will be very verbose. Avoid showing its output unless there are errors |
| 29 | - if ($this->args['DEBUG'] >= 1) |
|
| 30 | - ob_start(); |
|
| 29 | + if ($this->args['DEBUG'] >= 1) { |
|
| 30 | + ob_start(); |
|
| 31 | + } |
|
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | protected function tear_down() |
| 34 | 35 | { |
| 35 | - if ($this->args['DEBUG'] < 1) |
|
| 36 | - return; |
|
| 36 | + if ($this->args['DEBUG'] < 1) { |
|
| 37 | + return; |
|
| 38 | + } |
|
| 37 | 39 | $out = ob_get_clean(); |
| 38 | 40 | $status = $this->getStatus(); |
| 39 | 41 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
| 11 | 11 | use PHPUnit\Framework\TestResult; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | // (but only if not called from subclass objects / multitests) |
| 43 | 43 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
| 44 | 44 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 45 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 45 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 46 | 46 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 47 | 47 | self::$failed_tests[$trace[$i]['function']] = true; |
| 48 | 48 | break; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function _run($result = NULL) |
| 67 | 67 | { |
| 68 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 68 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 69 | 69 | |
| 70 | 70 | if ($result === NULL) { |
| 71 | 71 | $result = $this->createResult(); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $this->args = argParser::getArgs(); |
| 97 | 97 | |
| 98 | 98 | $server = explode(':', $this->args['HTTPSERVER']); |
| 99 | - if (count($server) > 1) { |
|
| 99 | + if (count($server)>1) { |
|
| 100 | 100 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
| 101 | 101 | } else { |
| 102 | 102 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | $this->client->request_compression = $this->request_compression; |
| 107 | 107 | $this->client->accepted_compression = $this->accepted_compression; |
| 108 | 108 | |
| 109 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 109 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 110 | 110 | |
| 111 | 111 | // in debug mode, the client will be very verbose. Avoid showing its output unless there are errors |
| 112 | - if ($this->args['DEBUG'] >= 1) |
|
| 112 | + if ($this->args['DEBUG']>=1) |
|
| 113 | 113 | ob_start(); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | protected function tear_down() |
| 117 | 117 | { |
| 118 | - if ($this->args['DEBUG'] < 1) |
|
| 118 | + if ($this->args['DEBUG']<1) |
|
| 119 | 119 | return; |
| 120 | 120 | $out = ob_get_clean(); |
| 121 | 121 | $status = $this->getStatus(); |
@@ -144,9 +144,9 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | $this->validateResponse($r); |
| 146 | 146 | if (is_array($errorCode)) { |
| 147 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 147 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 148 | 148 | } else { |
| 149 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 149 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 150 | 150 | } |
| 151 | 151 | if (!$r->faultCode()) { |
| 152 | 152 | if ($returnResponse) { |
@@ -173,20 +173,20 @@ discard block |
||
| 173 | 173 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 174 | 174 | parse_str($query, $vars); |
| 175 | 175 | $query = http_build_query(array_merge($vars, $data)); |
| 176 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 176 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | public function testString() |
| 180 | 180 | { |
| 181 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 182 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 183 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 184 | - " also don't want to miss out on \$item[0]. " . |
|
| 185 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 186 | - "a simple CR here" . chr(13) . |
|
| 187 | - "a simple LF here" . chr(10) . |
|
| 188 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 189 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 181 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 182 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 183 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 184 | + " also don't want to miss out on \$item[0]. ". |
|
| 185 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 186 | + "a simple CR here".chr(13). |
|
| 187 | + "a simple LF here".chr(10). |
|
| 188 | + "and then LFCR".chr(10).chr(13). |
|
| 189 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 190 | 190 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 191 | 191 | new xmlrpcval($sendString, 'string'), |
| 192 | 192 | )); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | public function testLatin1String() |
| 208 | 208 | { |
| 209 | 209 | $sendString = |
| 210 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 210 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 211 | 211 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 212 | 212 | $sendString. |
| 213 | 213 | '</value></param></params></methodCall>'; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | public function testUtf8Method() |
| 317 | 317 | { |
| 318 | 318 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 319 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 319 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 320 | 320 | new xmlrpcval('hello') |
| 321 | 321 | )); |
| 322 | 322 | $v = $this->send($m); |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | )); |
| 339 | 339 | $v = $this->send($m); |
| 340 | 340 | if ($v) { |
| 341 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 341 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 342 | 342 | } |
| 343 | 343 | } |
| 344 | 344 | |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | )); |
| 351 | 351 | $v = $this->send($m); |
| 352 | 352 | if ($v) { |
| 353 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 353 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | if ($v) { |
| 390 | 390 | $sz = $v->arraysize(); |
| 391 | 391 | $got = ''; |
| 392 | - for ($i = 0; $i < $sz; $i++) { |
|
| 392 | + for ($i = 0; $i<$sz; $i++) { |
|
| 393 | 393 | $b = $v->arraymem($i); |
| 394 | 394 | if ($b->scalarval()) { |
| 395 | 395 | $got .= '1'; |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | $got = ''; |
| 453 | 453 | $expected = '37210'; |
| 454 | 454 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 455 | - foreach($expect_array as $val) { |
|
| 455 | + foreach ($expect_array as $val) { |
|
| 456 | 456 | $b = $v->structmem($val); |
| 457 | 457 | $got .= $b->me['int']; |
| 458 | 458 | } |
@@ -947,7 +947,7 @@ discard block |
||
| 947 | 947 | { |
| 948 | 948 | // make a 'deep client copy' as the original one might have many properties set |
| 949 | 949 | // also for speed only wrap one method of the whole server |
| 950 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 950 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 951 | 951 | if ($class == '') { |
| 952 | 952 | $this->fail('Registration of remote server failed'); |
| 953 | 953 | } else { |
@@ -986,9 +986,9 @@ discard block |
||
| 986 | 986 | $cookies = array( |
| 987 | 987 | //'c1' => array(), |
| 988 | 988 | 'c2' => array('value' => 'c2'), |
| 989 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 990 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 991 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 989 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 990 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 991 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 992 | 992 | ); |
| 993 | 993 | $cookiesval = php_xmlrpc_encode($cookies); |
| 994 | 994 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -1036,10 +1036,10 @@ discard block |
||
| 1036 | 1036 | $m = new xmlrpcmsg('tests.getcookies', array()); |
| 1037 | 1037 | foreach ($cookies as $cookie => $val) { |
| 1038 | 1038 | $this->client->setCookie($cookie, $val); |
| 1039 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 1039 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 1040 | 1040 | } |
| 1041 | 1041 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 1042 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 1042 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 1043 | 1043 | if (!$r->faultCode()) { |
| 1044 | 1044 | $v = $r->value(); |
| 1045 | 1045 | $v = php_xmlrpc_decode($v); |
@@ -109,14 +109,16 @@ |
||
| 109 | 109 | $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
| 110 | 110 | |
| 111 | 111 | // in debug mode, the client will be very verbose. Avoid showing its output unless there are errors |
| 112 | - if ($this->args['DEBUG'] >= 1) |
|
| 113 | - ob_start(); |
|
| 112 | + if ($this->args['DEBUG'] >= 1) { |
|
| 113 | + ob_start(); |
|
| 114 | + } |
|
| 114 | 115 | } |
| 115 | 116 | |
| 116 | 117 | protected function tear_down() |
| 117 | 118 | { |
| 118 | - if ($this->args['DEBUG'] < 1) |
|
| 119 | - return; |
|
| 119 | + if ($this->args['DEBUG'] < 1) { |
|
| 120 | + return; |
|
| 121 | + } |
|
| 120 | 122 | $out = ob_get_clean(); |
| 121 | 123 | $status = $this->getStatus(); |
| 122 | 124 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -24,7 +24,7 @@ discard block |
||
| 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; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
| 84 | 84 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
| 85 | 85 | header('HTTP/1.1 401 Unauthorized'); |
| 86 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
| 86 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
| 87 | 87 | die('Text visible if user hits Cancel button'); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | if (isset($_GET['FORCE_REDIRECT'])) { |
| 92 | 92 | header('HTTP/1.0 302 Found'); |
| 93 | 93 | unset($_GET['FORCE_REDIRECT']); |
| 94 | - header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : '')); |
|
| 94 | + header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : '')); |
|
| 95 | 95 | die(); |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
| 13 | 13 | |
| 14 | 14 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -22,5 +22,5 @@ discard block |
||
| 22 | 22 | function output($text) |
| 23 | 23 | { |
| 24 | 24 | /// @todo we should only strip html tags, and let through all xml tags |
| 25 | - echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>','<br>'), "\n", $text)) : $text; |
|
| 25 | + echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>', '<br>'), "\n", $text)) : $text; |
|
| 26 | 26 | } |
@@ -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 how to inject a custom logger for use by the library |
@@ -22,13 +22,13 @@ discard block |
||
| 22 | 22 | // logger API |
| 23 | 23 | public function debug($message, $context = array()) |
| 24 | 24 | { |
| 25 | - $this->debugBuffer .= $message . "\n"; |
|
| 25 | + $this->debugBuffer .= $message."\n"; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | // logger API |
| 29 | 29 | public function error($message, $context = array()) |
| 30 | 30 | { |
| 31 | - $this->errorBuffer .= $message . "\n"; |
|
| 31 | + $this->errorBuffer .= $message."\n"; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function getDebug() |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | $input = array( |
| 61 | 61 | array('name' => 'Dave', 'age' => 24), |
| 62 | - array('name' => 'Edd', 'age' => 45), |
|
| 63 | - array('name' => 'Joe', 'age' => 37), |
|
| 62 | + array('name' => 'Edd', 'age' => 45), |
|
| 63 | + array('name' => 'Joe', 'age' => 37), |
|
| 64 | 64 | array('name' => 'Fred', 'age' => 27), |
| 65 | 65 | ); |
| 66 | 66 | |
@@ -79,5 +79,5 @@ discard block |
||
| 79 | 79 | $response = $client->send($request); |
| 80 | 80 | output("Response received.<br>"); |
| 81 | 81 | |
| 82 | -output("The client error info is:<pre>\n" . $logger->getError() . "\n</pre>"); |
|
| 83 | -output("The client debug info is:<pre>\n" . $logger->getDebug() . "\n</pre>"); |
|
| 82 | +output("The client error info is:<pre>\n".$logger->getError()."\n</pre>"); |
|
| 83 | +output("The client debug info is:<pre>\n".$logger->getDebug()."\n</pre>"); |
|