@@ -3,7 +3,7 @@ |
||
3 | 3 | if (isset($_GET['run'])) { |
4 | 4 | $path = parse_url($_GET['run']); |
5 | 5 | if (isset($path['query'])) { |
6 | - $query = '?' . $path['query']; |
|
6 | + $query = '?'.$path['query']; |
|
7 | 7 | } |
8 | 8 | } |
9 | 9 | ?> |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @license code licensed under the BSD License: see file license.txt |
7 | 7 | **/ |
8 | 8 | |
9 | -$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
9 | +$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
10 | 10 | |
11 | 11 | // has to be the same value as used in server.php |
12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; |
@@ -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 | } |
@@ -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); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @param array $extraOptions |
127 | 127 | * @return mixed |
128 | 128 | */ |
129 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
129 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
130 | 130 | { |
131 | 131 | $wrapper = new PhpXmlRpc\Wrapper(); |
132 | 132 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
147 | 147 | { |
148 | 148 | $code = "function $xmlrpcFuncName ("; |
149 | - if ($clientCopyMode < 2) { |
|
149 | + if ($clientCopyMode<2) { |
|
150 | 150 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
151 | 151 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix, $namespace); |
152 | 152 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | if ($mDesc != '') { |
162 | 162 | // take care that PHP comment is not terminated unwillingly by method description |
163 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
163 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
164 | 164 | } else { |
165 | 165 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
166 | 166 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
170 | 170 | $plist = array(); |
171 | 171 | $pCount = count($mSig); |
172 | - for ($i = 1; $i < $pCount; $i++) { |
|
172 | + for ($i = 1; $i<$pCount; $i++) { |
|
173 | 173 | $plist[] = "\$p$i"; |
174 | 174 | $pType = $mSig[$i]; |
175 | 175 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -185,19 +185,19 @@ discard block |
||
185 | 185 | } |
186 | 186 | } |
187 | 187 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
188 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
188 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
189 | 189 | } |
190 | - if ($clientCopyMode < 2) { |
|
190 | + if ($clientCopyMode<2) { |
|
191 | 191 | $plist[] = '$debug=0'; |
192 | 192 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
193 | 193 | } |
194 | 194 | $plist = implode(', ', $plist); |
195 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
195 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
196 | 196 | |
197 | 197 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
198 | 198 | if ($decodeFault) { |
199 | 199 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
200 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
200 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
201 | 201 | } else { |
202 | 202 | $respCode = var_export($faultResponse, true); |
203 | 203 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
211 | 211 | } |
212 | 212 | |
213 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
213 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
214 | 214 | |
215 | 215 | return array('source' => $code, 'docstring' => $mDesc); |
216 | 216 | } |
@@ -218,18 +218,18 @@ discard block |
||
218 | 218 | /** |
219 | 219 | * @deprecated |
220 | 220 | */ |
221 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
221 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
222 | 222 | { |
223 | 223 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
224 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
224 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
225 | 225 | |
226 | 226 | // copy all client fields to the client that will be generated runtime |
227 | 227 | // (this provides for future expansion or subclassing of client obj) |
228 | 228 | if ($verbatim_client_copy) |
229 | 229 | { |
230 | - foreach($client as $fld => $val) |
|
230 | + foreach ($client as $fld => $val) |
|
231 | 231 | { |
232 | - if($fld != 'debug' && $fld != 'return_type') |
|
232 | + if ($fld != 'debug' && $fld != 'return_type') |
|
233 | 233 | { |
234 | 234 | $val = var_export($val, true); |
235 | 235 | $code .= "\$client->$fld = $val;\n"; |
@@ -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>"; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | // check for command line (env vars) vs. web page input params |
45 | 45 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
46 | - foreach($_SERVER as $key => $val) { |
|
46 | + foreach ($_SERVER as $key => $val) { |
|
47 | 47 | if (array_key_exists($key, $args)) { |
48 | 48 | $$key = $val; |
49 | 49 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | } |
89 | 89 | if ($HTTPURI[0] != '/') { |
90 | - $HTTPURI = '/' . $HTTPURI; |
|
90 | + $HTTPURI = '/'.$HTTPURI; |
|
91 | 91 | } |
92 | 92 | $args['HTTPURI'] = $HTTPURI; |
93 | 93 | |
@@ -101,21 +101,21 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | if (isset($HTTPSIGNOREPEER)) { |
104 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
104 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | if (isset($HTTPSVERIFYHOST)) { |
108 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
108 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (isset($SSLVERSION)) { |
112 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
112 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if (isset($PROXYSERVER)) { |
116 | 116 | $arr = explode(':', $PROXYSERVER); |
117 | 117 | $args['PROXYSERVER'] = $arr[0]; |
118 | - if (count($arr) > 1) { |
|
118 | + if (count($arr)>1) { |
|
119 | 119 | $args['PROXYPORT'] = $arr[1]; |
120 | 120 | } else { |
121 | 121 | $args['PROXYPORT'] = 8080; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once __DIR__ . "/_prepend.php"; |
|
3 | +require_once __DIR__."/_prepend.php"; |
|
4 | 4 | |
5 | 5 | use PhpXmlRpc\Value; |
6 | 6 | |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | $count = 0; |
32 | 32 | } |
33 | 33 | // add the new comment in |
34 | - dba_insert($msgID . "_comment_${count}", $comment, $dbh); |
|
35 | - dba_insert($msgID . "_name_${count}", $name, $dbh); |
|
34 | + dba_insert($msgID."_comment_${count}", $comment, $dbh); |
|
35 | + dba_insert($msgID."_name_${count}", $name, $dbh); |
|
36 | 36 | $count++; |
37 | 37 | dba_replace($countID, $count, $dbh); |
38 | 38 | dba_close($dbh); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $countID = "${msgID}_count"; |
66 | 66 | if (dba_exists($countID, $dbh)) { |
67 | 67 | $count = dba_fetch($countID, $dbh); |
68 | - for ($i = 0; $i < $count; $i++) { |
|
68 | + for ($i = 0; $i<$count; $i++) { |
|
69 | 69 | $name = dba_fetch("${msgID}_name_${i}", $dbh); |
70 | 70 | $comment = dba_fetch("${msgID}_comment_${i}", $dbh); |
71 | 71 | // push a new struct onto the return array |
@@ -101,4 +101,4 @@ discard block |
||
101 | 101 | ), |
102 | 102 | )); |
103 | 103 | |
104 | -require_once __DIR__ . "/_append.php"; |
|
104 | +require_once __DIR__."/_append.php"; |
@@ -3,5 +3,5 @@ |
||
3 | 3 | // Out-of-band information: let the client manipulate the server operations. |
4 | 4 | // We do this to help the testsuite script: do not reproduce in production! |
5 | 5 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
6 | - include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
6 | + include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
7 | 7 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * @license code licensed under the BSD License: see file license.txt |
10 | 10 | */ |
11 | 11 | |
12 | -require_once __DIR__ . "/_prepend.php"; |
|
12 | +require_once __DIR__."/_prepend.php"; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * Forward an xmlrpc request to another server, and return to client the response received. |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $url = $encoder->decode($req->getParam(0)); |
30 | 30 | $client = new PhpXmlRpc\Client($url); |
31 | 31 | |
32 | - if ($req->getNumParams() > 3) { |
|
32 | + if ($req->getNumParams()>3) { |
|
33 | 33 | // we have to set some options onto the client. |
34 | 34 | // Note that if we do not untaint the received values, warnings might be generated... |
35 | 35 | $options = $encoder->decode($req->getParam(3)); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $client->setSSLVerifyPeer($val); |
50 | 50 | break; |
51 | 51 | case 'Timeout': |
52 | - $timeout = (integer)$val; |
|
52 | + $timeout = (integer) $val; |
|
53 | 53 | break; |
54 | 54 | } // switch |
55 | 55 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | // add debug info into response we give back to caller |
70 | - PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
70 | + PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
71 | 71 | |
72 | 72 | return $client->send($req, $timeout); |
73 | 73 | } |
@@ -88,4 +88,4 @@ discard block |
||
88 | 88 | ) |
89 | 89 | ); |
90 | 90 | |
91 | -require_once __DIR__ . "/_append.php"; |
|
91 | +require_once __DIR__."/_append.php"; |