@@ -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 | } |
@@ -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); |
@@ -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; |
@@ -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 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
| 17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 18 | 18 | PhpXmlRpc\Autoloader::register(); |
| 19 | 19 | |
| 20 | 20 | // Out-of-band information: let the client manipulate the server operations. |
@@ -26,5 +26,5 @@ discard block |
||
| 26 | 26 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 29 | + include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 30 | 30 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | xml_set_object($parser, $this); |
| 125 | 125 | |
| 126 | - switch($returnType) { |
|
| 126 | + switch ($returnType) { |
|
| 127 | 127 | case self::RETURN_PHP: |
| 128 | 128 | xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast'); |
| 129 | 129 | break; |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | $this->accept = $accept; |
| 141 | 141 | |
| 142 | 142 | // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors |
| 143 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 143 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 144 | 144 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 145 | 145 | // error handling: xml not well formed |
| 146 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 146 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 147 | 147 | $errCode = xml_get_error_code($parser); |
| 148 | 148 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 149 | 149 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 168 | 168 | { |
| 169 | 169 | // if invalid xmlrpc already detected, skip all processing |
| 170 | - if ($this->_xh['isf'] < 2) { |
|
| 170 | + if ($this->_xh['isf']<2) { |
|
| 171 | 171 | |
| 172 | 172 | // check for correct element nesting |
| 173 | 173 | if (count($this->_xh['stack']) == 0) { |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | $this->_xh['rt'] = strtolower($name); |
| 188 | 188 | } else { |
| 189 | 189 | $this->_xh['isf'] = 2; |
| 190 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 190 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 191 | 191 | |
| 192 | 192 | return; |
| 193 | 193 | } |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | break; |
| 282 | 282 | case 'MEMBER': |
| 283 | 283 | // set member name to null, in case we do not find in the xml later on |
| 284 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; |
|
| 284 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; |
|
| 285 | 285 | //$this->_xh['ac']=''; |
| 286 | 286 | // Drop trough intentionally |
| 287 | 287 | case 'PARAM': |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | */ |
| 342 | 342 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 343 | 343 | { |
| 344 | - if ($this->_xh['isf'] < 2) { |
|
| 344 | + if ($this->_xh['isf']<2) { |
|
| 345 | 345 | // push this element name from stack |
| 346 | 346 | // NB: if XML validates, correct opening/closing is guaranteed and |
| 347 | 347 | // we do not have to check for $name == $currElem. |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $this->_xh['vt'] = Value::$xmlrpcString; |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - if ($rebuildXmlrpcvals > 0) { |
|
| 359 | + if ($rebuildXmlrpcvals>0) { |
|
| 360 | 360 | // build the xmlrpc val out of the data received, and substitute it |
| 361 | 361 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 362 | 362 | // in case we got info about underlying php class, save it |
@@ -365,15 +365,15 @@ discard block |
||
| 365 | 365 | $temp->_php_class = $this->_xh['php_class']; |
| 366 | 366 | } |
| 367 | 367 | $this->_xh['value'] = $temp; |
| 368 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 368 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 369 | 369 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 370 | - $this->_xh['value'] = (object)array( |
|
| 370 | + $this->_xh['value'] = (object) array( |
|
| 371 | 371 | 'xmlrpc_type' => 'datetime', |
| 372 | 372 | 'scalar' => $this->_xh['value'], |
| 373 | 373 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 374 | 374 | ); |
| 375 | 375 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 376 | - $this->_xh['value'] = (object)array( |
|
| 376 | + $this->_xh['value'] = (object) array( |
|
| 377 | 377 | 'xmlrpc_type' => 'base64', |
| 378 | 378 | 'scalar' => $this->_xh['value'] |
| 379 | 379 | ); |
@@ -389,8 +389,8 @@ discard block |
||
| 389 | 389 | // check if we are inside an array or struct: |
| 390 | 390 | // if value just built is inside an array, let's move it into array on the stack |
| 391 | 391 | $vscount = count($this->_xh['valuestack']); |
| 392 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 393 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 392 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 393 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 394 | 394 | } |
| 395 | 395 | break; |
| 396 | 396 | case 'BOOLEAN': |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $this->_xh['value'] = $this->_xh['ac']; |
| 410 | 410 | } elseif ($name == 'DATETIME.ISO8601') { |
| 411 | 411 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
| 412 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
| 412 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
| 413 | 413 | } |
| 414 | 414 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 415 | 415 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | } else { |
| 429 | 429 | // log if receiving something strange, even though we set the value to false anyway |
| 430 | 430 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
| 431 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
| 431 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
| 432 | 432 | } |
| 433 | 433 | $this->_xh['value'] = false; |
| 434 | 434 | } |
@@ -438,37 +438,37 @@ discard block |
||
| 438 | 438 | // NOTE: regexp could be much stricter than this... |
| 439 | 439 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
| 440 | 440 | /// @todo: find a better way of throwing an error than this! |
| 441 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
| 441 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
| 442 | 442 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 443 | 443 | } else { |
| 444 | 444 | // it's ok, add it on |
| 445 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 445 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 446 | 446 | } |
| 447 | 447 | } else { |
| 448 | 448 | // we have an I4/I8/INT |
| 449 | 449 | // we must check that only 0123456789-<space> are characters here |
| 450 | 450 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
| 451 | 451 | /// @todo find a better way of throwing an error than this! |
| 452 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
| 452 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
| 453 | 453 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 454 | 454 | } else { |
| 455 | 455 | // it's ok, add it on |
| 456 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 456 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 460 | 460 | break; |
| 461 | 461 | case 'NAME': |
| 462 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 462 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 463 | 463 | break; |
| 464 | 464 | case 'MEMBER': |
| 465 | 465 | // add to array in the stack the last element built, |
| 466 | 466 | // unless no VALUE was found |
| 467 | 467 | if ($this->_xh['vt']) { |
| 468 | 468 | $vscount = count($this->_xh['valuestack']); |
| 469 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 469 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 470 | 470 | } else { |
| 471 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
| 471 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
| 472 | 472 | } |
| 473 | 473 | break; |
| 474 | 474 | case 'DATA': |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | $this->_xh['params'][] = $this->_xh['value']; |
| 492 | 492 | $this->_xh['pt'][] = $this->_xh['vt']; |
| 493 | 493 | } else { |
| 494 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
| 494 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
| 495 | 495 | } |
| 496 | 496 | break; |
| 497 | 497 | case 'METHODNAME': |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | public function xmlrpc_cd($parser, $data) |
| 548 | 548 | { |
| 549 | 549 | // skip processing if xml fault already detected |
| 550 | - if ($this->_xh['isf'] < 2) { |
|
| 550 | + if ($this->_xh['isf']<2) { |
|
| 551 | 551 | // "lookforvalue==3" means that we've found an entire value |
| 552 | 552 | // and should discard any further character data |
| 553 | 553 | if ($this->_xh['lv'] != 3) { |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | public function xmlrpc_dh($parser, $data) |
| 566 | 566 | { |
| 567 | 567 | // skip processing if xml fault already detected |
| 568 | - if ($this->_xh['isf'] < 2) { |
|
| 568 | + if ($this->_xh['isf']<2) { |
|
| 569 | 569 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
| 570 | 570 | $this->_xh['ac'] .= $data; |
| 571 | 571 | } |
@@ -636,8 +636,8 @@ discard block |
||
| 636 | 636 | // Details: |
| 637 | 637 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 638 | 638 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 639 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 640 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 639 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 640 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 641 | 641 | $xmlChunk, $matches)) { |
| 642 | 642 | return strtoupper(substr($matches[2], 1, -1)); |
| 643 | 643 | } |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 656 | 656 | // IANA also likes better US-ASCII, so go with it |
| 657 | 657 | if ($enc == 'ASCII') { |
| 658 | - $enc = 'US-' . $enc; |
|
| 658 | + $enc = 'US-'.$enc; |
|
| 659 | 659 | } |
| 660 | 660 | |
| 661 | 661 | return $enc; |
@@ -690,8 +690,8 @@ discard block |
||
| 690 | 690 | // Details: |
| 691 | 691 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 692 | 692 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 693 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 694 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 693 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 694 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 695 | 695 | $xmlChunk, $matches)) { |
| 696 | 696 | return true; |
| 697 | 697 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | // assume this is either a standalone install, or installed as Composer dependency |
| 20 | 20 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 21 | 21 | /// debugger include this one, taking care of autoloading ? |
| 22 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 22 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 23 | 23 | PhpXmlRpc\Autoloader::register(); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Variables that shouldn't be unset |
| 36 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 36 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | 37 | |
| 38 | 38 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 39 | 39 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -53,8 +53,7 @@ discard block |
||
| 53 | 53 | function stripslashes_deep($value) |
| 54 | 54 | { |
| 55 | 55 | $value = is_array($value) ? |
| 56 | - array_map('stripslashes_deep', $value) : |
|
| 57 | - stripslashes($value); |
|
| 56 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 58 | 57 | |
| 59 | 58 | return $value; |
| 60 | 59 | } |
@@ -99,7 +98,7 @@ discard block |
||
| 99 | 98 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 100 | 99 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 101 | 100 | if ($path && ($path[0]) != '/') { |
| 102 | - $path = '/' . $path; |
|
| 101 | + $path = '/'.$path; |
|
| 103 | 102 | } |
| 104 | 103 | |
| 105 | 104 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |