@@ -2,20 +2,20 @@ |
||
2 | 2 | |
3 | 3 | use PHPUnit\Runner\Version as PHPUnit_Version; |
4 | 4 | |
5 | -if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true |
|
6 | - && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false |
|
5 | +if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true |
|
6 | + && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false |
|
7 | 7 | ) { |
8 | - class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ); |
|
8 | + class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage'); |
|
9 | 9 | } |
10 | 10 | |
11 | -if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true |
|
12 | - && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false |
|
11 | +if (class_exists('PHPUnit_Runner_BaseTestRunner') === true |
|
12 | + && class_exists('PHPUnit\Runner\BaseTestRunner') === false |
|
13 | 13 | ) { |
14 | - class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' ); |
|
14 | + class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner'); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | if (class_exists('PHPUnit\Runner\Version') === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) { |
18 | - include_once __DIR__ . '/PolyfillTestCase7.php'; |
|
18 | + include_once __DIR__.'/PolyfillTestCase7.php'; |
|
19 | 19 | } else { |
20 | - include_once __DIR__ . '/PolyfillTestCase8.php'; |
|
20 | + include_once __DIR__.'/PolyfillTestCase8.php'; |
|
21 | 21 | } |
@@ -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 | } |
@@ -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,12 +65,12 @@ 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: |
72 | 72 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
73 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . |
|
73 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '. |
|
74 | 74 | $trace[0]['line'], E_USER_NOTICE); |
75 | 75 | return null; |
76 | 76 | } |
@@ -97,30 +97,30 @@ discard block |
||
97 | 97 | Server::xmlrpc_debugmsg($m); |
98 | 98 | } |
99 | 99 | |
100 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
100 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
101 | 101 | { |
102 | 102 | return Server::_xmlrpcs_getCapabilities($server, $m); |
103 | 103 | } |
104 | 104 | |
105 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
106 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
107 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
108 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
105 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
106 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
107 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
108 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
109 | 109 | { |
110 | 110 | return Server::_xmlrpcs_listMethods($server, $m); |
111 | 111 | } |
112 | 112 | |
113 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
114 | -$_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)'; |
|
115 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
113 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
114 | +$_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)'; |
|
115 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
116 | 116 | function _xmlrpcs_methodSignature($server, $m) |
117 | 117 | { |
118 | 118 | return Server::_xmlrpcs_methodSignature($server, $m); |
119 | 119 | } |
120 | 120 | |
121 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
122 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
123 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
121 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
122 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
123 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
124 | 124 | function _xmlrpcs_methodHelp($server, $m) |
125 | 125 | { |
126 | 126 | return Server::_xmlrpcs_methodHelp($server, $m); |
@@ -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) |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
16 | 16 | } |
17 | 17 | |
18 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
18 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | $targetFile = null; |
@@ -38,5 +38,5 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
41 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
41 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
42 | 42 | } |
@@ -151,35 +151,35 @@ discard block |
||
151 | 151 | public function serialize($charsetEncoding = '') |
152 | 152 | { |
153 | 153 | if ($charsetEncoding != '') { |
154 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
154 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
155 | 155 | } else { |
156 | 156 | $this->content_type = 'text/xml'; |
157 | 157 | } |
158 | 158 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
159 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
159 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
160 | 160 | } else { |
161 | 161 | $result = "<methodResponse>\n"; |
162 | 162 | } |
163 | 163 | if ($this->errno) { |
164 | 164 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
165 | - $result .= "<fault>\n" . |
|
166 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
167 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
168 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
165 | + $result .= "<fault>\n". |
|
166 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
167 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
168 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
169 | 169 | "</struct>\n</value>\n</fault>"; |
170 | 170 | } else { |
171 | 171 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
172 | 172 | if (is_string($this->val) && $this->valtyp == 'xml') { |
173 | - $result .= "<params>\n<param>\n" . |
|
174 | - $this->val . |
|
173 | + $result .= "<params>\n<param>\n". |
|
174 | + $this->val. |
|
175 | 175 | "</param>\n</params>"; |
176 | 176 | } else { |
177 | 177 | /// @todo try to build something serializable using the Encoder... |
178 | 178 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
179 | 179 | } |
180 | 180 | } else { |
181 | - $result .= "<params>\n<param>\n" . |
|
182 | - $this->val->serialize($charsetEncoding) . |
|
181 | + $result .= "<params>\n<param>\n". |
|
182 | + $this->val->serialize($charsetEncoding). |
|
183 | 183 | "</param>\n</params>"; |
184 | 184 | } |
185 | 185 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | return $this->httpResponse['raw_data']; |
205 | 205 | default: |
206 | 206 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
207 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
207 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
208 | 208 | return null; |
209 | 209 | } |
210 | 210 | } |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | break; |
226 | 226 | default: |
227 | 227 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
228 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
228 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | break; |
258 | 258 | default: |
259 | 259 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
260 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
260 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
261 | 261 | } |
262 | 262 | } |
263 | 263 | } |
@@ -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(); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | '<?xml version="1.0"?> |
151 | 151 | <!-- $Id --> |
152 | 152 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
153 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
153 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
154 | 154 | <methodResponse> |
155 | 155 | <fault> |
156 | 156 | <value> |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | </member> |
162 | 162 | <member> |
163 | 163 | <name>faultString</name> |
164 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
164 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
165 | 165 | </member> |
166 | 166 | </struct> |
167 | 167 | </value> |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $m = $this->newMsg('dummy'); |
171 | 171 | $r = $m->parseResponse($response); |
172 | 172 | $v = $r->faultString(); |
173 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
173 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | public function testBrokenRequests() |
@@ -410,11 +410,11 @@ discard block |
||
410 | 410 | |
411 | 411 | public function testUTF8Response() |
412 | 412 | { |
413 | - $string = chr(224) . chr(252) . chr(232); |
|
413 | + $string = chr(224).chr(252).chr(232); |
|
414 | 414 | |
415 | 415 | $s = $this->newMsg('dummy'); |
416 | - $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> |
|
417 | -<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> |
|
416 | + $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> |
|
417 | +<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> |
|
418 | 418 | '; |
419 | 419 | $r = $s->parseResponse($f, false, 'phpvals'); |
420 | 420 | $v = $r->value(); |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $this->assertEquals($string, $v); |
423 | 423 | |
424 | 424 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
425 | -<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> |
|
425 | +<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> |
|
426 | 426 | '; |
427 | 427 | $r = $s->parseResponse($f, false, 'phpvals'); |
428 | 428 | $v = $r->value(); |
@@ -438,11 +438,11 @@ discard block |
||
438 | 438 | |
439 | 439 | public function testLatin1Response() |
440 | 440 | { |
441 | - $string = chr(224) . chr(252) . chr(232); |
|
441 | + $string = chr(224).chr(252).chr(232); |
|
442 | 442 | |
443 | 443 | $s = $this->newMsg('dummy'); |
444 | - $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> |
|
445 | -<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> |
|
444 | + $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> |
|
445 | +<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> |
|
446 | 446 | '; |
447 | 447 | $r = $s->parseResponse($f, false, 'phpvals'); |
448 | 448 | $v = $r->value(); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $this->assertEquals($string, $v); |
451 | 451 | |
452 | 452 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
453 | -<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> |
|
453 | +<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> |
|
454 | 454 | '; |
455 | 455 | $r = $s->parseResponse($f, false, 'phpvals'); |
456 | 456 | $v = $r->value(); |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | 'scalar' => $val, |
77 | 77 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
78 | 78 | ); |
79 | - return (object)$xmlrpcVal; |
|
79 | + return (object) $xmlrpcVal; |
|
80 | 80 | case 'base64': |
81 | 81 | $xmlrpcVal = array( |
82 | 82 | 'xmlrpc_type' => 'base64', |
83 | 83 | 'scalar' => $val |
84 | 84 | ); |
85 | - return (object)$xmlrpcVal; |
|
85 | + return (object) $xmlrpcVal; |
|
86 | 86 | case 'string': |
87 | 87 | if (isset($options['extension_api_encoding'])) { |
88 | 88 | $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | case 'msg': |
146 | 146 | $paramCount = $xmlrpcVal->getNumParams(); |
147 | 147 | $arr = array(); |
148 | - for ($i = 0; $i < $paramCount; $i++) { |
|
148 | + for ($i = 0; $i<$paramCount; $i++) { |
|
149 | 149 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
150 | 150 | } |
151 | 151 | return $arr; |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | break; |
263 | 263 | case 'resource': |
264 | 264 | if (in_array('extension_api', $options)) { |
265 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
265 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
266 | 266 | } else { |
267 | 267 | $xmlrpcVal = new Value(); |
268 | 268 | } |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
311 | 311 | $xmlVal = utf8_encode($xmlVal); |
312 | 312 | } else { |
313 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
313 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | } |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | $parserOptions |
333 | 333 | ); |
334 | 334 | |
335 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
335 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
336 | 336 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
337 | 337 | |
338 | 338 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | |
357 | 357 | case 'methodcall': |
358 | 358 | $req = new Request($xmlRpcParser->_xh['method']); |
359 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
359 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
360 | 360 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
361 | 361 | } |
362 | 362 | return $req; |
@@ -4,7 +4,7 @@ |
||
4 | 4 | if (isset($_GET['run'])) { |
5 | 5 | $path = parse_url($_GET['run']); |
6 | 6 | if (isset($path['query'])) { |
7 | - $query = '?' . $path['query']; |
|
7 | + $query = '?'.$path['query']; |
|
8 | 8 | } |
9 | 9 | } |
10 | 10 |