@@ -29,7 +29,7 @@ |
||
| 29 | 29 | return; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 32 | + if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 33 | 33 | require $file; |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -141,9 +141,9 @@ |
||
| 141 | 141 | * @deprecated |
| 142 | 142 | */ |
| 143 | 143 | function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName, |
| 144 | - $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
| 145 | - $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
| 146 | - $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
| 144 | + $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
| 145 | + $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
| 146 | + $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
| 147 | 147 | { |
| 148 | 148 | $code = "function $xmlrpcFuncName ("; |
| 149 | 149 | if ($clientCopyMode < 2) { |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | * @param array $extraOptions |
| 42 | 42 | * @return array|false |
| 43 | 43 | */ |
| 44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
| 44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
| 45 | 45 | { |
| 46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 47 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 47 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 48 | 48 | // backwards compat: return string instead of callable |
| 49 | 49 | $extraOptions['return_source'] = true; |
| 50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); |
@@ -64,17 +64,17 @@ discard block |
||
| 64 | 64 | * @param array $extraOptions |
| 65 | 65 | * @return array|false |
| 66 | 66 | */ |
| 67 | -function wrap_php_class($className, $extraOptions=array()) |
|
| 67 | +function wrap_php_class($className, $extraOptions = array()) |
|
| 68 | 68 | { |
| 69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 70 | 70 | $fix = false; |
| 71 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 71 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 72 | 72 | // backwards compat: return string instead of callable |
| 73 | 73 | $extraOptions['return_source'] = true; |
| 74 | 74 | $fix = true; |
| 75 | 75 | } |
| 76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
| 77 | - foreach($wrapped as $name => $value) { |
|
| 77 | + foreach ($wrapped as $name => $value) { |
|
| 78 | 78 | if ($fix) { |
| 79 | 79 | eval($value['source']); |
| 80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
| 94 | 94 | * @return array|callable|false |
| 95 | 95 | */ |
| 96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
| 96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
| 97 | 97 | { |
| 98 | 98 | if (!is_array($extraOptions)) |
| 99 | 99 | { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 110 | 110 | |
| 111 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 111 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 112 | 112 | // backwards compat: return string instead of callable |
| 113 | 113 | $extraOptions['return_source'] = true; |
| 114 | 114 | $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param array $extraOptions |
| 129 | 129 | * @return mixed |
| 130 | 130 | */ |
| 131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
| 131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
| 132 | 132 | { |
| 133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
| 149 | 149 | { |
| 150 | 150 | $code = "function $xmlrpcFuncName ("; |
| 151 | - if ($clientCopyMode < 2) { |
|
| 151 | + if ($clientCopyMode<2) { |
|
| 152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
| 153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
| 154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | if ($mDesc != '') { |
| 164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
| 165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 166 | 166 | } else { |
| 167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
| 168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 172 | 172 | $plist = array(); |
| 173 | 173 | $pCount = count($mSig); |
| 174 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 174 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 175 | 175 | $plist[] = "\$p$i"; |
| 176 | 176 | $pType = $mSig[$i]; |
| 177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
| 190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
| 191 | 191 | } |
| 192 | - if ($clientCopyMode < 2) { |
|
| 192 | + if ($clientCopyMode<2) { |
|
| 193 | 193 | $plist[] = '$debug=0'; |
| 194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 195 | 195 | } |
| 196 | 196 | $plist = implode(', ', $plist); |
| 197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 198 | 198 | |
| 199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 200 | 200 | if ($decodeFault) { |
| 201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 203 | 203 | } else { |
| 204 | 204 | $respCode = var_export($faultResponse, true); |
| 205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 216 | 216 | |
| 217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
| 218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * @deprecated |
| 222 | 222 | */ |
| 223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
| 223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
| 224 | 224 | { |
| 225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
| 226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 227 | 227 | |
| 228 | 228 | // copy all client fields to the client that will be generated runtime |
| 229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -39,10 +39,10 @@ |
||
| 39 | 39 | $flags = ENT_COMPAT; |
| 40 | 40 | // avoid warnings on php < 5.4... |
| 41 | 41 | if (defined('ENT_HTML401')) { |
| 42 | - $flags = $flags | ENT_HTML401; |
|
| 42 | + $flags = $flags | ENT_HTML401; |
|
| 43 | 43 | } |
| 44 | 44 | if (defined('ENT_SUBSTITUTE')) { |
| 45 | - $flags = $flags | ENT_SUBSTITUTE; |
|
| 45 | + $flags = $flags | ENT_SUBSTITUTE; |
|
| 46 | 46 | } |
| 47 | 47 | if ($encoding != null) { |
| 48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; |
@@ -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 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $this->client->server .= 'XXX'; |
| 59 | 59 | $dnsinfo = @dns_get_record($this->client->server); |
| 60 | 60 | if ($dnsinfo) { |
| 61 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 61 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 62 | 62 | } else { |
| 63 | 63 | $r = $this->client->send($m, 5); |
| 64 | 64 | // make sure there's no freaking catchall DNS in effect |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | // now test a successful connection |
| 87 | 87 | $server = explode(':', $this->args['HTTPSERVER']); |
| 88 | - if (count($server) > 1) { |
|
| 88 | + if (count($server)>1) { |
|
| 89 | 89 | $this->client->port = $server[1]; |
| 90 | 90 | } |
| 91 | 91 | $this->client->server = $server[0]; |
@@ -24,14 +24,16 @@ |
||
| 24 | 24 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80); |
| 25 | 25 | $this->client->setDebug($this->args['DEBUG']); |
| 26 | 26 | |
| 27 | - if ($this->args['DEBUG'] == 1) |
|
| 28 | - ob_start(); |
|
| 27 | + if ($this->args['DEBUG'] == 1) { |
|
| 28 | + ob_start(); |
|
| 29 | + } |
|
| 29 | 30 | } |
| 30 | 31 | |
| 31 | 32 | protected function tear_down() |
| 32 | 33 | { |
| 33 | - if ($this->args['DEBUG'] != 1) |
|
| 34 | - return; |
|
| 34 | + if ($this->args['DEBUG'] != 1) { |
|
| 35 | + return; |
|
| 36 | + } |
|
| 35 | 37 | $out = ob_get_clean(); |
| 36 | 38 | $status = $this->getStatus(); |
| 37 | 39 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // construct a latin string with all chars (except control ones) |
| 34 | 34 | $this->latinString = "\n\r\t"; |
| 35 | - for($i = 32; $i < 127; $i++) { |
|
| 35 | + for ($i = 32; $i<127; $i++) { |
|
| 36 | 36 | $this->latinString .= chr($i); |
| 37 | 37 | } |
| 38 | - for($i = 160; $i < 256; $i++) { |
|
| 38 | + for ($i = 160; $i<256; $i++) { |
|
| 39 | 39 | $this->latinString .= chr($i); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | 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/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.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\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing. |
| 104 | 104 | /// We should fix that, then re-enable this test |
| 105 | 105 | if (version_compare(PHP_VERSION, '5.6.0', '>=')) { |
| 106 | - $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>'); |
|
| 106 | + $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>'); |
|
| 107 | 107 | $this->assertEquals($string, $i->scalarVal()); |
| 108 | 108 | } |
| 109 | 109 | |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | 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/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.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\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | public function testI8() |
| 105 | 105 | { |
| 106 | - if (PHP_INT_SIZE == 4 ) { |
|
| 106 | + if (PHP_INT_SIZE == 4) { |
|
| 107 | 107 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
| 108 | 108 | return; |
| 109 | 109 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | public function testUnicodeInMemberName() |
| 135 | 135 | { |
| 136 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 136 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
| 137 | 137 | $v = array($str => new xmlrpcval(1)); |
| 138 | 138 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
| 139 | 139 | $r = $r->serialize(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | $response = @utf8_encode( |
| 150 | 150 | '<?xml version="1.0"?> |
| 151 | 151 | <!-- covers what happens when lib receives UTF8 chars in response text and comments --> |
| 152 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
| 152 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
| 153 | 153 | <methodResponse> |
| 154 | 154 | <fault> |
| 155 | 155 | <value> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | </member> |
| 161 | 161 | <member> |
| 162 | 162 | <name>faultString</name> |
| 163 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
| 163 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
| 164 | 164 | </member> |
| 165 | 165 | </struct> |
| 166 | 166 | </value> |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $m = $this->newMsg('dummy'); |
| 170 | 170 | $r = $m->parseResponse($response); |
| 171 | 171 | $v = $r->faultString(); |
| 172 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
| 172 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | public function testBrokenRequests() |
@@ -407,11 +407,11 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | public function testUTF8Response() |
| 409 | 409 | { |
| 410 | - $string = chr(224) . chr(252) . chr(232); |
|
| 410 | + $string = chr(224).chr(252).chr(232); |
|
| 411 | 411 | |
| 412 | 412 | $s = $this->newMsg('dummy'); |
| 413 | - $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> |
|
| 414 | -<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> |
|
| 413 | + $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> |
|
| 414 | +<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> |
|
| 415 | 415 | '; |
| 416 | 416 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 417 | 417 | $v = $r->value(); |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | $this->assertEquals($string, $v); |
| 420 | 420 | |
| 421 | 421 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 422 | -<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> |
|
| 422 | +<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> |
|
| 423 | 423 | '; |
| 424 | 424 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 425 | 425 | $v = $r->value(); |
@@ -435,11 +435,11 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | public function testLatin1Response() |
| 437 | 437 | { |
| 438 | - $string = chr(224) . chr(252) . chr(232); |
|
| 438 | + $string = chr(224).chr(252).chr(232); |
|
| 439 | 439 | |
| 440 | 440 | $s = $this->newMsg('dummy'); |
| 441 | - $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> |
|
| 442 | -<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> |
|
| 441 | + $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> |
|
| 442 | +<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> |
|
| 443 | 443 | '; |
| 444 | 444 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 445 | 445 | $v = $r->value(); |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | $this->assertEquals($string, $v); |
| 448 | 448 | |
| 449 | 449 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 450 | -<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> |
|
| 450 | +<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> |
|
| 451 | 451 | '; |
| 452 | 452 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 453 | 453 | $v = $r->value(); |
@@ -201,8 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
| 203 | 203 | return; |
| 204 | - } |
|
| 205 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 204 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 206 | 205 | { |
| 207 | 206 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
| 208 | 207 | return; |
@@ -226,8 +225,7 @@ discard block |
||
| 226 | 225 | { |
| 227 | 226 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
| 228 | 227 | return; |
| 229 | - } |
|
| 230 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 228 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 231 | 229 | { |
| 232 | 230 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
| 233 | 231 | return; |
@@ -278,13 +276,11 @@ discard block |
||
| 278 | 276 | { |
| 279 | 277 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
| 280 | 278 | return; |
| 281 | - } |
|
| 282 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 279 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 283 | 280 | { |
| 284 | 281 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
| 285 | 282 | return; |
| 286 | - } |
|
| 287 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 283 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 288 | 284 | { |
| 289 | 285 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
| 290 | 286 | return; |
@@ -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__ . '/5ServerTest.php'; |
|
| 8 | +include_once __DIR__.'/5ServerTest.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests which stress http features of the library. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | $methods = array(); |
| 33 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 33 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 34 | 34 | { |
| 35 | 35 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
| 36 | 36 | { |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
| 272 | 272 | $ubuntuVersion = @$matches[1]; |
| 273 | 273 | } |
| 274 | - if ($ubuntuVersion >= 20) { |
|
| 274 | + if ($ubuntuVersion>=20) { |
|
| 275 | 275 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
| 276 | 276 | return; |
| 277 | 277 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.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\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $this->assertequals(1, count($v1)); |
| 129 | 129 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 130 | 130 | |
| 131 | - foreach($v1 as $key => $val) |
|
| 131 | + foreach ($v1 as $key => $val) |
|
| 132 | 132 | { |
| 133 | 133 | $this->assertArrayHasKey($key, $out); |
| 134 | 134 | $expected = $out[$key]; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $this->assertequals(2, count($v2)); |
| 144 | 144 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 145 | 145 | $i = 0; |
| 146 | - foreach($v2 as $key => $val) |
|
| 146 | + foreach ($v2 as $key => $val) |
|
| 147 | 147 | { |
| 148 | 148 | $expected = $out[$i]; |
| 149 | 149 | $this->assertequals($expected['key'], $key); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | { |
| 158 | 158 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
| 159 | 159 | $data = array(); |
| 160 | - for ($i = 0; $i < 500000; $i++ ) { |
|
| 160 | + for ($i = 0; $i<500000; $i++) { |
|
| 161 | 161 | $data[] = 'hello world'; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |