@@ -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) { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @see PhpXmlRpc\Wrapper::wrapXmlrpcMethod |
| 88 | 88 | * @param xmlrpc_client $client |
| 89 | 89 | * @param string $methodName |
| 90 | - * @param int|array $extraOptions the usage of an int as signature number is deprecated, use an option in $extraOptions |
|
| 90 | + * @param integer $extraOptions the usage of an int as signature number is deprecated, use an option in $extraOptions |
|
| 91 | 91 | * @param int $timeout deprecated, use an option in $extraOptions |
| 92 | 92 | * @param string $protocol deprecated, use an option in $extraOptions |
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
@@ -217,6 +217,7 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | /** |
| 219 | 219 | * @deprecated |
| 220 | + * @param integer $verbatim_client_copy |
|
| 220 | 221 | */ |
| 221 | 222 | function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
| 222 | 223 | { |
@@ -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"; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | reset($ar); |
| 96 | 96 | list($typ, $val) = each($ar); |
| 97 | 97 | |
| 98 | - return '<value>' . $this->serializedata($typ, $val) . "</value>\n"; |
|
| 98 | + return '<value>'.$this->serializedata($typ, $val)."</value>\n"; |
|
| 99 | 99 | //} |
| 100 | 100 | } |
| 101 | 101 | |
@@ -163,17 +163,17 @@ discard block |
||
| 163 | 163 | /* Expose as global functions the ones which are now class methods */ |
| 164 | 164 | |
| 165 | 165 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 166 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 166 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 167 | 167 | { |
| 168 | 168 | return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | -function iso8601_encode($timeT, $utc=0) |
|
| 171 | +function iso8601_encode($timeT, $utc = 0) |
|
| 172 | 172 | { |
| 173 | 173 | return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc); |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | -function iso8601_decode($iDate, $utc=0) |
|
| 176 | +function iso8601_decode($iDate, $utc = 0) |
|
| 177 | 177 | { |
| 178 | 178 | return PhpXmlRpc\Helper\Date::iso8601Decode($iDate, $utc); |
| 179 | 179 | } |
@@ -183,25 +183,25 @@ discard block |
||
| 183 | 183 | return PhpXmlRpc\Helper\Http::decodeChunked($buffer); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 186 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 187 | 187 | { |
| 188 | 188 | $encoder = new PhpXmlRpc\Encoder(); |
| 189 | 189 | return $encoder->decode($xmlrpcVal, $options); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 192 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 193 | 193 | { |
| 194 | 194 | $encoder = new PhpXmlRpc\Encoder(); |
| 195 | 195 | return $encoder->encode($phpVal, $options); |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 198 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 199 | 199 | { |
| 200 | 200 | $encoder = new PhpXmlRpc\Encoder(); |
| 201 | 201 | return $encoder->decodeXml($xmlVal, $options); |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 204 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 205 | 205 | { |
| 206 | 206 | return PhpXmlRpc\Helper\XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 207 | 207 | } |
@@ -168,6 +168,9 @@ discard block |
||
| 168 | 168 | return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | +/** |
|
| 172 | + * @param integer $timeT |
|
| 173 | + */ |
|
| 171 | 174 | function iso8601_encode($timeT, $utc=0) |
| 172 | 175 | { |
| 173 | 176 | return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc); |
@@ -195,6 +198,9 @@ discard block |
||
| 195 | 198 | return $encoder->encode($phpVal, $options); |
| 196 | 199 | } |
| 197 | 200 | |
| 201 | +/** |
|
| 202 | + * @param string $xmlVal |
|
| 203 | + */ |
|
| 198 | 204 | function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
| 199 | 205 | { |
| 200 | 206 | $encoder = new PhpXmlRpc\Encoder(); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * When no value or type is passed in, the value is left uninitialized, and the value can be added later. |
| 48 | 48 | * |
| 49 | - * @param mixed $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves |
|
| 49 | + * @param integer $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves |
|
| 50 | 50 | * @param string $type any valid xmlrpc type name (lowercase): i4, int, boolean, string, double, dateTime.iso8601, |
| 51 | 51 | * base64, array, struct, null. |
| 52 | 52 | * If null, 'string' is assumed. |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * If the xmlrpc value is empty (uninitialized), this method makes it a scalar value, and sets that value. |
| 96 | 96 | * Fails if the xmlrpc value is not an array and already initialized. |
| 97 | 97 | * |
| 98 | - * @param mixed $val |
|
| 98 | + * @param string $val |
|
| 99 | 99 | * @param string $type allowed values: i4, i8, int, boolean, string, double, dateTime.iso8601, base64, null. |
| 100 | 100 | * |
| 101 | 101 | * @return int 1 or 0 on failure |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $this->me['struct'] = $val; |
| 84 | 84 | break; |
| 85 | 85 | default: |
| 86 | - error_log("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 86 | + error_log("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | if ($typeOf !== 1) { |
| 111 | - error_log("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 111 | + error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 112 | 112 | return 0; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | switch ($this->mytype) { |
| 127 | 127 | case 1: |
| 128 | - error_log('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 128 | + error_log('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 129 | 129 | return 0; |
| 130 | 130 | case 3: |
| 131 | - error_log('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 131 | + error_log('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 132 | 132 | return 0; |
| 133 | 133 | case 2: |
| 134 | 134 | // we're adding a scalar value to an array here |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | return 1; |
| 172 | 172 | } else { |
| 173 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 173 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 174 | 174 | return 0; |
| 175 | 175 | } |
| 176 | 176 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | return 1; |
| 203 | 203 | } else { |
| 204 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 204 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 205 | 205 | return 0; |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -240,20 +240,20 @@ discard block |
||
| 240 | 240 | case 1: |
| 241 | 241 | switch ($typ) { |
| 242 | 242 | case static::$xmlrpcBase64: |
| 243 | - $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>"; |
|
| 243 | + $rs .= "<${typ}>".base64_encode($val)."</${typ}>"; |
|
| 244 | 244 | break; |
| 245 | 245 | case static::$xmlrpcBoolean: |
| 246 | - $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>"; |
|
| 246 | + $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>"; |
|
| 247 | 247 | break; |
| 248 | 248 | case static::$xmlrpcString: |
| 249 | 249 | // G. Giunta 2005/2/13: do NOT use htmlentities, since |
| 250 | 250 | // it will produce named html entities, which are invalid xml |
| 251 | - $rs .= "<${typ}>" . Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>"; |
|
| 251 | + $rs .= "<${typ}>".Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>"; |
|
| 252 | 252 | break; |
| 253 | 253 | case static::$xmlrpcInt: |
| 254 | 254 | case static::$xmlrpcI4: |
| 255 | 255 | case static::$xmlrpcI8: |
| 256 | - $rs .= "<${typ}>" . (int)$val . "</${typ}>"; |
|
| 256 | + $rs .= "<${typ}>".(int) $val."</${typ}>"; |
|
| 257 | 257 | break; |
| 258 | 258 | case static::$xmlrpcDouble: |
| 259 | 259 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -261,15 +261,15 @@ discard block |
||
| 261 | 261 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
| 262 | 262 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 263 | 263 | // but there is of course no limit in the number of decimal places to be used... |
| 264 | - $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, 128, '.', '')) . "</${typ}>"; |
|
| 264 | + $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>"; |
|
| 265 | 265 | break; |
| 266 | 266 | case static::$xmlrpcDateTime: |
| 267 | 267 | if (is_string($val)) { |
| 268 | 268 | $rs .= "<${typ}>${val}</${typ}>"; |
| 269 | 269 | } elseif (is_a($val, 'DateTime')) { |
| 270 | - $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>"; |
|
| 270 | + $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>"; |
|
| 271 | 271 | } elseif (is_int($val)) { |
| 272 | - $rs .= "<${typ}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>"; |
|
| 272 | + $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>"; |
|
| 273 | 273 | } else { |
| 274 | 274 | // not really a good idea here: but what shall we output anyway? left for backward compat... |
| 275 | 275 | $rs .= "<${typ}>${val}</${typ}>"; |
@@ -291,13 +291,13 @@ discard block |
||
| 291 | 291 | case 3: |
| 292 | 292 | // struct |
| 293 | 293 | if ($this->_php_class) { |
| 294 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 294 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 295 | 295 | } else { |
| 296 | 296 | $rs .= "<struct>\n"; |
| 297 | 297 | } |
| 298 | 298 | $charsetEncoder = Charset::instance(); |
| 299 | 299 | foreach ($val as $key2 => $val2) { |
| 300 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 300 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 301 | 301 | //$rs.=$this->serializeval($val2); |
| 302 | 302 | $rs .= $val2->serialize($charsetEncoding); |
| 303 | 303 | $rs .= "</member>\n"; |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | reset($this->me); |
| 333 | 333 | list($typ, $val) = each($this->me); |
| 334 | 334 | |
| 335 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 335 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | /** |
@@ -3,16 +3,16 @@ discard block |
||
| 3 | 3 | <body> |
| 4 | 4 | <?php |
| 5 | 5 | |
| 6 | -include_once __DIR__ . "/../vendor/autoload.php"; |
|
| 6 | +include_once __DIR__."/../vendor/autoload.php"; |
|
| 7 | 7 | |
| 8 | 8 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 9 | 9 | |
| 10 | 10 | print "<h3>Testing value serialization</h3>\n"; |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(23, "int"); |
| 13 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 13 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 14 | 14 | $v = new PhpXmlRpc\Value("What are you saying? >> << &&"); |
| 15 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 15 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 16 | 16 | |
| 17 | 17 | $v = new PhpXmlRpc\Value( |
| 18 | 18 | array( |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | "array" |
| 24 | 24 | ); |
| 25 | 25 | |
| 26 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 26 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 27 | 27 | |
| 28 | 28 | $v = new PhpXmlRpc\Value( |
| 29 | 29 | array( |
@@ -51,11 +51,11 @@ discard block |
||
| 51 | 51 | "struct" |
| 52 | 52 | ); |
| 53 | 53 | |
| 54 | -print "<PRE>" . htmlentities($v->serialize()) . "</PRE>"; |
|
| 54 | +print "<PRE>".htmlentities($v->serialize())."</PRE>"; |
|
| 55 | 55 | |
| 56 | 56 | $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array"); |
| 57 | 57 | |
| 58 | -print "<PRE>" . htmlentities($w->serialize()) . "</PRE>"; |
|
| 58 | +print "<PRE>".htmlentities($w->serialize())."</PRE>"; |
|
| 59 | 59 | |
| 60 | 60 | $w = new PhpXmlRpc\Value("Mary had a little lamb, |
| 61 | 61 | Whose fleece was white as snow, |
@@ -67,26 +67,26 @@ discard block |
||
| 67 | 67 | Ten thousand volts went down its back |
| 68 | 68 | And turned it into nylon", "base64" |
| 69 | 69 | ); |
| 70 | -print "<PRE>" . htmlentities($w->serialize()) . "</PRE>"; |
|
| 71 | -print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>"; |
|
| 70 | +print "<PRE>".htmlentities($w->serialize())."</PRE>"; |
|
| 71 | +print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>"; |
|
| 72 | 72 | |
| 73 | 73 | $req->method(''); |
| 74 | 74 | $req->addParam(new PhpXmlRpc\Value("41", "int")); |
| 75 | 75 | |
| 76 | 76 | print "<h3>Testing request serialization</h3>\n"; |
| 77 | 77 | $op = $req->serialize(); |
| 78 | -print "<PRE>" . htmlentities($op) . "</PRE>"; |
|
| 78 | +print "<PRE>".htmlentities($op)."</PRE>"; |
|
| 79 | 79 | |
| 80 | 80 | print "<h3>Testing ISO date format</h3><pre>\n"; |
| 81 | 81 | |
| 82 | 82 | $t = time(); |
| 83 | 83 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 84 | 84 | print "Now is $t --> $date\n"; |
| 85 | -print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"; |
|
| 85 | +print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"; |
|
| 86 | 86 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 87 | 87 | print "That is to say $date --> $tb\n"; |
| 88 | -print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"; |
|
| 89 | -print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($date, 1) . "\n"; |
|
| 88 | +print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"; |
|
| 89 | +print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($date, 1)."\n"; |
|
| 90 | 90 | |
| 91 | 91 | print "</pre>\n"; |
| 92 | 92 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 67 | 67 | { |
| 68 | 68 | // if invalid xmlrpc already detected, skip all processing |
| 69 | - if ($this->_xh['isf'] < 2) { |
|
| 69 | + if ($this->_xh['isf']<2) { |
|
| 70 | 70 | // check for correct element nesting |
| 71 | 71 | // top level element can only be of 2 types |
| 72 | 72 | /// @todo optimization creep: save this check into a bool variable, instead of using count() every time: |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $this->_xh['isf'] = 1; |
| 172 | 172 | break; |
| 173 | 173 | case 'MEMBER': |
| 174 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; // set member name to null, in case we do not find in the xml later on |
|
| 174 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; // set member name to null, in case we do not find in the xml later on |
|
| 175 | 175 | //$this->_xh['ac']=''; |
| 176 | 176 | // Drop trough intentionally |
| 177 | 177 | case 'PARAM': |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = true) |
| 225 | 225 | { |
| 226 | - if ($this->_xh['isf'] < 2) { |
|
| 226 | + if ($this->_xh['isf']<2) { |
|
| 227 | 227 | // push this element name from stack |
| 228 | 228 | // NB: if XML validates, correct opening/closing is guaranteed and |
| 229 | 229 | // we do not have to check for $name == $currElem. |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | // check if we are inside an array or struct: |
| 250 | 250 | // if value just built is inside an array, let's move it into array on the stack |
| 251 | 251 | $vscount = count($this->_xh['valuestack']); |
| 252 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 253 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $temp; |
|
| 252 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 253 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $temp; |
|
| 254 | 254 | } else { |
| 255 | 255 | $this->_xh['value'] = $temp; |
| 256 | 256 | } |
@@ -264,8 +264,8 @@ discard block |
||
| 264 | 264 | // check if we are inside an array or struct: |
| 265 | 265 | // if value just built is inside an array, let's move it into array on the stack |
| 266 | 266 | $vscount = count($this->_xh['valuestack']); |
| 267 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 268 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 267 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 268 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 269 | 269 | } |
| 270 | 270 | } |
| 271 | 271 | break; |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | $this->_xh['value'] = $this->_xh['ac']; |
| 286 | 286 | } elseif ($name == 'DATETIME.ISO8601') { |
| 287 | 287 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
| 288 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
| 288 | + error_log('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
| 289 | 289 | } |
| 290 | 290 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 291 | 291 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | } else { |
| 305 | 305 | // log if receiving something strange, even though we set the value to false anyway |
| 306 | 306 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
| 307 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
| 307 | + error_log('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
| 308 | 308 | } |
| 309 | 309 | $this->_xh['value'] = false; |
| 310 | 310 | } |
@@ -314,37 +314,37 @@ discard block |
||
| 314 | 314 | // NOTE: regexp could be much stricter than this... |
| 315 | 315 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
| 316 | 316 | /// @todo: find a better way of throwing an error than this! |
| 317 | - error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
| 317 | + error_log('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
| 318 | 318 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 319 | 319 | } else { |
| 320 | 320 | // it's ok, add it on |
| 321 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 321 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 322 | 322 | } |
| 323 | 323 | } else { |
| 324 | 324 | // we have an I4/I8/INT |
| 325 | 325 | // we must check that only 0123456789-<space> are characters here |
| 326 | 326 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
| 327 | 327 | /// @todo find a better way of throwing an error than this! |
| 328 | - error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
| 328 | + error_log('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
| 329 | 329 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 330 | 330 | } else { |
| 331 | 331 | // it's ok, add it on |
| 332 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 332 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 333 | 333 | } |
| 334 | 334 | } |
| 335 | 335 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 336 | 336 | break; |
| 337 | 337 | case 'NAME': |
| 338 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 338 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 339 | 339 | break; |
| 340 | 340 | case 'MEMBER': |
| 341 | 341 | // add to array in the stack the last element built, |
| 342 | 342 | // unless no VALUE was found |
| 343 | 343 | if ($this->_xh['vt']) { |
| 344 | 344 | $vscount = count($this->_xh['valuestack']); |
| 345 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 345 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 346 | 346 | } else { |
| 347 | - error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
| 347 | + error_log('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
| 348 | 348 | } |
| 349 | 349 | break; |
| 350 | 350 | case 'DATA': |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | $this->_xh['params'][] = $this->_xh['value']; |
| 368 | 368 | $this->_xh['pt'][] = $this->_xh['vt']; |
| 369 | 369 | } else { |
| 370 | - error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
| 370 | + error_log('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
| 371 | 371 | } |
| 372 | 372 | break; |
| 373 | 373 | case 'METHODNAME': |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | public function xmlrpc_cd($parser, $data) |
| 410 | 410 | { |
| 411 | 411 | // skip processing if xml fault already detected |
| 412 | - if ($this->_xh['isf'] < 2) { |
|
| 412 | + if ($this->_xh['isf']<2) { |
|
| 413 | 413 | // "lookforvalue==3" means that we've found an entire value |
| 414 | 414 | // and should discard any further character data |
| 415 | 415 | if ($this->_xh['lv'] != 3) { |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | public function xmlrpc_dh($parser, $data) |
| 426 | 426 | { |
| 427 | 427 | // skip processing if xml fault already detected |
| 428 | - if ($this->_xh['isf'] < 2) { |
|
| 428 | + if ($this->_xh['isf']<2) { |
|
| 429 | 429 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
| 430 | 430 | $this->_xh['ac'] .= $data; |
| 431 | 431 | } |
@@ -496,8 +496,8 @@ discard block |
||
| 496 | 496 | // Details: |
| 497 | 497 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 498 | 498 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 499 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 500 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 499 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 500 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 501 | 501 | $xmlChunk, $matches)) { |
| 502 | 502 | return strtoupper(substr($matches[2], 1, -1)); |
| 503 | 503 | } |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 516 | 516 | // IANA also likes better US-ASCII, so go with it |
| 517 | 517 | if ($enc == 'ASCII') { |
| 518 | - $enc = 'US-' . $enc; |
|
| 518 | + $enc = 'US-'.$enc; |
|
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | return $enc; |
@@ -550,8 +550,8 @@ discard block |
||
| 550 | 550 | // Details: |
| 551 | 551 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 552 | 552 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 553 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 554 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 553 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 554 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 555 | 555 | $xmlChunk, $matches)) { |
| 556 | 556 | return true; |
| 557 | 557 | } |