gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
| 2 | +require_once __DIR__."/client/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
| 10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
| 13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
| 16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 17 | 17 | |
| 18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
| 19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 20 | 20 | |
| 21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
| 22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 23 | 23 | |
| 24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
| 25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
| 27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 28 | 28 | |
| 29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
| 30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 31 | -output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>"); |
|
| 30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 31 | +output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>"); |
|
| 32 | 32 | |
| 33 | 33 | $v = new PhpXmlRpc\Value( |
| 34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ), |
| 42 | 42 | "array" |
| 43 | 43 | ); |
| 44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 45 | 45 | |
| 46 | 46 | $v = new PhpXmlRpc\Value( |
| 47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | ), |
| 62 | 62 | "struct" |
| 63 | 63 | ); |
| 64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 65 | 65 | |
| 66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
| 67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 68 | 68 | |
| 69 | 69 | class MyClass |
| 70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
| 76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
| 77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
| 78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
| 79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 80 | 80 | |
| 81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
| 82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
| 83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
| 85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
| 87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 88 | 88 | |
| 89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
| 90 | 90 | // The greek word 'kosme' |
| 91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
| 92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
| 92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
| 94 | 94 | if (function_exists('mb_convert_encoding')) { |
| 95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
| 95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
| 99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 100 | 100 | $req->method('examples.getStateName'); |
| 101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
| 102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
| 102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
| 103 | 103 | |
| 104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
| 105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
| 106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
| 106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
| 107 | 107 | |
| 108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
| 109 | 109 | $t = time(); |
| 110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 111 | 111 | output("Now is $t --> $date\n"); |
| 112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
| 112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
| 113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 114 | 114 | output("That is to say $date --> $tb\n"); |
| 115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
| 116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
| 115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
| 116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
| 117 | 117 | output("</pre>\n"); |
| 118 | 118 | |
| 119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
| 120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
| 121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
| 122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 123 | 123 | |
| 124 | 124 | output('</body></html>'); |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | - return exampleMethods::$stateNames[$stateNo - 1]; |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo-1])) { |
|
| 30 | + return exampleMethods::$stateNames[$stateNo-1]; |
|
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
| 33 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 33 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($req->getNumParams()) { |
| 70 | 70 | $p1 = $req->getParam(0); |
| 71 | 71 | if ($p1->kindOf() === 'scalar') { |
| 72 | - $errNum = (int)$p1->scalarval(); |
|
| 72 | + $errNum = (int) $p1->scalarval(); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | throw new Exception("it's just a test", $errNum); |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $findstate10_sig = array( |
| 143 | 143 | /// @todo add a demo and test with closure usage |
| 144 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
| 144 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
| 145 | 145 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 146 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 146 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 147 | 147 | 'index of that state name in an alphabetic order.', |
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 150 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 151 | 151 | |
| 152 | 152 | /// @todo do we really need a new instance ? |
| 153 | 153 | $c = new handlersContainer(); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
| 158 | 158 | |
| 159 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 159 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 160 | 160 | |
| 161 | 161 | return array_merge( |
| 162 | 162 | array( |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -require_once __DIR__ . "/_prepend.php"; |
|
| 27 | +require_once __DIR__."/_prepend.php"; |
|
| 28 | 28 | |
| 29 | 29 | use PhpXmlRpc\PhpXmlRpc; |
| 30 | 30 | use PhpXmlRpc\Server; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
| 84 | 84 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
| 85 | 85 | header('HTTP/1.1 401 Unauthorized'); |
| 86 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
| 86 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
| 87 | 87 | die('Text visible if user hits Cancel button'); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | if (isset($_GET['FORCE_REDIRECT'])) { |
| 92 | 92 | header('HTTP/1.0 302 Found'); |
| 93 | 93 | unset($_GET['FORCE_REDIRECT']); |
| 94 | - header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : '')); |
|
| 94 | + header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : '')); |
|
| 95 | 95 | die(); |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
| 13 | 13 | |
| 14 | 14 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -22,5 +22,5 @@ discard block |
||
| 22 | 22 | function output($text) |
| 23 | 23 | { |
| 24 | 24 | /// @todo we should only strip html tags, and let through all xml tags |
| 25 | - echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>','<br>'), "\n", $text)) : $text; |
|
| 25 | + echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>', '<br>'), "\n", $text)) : $text; |
|
| 26 | 26 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Demoing how to inject a custom logger for use by the library |
@@ -22,13 +22,13 @@ discard block |
||
| 22 | 22 | // logger API |
| 23 | 23 | public function debug($message, $context = array()) |
| 24 | 24 | { |
| 25 | - $this->debugBuffer .= $message . "\n"; |
|
| 25 | + $this->debugBuffer .= $message."\n"; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | // logger API |
| 29 | 29 | public function error($message, $context = array()) |
| 30 | 30 | { |
| 31 | - $this->errorBuffer .= $message . "\n"; |
|
| 31 | + $this->errorBuffer .= $message."\n"; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function getDebug() |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | $input = array( |
| 61 | 61 | array('name' => 'Dave', 'age' => 24), |
| 62 | - array('name' => 'Edd', 'age' => 45), |
|
| 63 | - array('name' => 'Joe', 'age' => 37), |
|
| 62 | + array('name' => 'Edd', 'age' => 45), |
|
| 63 | + array('name' => 'Joe', 'age' => 37), |
|
| 64 | 64 | array('name' => 'Fred', 'age' => 27), |
| 65 | 65 | ); |
| 66 | 66 | |
@@ -79,5 +79,5 @@ discard block |
||
| 79 | 79 | $response = $client->send($request); |
| 80 | 80 | output("Response received.<br>"); |
| 81 | 81 | |
| 82 | -output("The client error info is:<pre>\n" . $logger->getError() . "\n</pre>"); |
|
| 83 | -output("The client debug info is:<pre>\n" . $logger->getDebug() . "\n</pre>"); |
|
| 82 | +output("The client error info is:<pre>\n".$logger->getError()."\n</pre>"); |
|
| 83 | +output("The client debug info is:<pre>\n".$logger->getDebug()."\n</pre>"); |
|
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | 'scalar' => $val, |
| 58 | 58 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 59 | 59 | ); |
| 60 | - return (object)$xmlrpcVal; |
|
| 60 | + return (object) $xmlrpcVal; |
|
| 61 | 61 | case 'base64': |
| 62 | 62 | $xmlrpcVal = array( |
| 63 | 63 | 'xmlrpc_type' => 'base64', |
| 64 | 64 | 'scalar' => $val |
| 65 | 65 | ); |
| 66 | - return (object)$xmlrpcVal; |
|
| 66 | + return (object) $xmlrpcVal; |
|
| 67 | 67 | case 'string': |
| 68 | 68 | if (isset($options['extension_api_encoding'])) { |
| 69 | 69 | // if iconv is not available, we use mb_convert_encoding |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | case 'msg': |
| 137 | 137 | $paramCount = $xmlrpcVal->getNumParams(); |
| 138 | 138 | $arr = array(); |
| 139 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 139 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 140 | 140 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 141 | 141 | } |
| 142 | 142 | return $arr; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | break; |
| 262 | 262 | case 'resource': |
| 263 | 263 | if (in_array('extension_api', $options)) { |
| 264 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 264 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 265 | 265 | } else { |
| 266 | 266 | $xmlrpcVal = new Value(); |
| 267 | 267 | } |
@@ -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()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 313 | + $this->getLogger()->error('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()->error($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; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 3 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | use PhpXmlRpc\Helper\Charset; |
| 6 | 6 | use PhpXmlRpc\Helper\Http; |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | $l = $h->getLogger(); |
| 39 | 39 | Http::setLogger($this); |
| 40 | 40 | |
| 41 | - $s = "HTTP/1.0 200 OK\r\n" . |
|
| 42 | - "Content-Type: unknown\r\n" . |
|
| 43 | - "\r\n" . |
|
| 41 | + $s = "HTTP/1.0 200 OK\r\n". |
|
| 42 | + "Content-Type: unknown\r\n". |
|
| 43 | + "\r\n". |
|
| 44 | 44 | "body"; |
| 45 | 45 | ob_start(); |
| 46 | 46 | $h->parseResponseHeaders($s, false, 1); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 74 | 74 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 75 | 75 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 76 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 76 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -152,33 +152,33 @@ discard block |
||
| 152 | 152 | public function serialize($charsetEncoding = '') |
| 153 | 153 | { |
| 154 | 154 | if ($charsetEncoding != '') { |
| 155 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 155 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 156 | 156 | } else { |
| 157 | 157 | $this->content_type = 'text/xml'; |
| 158 | 158 | } |
| 159 | 159 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 160 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 160 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 161 | 161 | } else { |
| 162 | 162 | $result = "<methodResponse>\n"; |
| 163 | 163 | } |
| 164 | 164 | if ($this->errno) { |
| 165 | 165 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 166 | - $result .= "<fault>\n" . |
|
| 167 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 168 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 169 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 166 | + $result .= "<fault>\n". |
|
| 167 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 168 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 169 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 170 | 170 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 171 | 171 | } else { |
| 172 | 172 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 173 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 173 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 174 | 174 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 175 | - $result .= "<params>\n<param>\n" . |
|
| 176 | - $this->val . |
|
| 175 | + $result .= "<params>\n<param>\n". |
|
| 176 | + $this->val. |
|
| 177 | 177 | "</param>\n</params>"; |
| 178 | 178 | } else if ($this->valtyp == 'phpvals') { |
| 179 | 179 | $encoder = new Encoder(); |
| 180 | 180 | $val = $encoder->encode($this->val); |
| 181 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 181 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 182 | 182 | } else { |
| 183 | 183 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 184 | 184 | } |
@@ -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 | |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | break; |
| 260 | 260 | default: |
| 261 | 261 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 262 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 262 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | } |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | if (count($this->xml_iso88591_Entities['in'])) { |
| 77 | 77 | return; |
| 78 | 78 | } |
| 79 | - for ($i = 0; $i < 32; $i++) { |
|
| 79 | + for ($i = 0; $i<32; $i++) { |
|
| 80 | 80 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 81 | 81 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 85 | 85 | |
| 86 | - for ($i = 160; $i < 256; $i++) { |
|
| 86 | + for ($i = 160; $i<256; $i++) { |
|
| 87 | 87 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 88 | 88 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 89 | 89 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | break;*/ |
| 112 | 112 | |
| 113 | 113 | default: |
| 114 | - throw new ValueErrorException('Unsupported table: ' . $tableName); |
|
| 114 | + throw new ValueErrorException('Unsupported table: '.$tableName); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $srcEncoding = 'UTF-8'; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
| 166 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
| 167 | 167 | |
| 168 | 168 | // list ordered with (expected) most common scenarios first |
| 169 | 169 | switch ($conversion) { |
@@ -181,20 +181,20 @@ discard block |
||
| 181 | 181 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
| 182 | 182 | $escapedData = ''; |
| 183 | 183 | // be kind to users creating string xml-rpc values out of different php types |
| 184 | - $data = (string)$data; |
|
| 184 | + $data = (string) $data; |
|
| 185 | 185 | $ns = strlen($data); |
| 186 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
| 186 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
| 187 | 187 | $ch = $data[$nn]; |
| 188 | 188 | $ii = ord($ch); |
| 189 | 189 | // 7 bits in 1 byte: 0bbbbbbb (127) |
| 190 | - if ($ii < 32) { |
|
| 190 | + if ($ii<32) { |
|
| 191 | 191 | if ($conversion == 'UTF-8_US-ASCII') { |
| 192 | 192 | $escapedData .= sprintf('&#%d;', $ii); |
| 193 | 193 | } else { |
| 194 | 194 | $escapedData .= $ch; |
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | - else if ($ii < 128) { |
|
| 197 | + else if ($ii<128) { |
|
| 198 | 198 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 199 | 199 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 200 | 200 | switch ($ii) { |
@@ -219,25 +219,25 @@ discard block |
||
| 219 | 219 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
| 220 | 220 | elseif ($ii >> 5 == 6) { |
| 221 | 221 | $b1 = ($ii & 31); |
| 222 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 223 | - $ii = ($b1 * 64) + $b2; |
|
| 222 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 223 | + $ii = ($b1 * 64)+$b2; |
|
| 224 | 224 | $escapedData .= sprintf('&#%d;', $ii); |
| 225 | 225 | $nn += 1; |
| 226 | 226 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
| 227 | 227 | elseif ($ii >> 4 == 14) { |
| 228 | 228 | $b1 = ($ii & 15); |
| 229 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 230 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 231 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
| 229 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 230 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 231 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
| 232 | 232 | $escapedData .= sprintf('&#%d;', $ii); |
| 233 | 233 | $nn += 2; |
| 234 | 234 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
| 235 | 235 | elseif ($ii >> 3 == 30) { |
| 236 | 236 | $b1 = ($ii & 7); |
| 237 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 238 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 239 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
| 240 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
| 237 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 238 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 239 | + $b4 = (ord($data[$nn+3]) & 63); |
|
| 240 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
| 241 | 241 | $escapedData .= sprintf('&#%d;', $ii); |
| 242 | 242 | $nn += 3; |
| 243 | 243 | } |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | // If src is UTF8, we run htmlspecialchars before converting to the target charset, as |
| 291 | 291 | // htmlspecialchars has limited charset support, but it groks utf8 |
| 292 | 292 | if ($srcEncoding === 'UTF-8') { |
| 293 | - $data = htmlspecialchars($data, defined('ENT_XML1') ? ENT_XML1 | ENT_QUOTES : ENT_QUOTES, 'UTF-8'); |
|
| 293 | + $data = htmlspecialchars($data, defined('ENT_XML1') ? ENT_XML1 | ENT_QUOTES : ENT_QUOTES, 'UTF-8'); |
|
| 294 | 294 | } |
| 295 | 295 | if ($srcEncoding !== $destEncoding) { |
| 296 | 296 | try { |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | } |
| 303 | 303 | if ($data === false) { |
| 304 | 304 | $escapedData = ''; |
| 305 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding via mbstring: failed..."); |
|
| 305 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding via mbstring: failed..."); |
|
| 306 | 306 | } else { |
| 307 | 307 | if ($srcEncoding === 'UTF-8') { |
| 308 | 308 | $escapedData = $data; |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | } |
| 313 | 313 | } else { |
| 314 | 314 | $escapedData = ''; |
| 315 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 315 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 316 | 316 | } |
| 317 | 317 | } |
| 318 | 318 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | if (function_exists('mb_list_encodings')) { |
| 331 | 331 | $knownCharsets = array_unique(array_merge($knownCharsets, array_diff(mb_list_encodings(), array( |
| 332 | 332 | 'pass', 'auto', 'wchar', 'BASE64', 'UUENCODE', 'ASCII', 'HTML-ENTITIES', 'Quoted-Printable', |
| 333 | - '7bit','8bit', 'byte2be', 'byte2le', 'byte4be', 'byte4le' |
|
| 333 | + '7bit', '8bit', 'byte2be', 'byte2le', 'byte4be', 'byte4le' |
|
| 334 | 334 | )))); |
| 335 | 335 | } |
| 336 | 336 | return $knownCharsets; |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | case 'iso88591': |
| 385 | 385 | return $this->xml_iso88591_Entities; |
| 386 | 386 | default: |
| 387 | - throw new ValueErrorException('Unsupported charset: ' . $charset); |
|
| 387 | + throw new ValueErrorException('Unsupported charset: '.$charset); |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | } |
