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>'); |
@@ -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 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc - Getstatename demo</title></head> |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | $stateNo = ""; |
| 18 | 18 | |
| 19 | 19 | if (isset($_POST['stateno']) && $_POST['stateno'] != "") { |
| 20 | - $stateNo = (integer)$_POST['stateno']; |
|
| 20 | + $stateNo = (integer) $_POST['stateno']; |
|
| 21 | 21 | $method = 'examples.getStateName'; |
| 22 | 22 | $arguments = array( |
| 23 | 23 | new Value($stateNo, Value::$xmlrpcInt), |
| 24 | 24 | ); |
| 25 | 25 | $req = new Request($method, $arguments); |
| 26 | - output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . |
|
| 26 | + output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()). |
|
| 27 | 27 | "\n\n</pre>Debug info of server data follows...\n\n"); |
| 28 | 28 | $client = new Client(XMLRPCSERVER); |
| 29 | 29 | $client->setOption(Client::OPT_DEBUG, 1); |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | $val = $resp->value(); |
| 33 | 33 | // NB: we are _assuming_ that the server did return a scalar xml-rpc value here. |
| 34 | 34 | // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'` |
| 35 | - output('<br/>State number <b>' . $stateNo . '</b> is <b>' |
|
| 36 | - . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>'); |
|
| 35 | + output('<br/>State number <b>'.$stateNo.'</b> is <b>' |
|
| 36 | + . htmlspecialchars($val->scalarVal()).'</b><br/><br/>'); |
|
| 37 | 37 | } else { |
| 38 | 38 | output('An error occurred: '); |
| 39 | - output('<pre>Code: ' . htmlspecialchars($resp->faultCode()) |
|
| 40 | - . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>"); |
|
| 39 | + output('<pre>Code: '.htmlspecialchars($resp->faultCode()) |
|
| 40 | + . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>"); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @license code licensed under the BSD License: see file license.txt |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | -require_once __DIR__ . "/_prepend.php"; |
|
| 19 | +require_once __DIR__."/_prepend.php"; |
|
| 20 | 20 | |
| 21 | 21 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
| 22 | 22 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // fe. any url using the 'file://' protocol might be considered a hacking attempt |
| 48 | 48 | $client = new Client($url); |
| 49 | 49 | |
| 50 | - if ($req->getNumParams() > 3) { |
|
| 50 | + if ($req->getNumParams()>3) { |
|
| 51 | 51 | // We have to set some options onto the client. |
| 52 | 52 | // Note that if we do not untaint the received values, warnings might be generated... |
| 53 | 53 | $options = $encoder->decode($req->getParam(3)); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $client->setOption(Client::OPT_VERIFY_PEER, $val); |
| 88 | 88 | break; |
| 89 | 89 | case 'Timeout': |
| 90 | - $timeout = (integer)$val; |
|
| 90 | + $timeout = (integer) $val; |
|
| 91 | 91 | break; |
| 92 | 92 | } // switch |
| 93 | 93 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /// X-forwarded-for anyway, unless they consider this server as trusted...) |
| 101 | 101 | $reqMethod = $req->getParam(1)->scalarVal(); |
| 102 | 102 | $req = new Request($reqMethod); |
| 103 | - if ($req->getNumParams() > 1) { |
|
| 103 | + if ($req->getNumParams()>1) { |
|
| 104 | 104 | $pars = $req->getParam(2); |
| 105 | 105 | foreach ($pars as $par) { |
| 106 | 106 | $req->addParam($par); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | // add debug info into response we give back to caller |
| 111 | - Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
| 111 | + Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
| 112 | 112 | |
| 113 | 113 | return $client->send($req, $timeout); |
| 114 | 114 | } |
@@ -54,11 +54,11 @@ discard block |
||
| 54 | 54 | $snv = $sno->scalarVal(); |
| 55 | 55 | |
| 56 | 56 | // look it up in our array (zero-based) |
| 57 | - if (isset(self::$stateNames[$snv - 1])) { |
|
| 58 | - $stateName = self::$stateNames[$snv - 1]; |
|
| 57 | + if (isset(self::$stateNames[$snv-1])) { |
|
| 58 | + $stateName = self::$stateNames[$snv-1]; |
|
| 59 | 59 | } else { |
| 60 | 60 | // not there, so complain |
| 61 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
| 61 | + $err = "I don't have a state for the index '".$snv."'"; |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if ($err != '') { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $s = $req->getParam(0); |
| 133 | 133 | $t = $req->getParam(1); |
| 134 | 134 | |
| 135 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcInt)); |
|
| 135 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcInt)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | public static $addtwodouble_sig = array(array('double', 'double', 'double')); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $s = $req->getParam(0); |
| 143 | 143 | $t = $req->getParam(1); |
| 144 | 144 | |
| 145 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcDouble)); |
|
| 145 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcDouble)); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | public static $stringecho_sig = array(array('string', 'string')); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | /// In fact, we miss some API (or extra data) in the Request... |
| 166 | 166 | //$payload = file_get_contents('php://input'); |
| 167 | 167 | $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding); |
| 168 | - $s = "I got the following message:\n" . $payload; |
|
| 168 | + $s = "I got the following message:\n".$payload; |
|
| 169 | 169 | |
| 170 | 170 | return new Response(new Value($s)); |
| 171 | 171 | } |
@@ -238,17 +238,17 @@ discard block |
||
| 238 | 238 | |
| 239 | 239 | /// @todo in real life, we should check for presence of return characters to avoid header injection! |
| 240 | 240 | |
| 241 | - $msgHdr = "From: " . $mFrom->scalarVal() . "\n"; |
|
| 242 | - $msgHdr .= "To: " . $mTo->scalarVal() . "\n"; |
|
| 241 | + $msgHdr = "From: ".$mFrom->scalarVal()."\n"; |
|
| 242 | + $msgHdr .= "To: ".$mTo->scalarVal()."\n"; |
|
| 243 | 243 | |
| 244 | 244 | if ($mCc->scalarVal() != "") { |
| 245 | - $msgHdr .= "Cc: " . $mCc->scalarVal() . "\n"; |
|
| 245 | + $msgHdr .= "Cc: ".$mCc->scalarVal()."\n"; |
|
| 246 | 246 | } |
| 247 | 247 | if ($mBcc->scalarVal() != "") { |
| 248 | - $msgHdr .= "Bcc: " . $mBcc->scalarVal() . "\n"; |
|
| 248 | + $msgHdr .= "Bcc: ".$mBcc->scalarVal()."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | if ($mMime->scalarVal() != "") { |
| 251 | - $msgHdr .= "Content-type: " . $mMime->scalarVal() . "\n"; |
|
| 251 | + $msgHdr .= "Content-type: ".$mMime->scalarVal()."\n"; |
|
| 252 | 252 | } |
| 253 | 253 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
| 254 | 254 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | array(Value::$xmlrpcInt, Value::$xmlrpcArray) |
| 18 | 18 | ), |
| 19 | 19 | "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.', |
| 20 | - "function" => function ($req) |
|
| 20 | + "function" => function($req) |
|
| 21 | 21 | { |
| 22 | 22 | $sno = $req->getParam(0); |
| 23 | 23 | $numCurly = 0; |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
| 39 | 39 | ), |
| 40 | 40 | "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
| 41 | - "function" => function ($req) |
|
| 41 | + "function" => function($req) |
|
| 42 | 42 | { |
| 43 | 43 | $sno = $req->getParam(0); |
| 44 | 44 | $moe = $sno["moe"]; |
| 45 | 45 | $larry = $sno["larry"]; |
| 46 | 46 | $curly = $sno["curly"]; |
| 47 | - $num = $moe->scalarVal() + $larry->scalarVal() + $curly->scalarVal(); |
|
| 47 | + $num = $moe->scalarVal()+$larry->scalarVal()+$curly->scalarVal(); |
|
| 48 | 48 | |
| 49 | 49 | return new Response(new Value($num, Value::$xmlrpcInt)); |
| 50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | array(Value::$xmlrpcStruct, Value::$xmlrpcStruct) |
| 56 | 56 | ), |
| 57 | 57 | "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.', |
| 58 | - "function" => function ($req) |
|
| 58 | + "function" => function($req) |
|
| 59 | 59 | { |
| 60 | 60 | $sno = $req->getParam(0); |
| 61 | 61 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | ) |
| 72 | 72 | ), |
| 73 | 73 | "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.', |
| 74 | - "function" => function ($req) |
|
| 74 | + "function" => function($req) |
|
| 75 | 75 | { |
| 76 | 76 | return new Response(new Value( |
| 77 | 77 | array( |
@@ -92,14 +92,14 @@ discard block |
||
| 92 | 92 | array(Value::$xmlrpcString, Value::$xmlrpcArray) |
| 93 | 93 | ), |
| 94 | 94 | "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.', |
| 95 | - "function" => function ($req) |
|
| 95 | + "function" => function($req) |
|
| 96 | 96 | { |
| 97 | 97 | $ar = $req->getParam(0); |
| 98 | 98 | $sz = $ar->count(); |
| 99 | 99 | $first = $ar[0]; |
| 100 | - $last = $ar[$sz - 1]; |
|
| 100 | + $last = $ar[$sz-1]; |
|
| 101 | 101 | |
| 102 | - return new Response(new Value($first->scalarVal() . $last->scalarVal(), Value::$xmlrpcString)); |
|
| 102 | + return new Response(new Value($first->scalarVal().$last->scalarVal(), Value::$xmlrpcString)); |
|
| 103 | 103 | } |
| 104 | 104 | ), |
| 105 | 105 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | array(Value::$xmlrpcStruct, Value::$xmlrpcInt) |
| 109 | 109 | ), |
| 110 | 110 | "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.', |
| 111 | - "function" => function ($req) |
|
| 111 | + "function" => function($req) |
|
| 112 | 112 | { |
| 113 | 113 | $sno = $req->getParam(0); |
| 114 | 114 | $v = $sno->scalarVal(); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
| 130 | 130 | ), |
| 131 | 131 | "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
| 132 | - "function" => function ($req) |
|
| 132 | + "function" => function($req) |
|
| 133 | 133 | { |
| 134 | 134 | $sno = $req->getParam(0); |
| 135 | 135 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $larry = $fools["larry"]; |
| 141 | 141 | $moe = $fools["moe"]; |
| 142 | 142 | |
| 143 | - return new Response(new Value($curly->scalarVal() + $larry->scalarVal() + $moe->scalarVal(), Value::$xmlrpcInt)); |
|
| 143 | + return new Response(new Value($curly->scalarVal()+$larry->scalarVal()+$moe->scalarVal(), Value::$xmlrpcInt)); |
|
| 144 | 144 | } |
| 145 | 145 | ), |
| 146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | array(Value::$xmlrpcStruct, Value::$xmlrpcString) |
| 150 | 150 | ), |
| 151 | 151 | "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely <, >, & \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.', |
| 152 | - "function" => function ($req) |
|
| 152 | + "function" => function($req) |
|
| 153 | 153 | { |
| 154 | 154 | $sno = $req->getParam(0); |
| 155 | 155 | $str = $sno->scalarVal(); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $ap = 0; |
| 159 | 159 | $qu = 0; |
| 160 | 160 | $amp = 0; |
| 161 | - for ($i = 0; $i < strlen($str); $i++) { |
|
| 161 | + for ($i = 0; $i<strlen($str); $i++) { |
|
| 162 | 162 | $c = substr($str, $i, 1); |
| 163 | 163 | switch ($c) { |
| 164 | 164 | case ">": |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | use PhpXmlRpc\Encoder; |
| 20 | 20 | |
| 21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
| 22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 23 | 23 | |
| 24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 24 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 25 | 25 | $args = argParser::getArgs(); |
| 26 | 26 | |
| 27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
| 42 | 42 | trigger_error('ending test that was not started'); |
| 43 | 43 | } |
| 44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 46 | 46 | echo '.'; |
| 47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($is_web) { |
| 78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 79 | 79 | if ($xd) { |
| 80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 81 | 81 | } |
| 82 | 82 | flush(); |
| 83 | 83 | ob_flush(); |
| 84 | 84 | } else { |
| 85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 86 | 86 | if ($xd) { |
| 87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 94 | 94 | $vals = array(); |
| 95 | - for ($j = 0; $j < 10; $j++) { |
|
| 95 | + for ($j = 0; $j<10; $j++) { |
|
| 96 | 96 | $valArray = array(); |
| 97 | 97 | foreach ($data[$j] as $key => $val) { |
| 98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 119 | 119 | $encoder = new Encoder(); |
| 120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
| 122 | 122 | $out = $value->serialize(); |
| 123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | if (function_exists('xmlrpc_set_type')) { |
| 127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 129 | - for ($j = 0; $j < 10; $j++) { |
|
| 128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 129 | + for ($j = 0; $j<10; $j++) { |
|
| 130 | 130 | foreach ($keys as $k) { |
| 131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
| 140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 141 | 141 | $dummy = new Request(''); |
| 142 | 142 | $out = new Response($value); |
| 143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 144 | 144 | |
| 145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 147 | 147 | $response = $dummy->ParseResponse($in, true); |
| 148 | 148 | $value = $response->value(); |
| 149 | 149 | $result = array(); |
| 150 | - foreach($value as $val1) { |
|
| 150 | + foreach ($value as $val1) { |
|
| 151 | 151 | $out = array(); |
| 152 | - foreach($val1 as $name => $val) { |
|
| 152 | + foreach ($val1 as $name => $val) { |
|
| 153 | 153 | $out[$name] = array(); |
| 154 | - foreach($val as $data) { |
|
| 154 | + foreach ($val as $data) { |
|
| 155 | 155 | $out[$name][] = $data->scalarVal(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
| 161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 162 | 162 | |
| 163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 165 | 165 | $response = $dummy->ParseResponse($in, true); |
| 166 | 166 | $value = $response->value(); |
| 167 | 167 | $result = array(); |
| 168 | 168 | $l = $value->arraySize(); |
| 169 | - for ($k = 0; $k < $l; $k++) { |
|
| 169 | + for ($k = 0; $k<$l; $k++) { |
|
| 170 | 170 | $val1 = $value->arrayMem($k); |
| 171 | 171 | $out = array(); |
| 172 | - foreach($val1 as $name => $val) { |
|
| 172 | + foreach ($val1 as $name => $val) { |
|
| 173 | 173 | $out[$name] = array(); |
| 174 | 174 | $m = $val->arraySize(); |
| 175 | - for ($j = 0; $j < $m; $j++) { |
|
| 175 | + for ($j = 0; $j<$m; $j++) { |
|
| 176 | 176 | $data = $val->arrayMem($j); |
| 177 | 177 | $out[$name][] = $data->scalarVal(); |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 184 | 184 | |
| 185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 187 | 187 | $response = $dummy->parseResponse($in, true, 'phpvals'); |
| 188 | 188 | $value = $response->value(); |
| 189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | if (function_exists('xmlrpc_decode')) { |
| 193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 195 | 195 | $response = $dummy->parseResponse($in, true, 'xml'); |
| 196 | 196 | $value = xmlrpc_decode($response->value()); |
| 197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
| 216 | - if (count($server) > 1) { |
|
| 217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
| 216 | + if (count($server)>1) { |
|
| 217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
| 218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 219 | 219 | } else { |
| 220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
| 221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | begin_test($testName, 'http 10'); |
| 231 | 231 | $response = array(); |
| 232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 233 | 233 | $resp = $c->send($req); |
| 234 | 234 | $response[] = $resp->value(); |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
| 249 | 249 | $response = array(); |
| 250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 251 | 251 | $resp = $c->send($req, 10, 'http11'); |
| 252 | 252 | $response[] = $resp->value(); |
| 253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | begin_test($testName, 'http 10 w. compression'); |
| 271 | 271 | $response = array(); |
| 272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 273 | 273 | $resp = $c->send($req); |
| 274 | 274 | $response[] = $resp->value(); |
| 275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
| 281 | 281 | $response = array(); |
| 282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 283 | 283 | $resp = $c->send($req, 10, 'http11'); |
| 284 | 284 | $response[] = $resp->value(); |
| 285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 290 | 290 | $response = array(); |
| 291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 292 | 292 | $resp = $c->send($req, 10, 'http11'); |
| 293 | 293 | $response[] = $resp->value(); |
| 294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
| 310 | 310 | |
| 311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
| 312 | - if (count($server) > 1) { |
|
| 313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 312 | + if (count($server)>1) { |
|
| 313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 315 | 315 | } else { |
| 316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
| 318 | 318 | } |
| 319 | 319 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 328 | 328 | begin_test($testName, 'https no keep-alive'); |
| 329 | 329 | $response = array(); |
| 330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 331 | 331 | $resp = $c->send($req); |
| 332 | 332 | $response[] = $resp->value(); |
| 333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 337 | 337 | begin_test($testName, 'https w. keep-alive'); |
| 338 | 338 | $response = array(); |
| 339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 340 | 340 | $resp = $c->send($req, 10); |
| 341 | 341 | $response[] = $resp->value(); |
| 342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
| 359 | 359 | $response = array(); |
| 360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 361 | 361 | $resp = $c->send($req); |
| 362 | 362 | $response[] = $resp->value(); |
| 363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
| 368 | 368 | $response = array(); |
| 369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 370 | 370 | $resp = $c->send($req, 10); |
| 371 | 371 | $response[] = $resp->value(); |
| 372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
| 388 | 388 | |
| 389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
| 390 | - if (count($server) > 1) { |
|
| 391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 390 | + if (count($server)>1) { |
|
| 391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 393 | 393 | } else { |
| 394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
| 396 | 396 | } |
| 397 | 397 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 406 | 406 | begin_test($testName, 'http2 no keep-alive'); |
| 407 | 407 | $response = array(); |
| 408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 409 | 409 | $resp = $c->send($req); |
| 410 | 410 | $response[] = $resp->value(); |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 415 | 415 | begin_test($testName, 'http2 w. keep-alive'); |
| 416 | 416 | $response = array(); |
| 417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 418 | 418 | $resp = $c->send($req, 10); |
| 419 | 419 | $response[] = $resp->value(); |
| 420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
| 437 | 437 | $response = array(); |
| 438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 439 | 439 | $resp = $c->send($req); |
| 440 | 440 | $response[] = $resp->value(); |
| 441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
| 446 | 446 | $response = array(); |
| 447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 448 | 448 | $resp = $c->send($req, 10); |
| 449 | 449 | $response[] = $resp->value(); |
| 450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($test_results as $test => $results) { |
| 467 | 467 | echo "\nTEST: $test\n"; |
| 468 | 468 | foreach ($results as $case => $data) { |
| 469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST) |
| 47 | 47 | // Note that the only use-case for web-page mode is when this is used by benchmark.php |
| 48 | 48 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
| 49 | - foreach($_SERVER as $key => $val) { |
|
| 49 | + foreach ($_SERVER as $key => $val) { |
|
| 50 | 50 | if (array_key_exists($key, $args)) { |
| 51 | 51 | $$key = $val; |
| 52 | 52 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | //} |
| 92 | 92 | } |
| 93 | 93 | if ($HTTPURI[0] != '/') { |
| 94 | - $HTTPURI = '/' . $HTTPURI; |
|
| 94 | + $HTTPURI = '/'.$HTTPURI; |
|
| 95 | 95 | } |
| 96 | 96 | $args['HTTPURI'] = $HTTPURI; |
| 97 | 97 | |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if (isset($HTTPSIGNOREPEER)) { |
| 108 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
| 108 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if (isset($HTTPSVERIFYHOST)) { |
| 112 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
| 112 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if (isset($SSLVERSION)) { |
| 116 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
| 116 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | if (isset($PROXYSERVER)) { |
| 120 | 120 | $arr = explode(':', $PROXYSERVER); |
| 121 | 121 | $args['PROXYSERVER'] = $arr[0]; |
| 122 | - if (count($arr) > 1) { |
|
| 122 | + if (count($arr)>1) { |
|
| 123 | 123 | $args['PROXYPORT'] = $arr[1]; |
| 124 | 124 | } else { |
| 125 | 125 | $args['PROXYPORT'] = 8080; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase |
| 6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 17 | 17 | { |
| 18 | - $url = $this->baseUrl . $path; |
|
| 18 | + $url = $this->baseUrl.$path; |
|
| 19 | 19 | |
| 20 | 20 | $ch = curl_init($url); |
| 21 | 21 | curl_setopt_array($ch, array( |
@@ -29,21 +29,21 @@ discard block |
||
| 29 | 29 | CURLOPT_POSTFIELDS => $payload |
| 30 | 30 | )); |
| 31 | 31 | } |
| 32 | - $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId; |
|
| 32 | + $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId; |
|
| 33 | 33 | if ($this->collectCodeCoverageInformation) |
| 34 | 34 | { |
| 35 | - $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId; |
|
| 35 | + $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId; |
|
| 36 | 36 | } |
| 37 | 37 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
| 38 | 38 | |
| 39 | - if ($this->args['DEBUG'] > 0) { |
|
| 39 | + if ($this->args['DEBUG']>0) { |
|
| 40 | 40 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 41 | 41 | } |
| 42 | 42 | $page = curl_exec($ch); |
| 43 | 43 | $info = curl_getinfo($ch); |
| 44 | 44 | curl_close($ch); |
| 45 | 45 | |
| 46 | - $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']); |
|
| 46 | + $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']); |
|
| 47 | 47 | if (!$emptyPageOk) { |
| 48 | 48 | $this->assertNotEquals('', $page, 'Retrieved web page should not be empty'); |
| 49 | 49 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | protected function newClient($path) |
| 64 | 64 | { |
| 65 | - $client = new \PhpXmlRpc\Client($this->baseUrl . $path); |
|
| 65 | + $client = new \PhpXmlRpc\Client($this->baseUrl.$path); |
|
| 66 | 66 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId); |
| 67 | 67 | if ($this->collectCodeCoverageInformation) { |
| 68 | 68 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
@@ -187,12 +187,12 @@ discard block |
||
| 187 | 187 | // q: can php be built without ctype? should we use a regexp? |
| 188 | 188 | if (is_string($key) && !ctype_digit($key)) { |
| 189 | 189 | /// @todo on invalid options, throw/error-out instead of logging an error message? |
| 190 | - switch($key) { |
|
| 190 | + switch ($key) { |
|
| 191 | 191 | case 'target_charset': |
| 192 | 192 | if (function_exists('mb_convert_encoding')) { |
| 193 | 193 | $this->current_parsing_options['target_charset'] = $val; |
| 194 | 194 | } else { |
| 195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
| 195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
| 196 | 196 | } |
| 197 | 197 | break; |
| 198 | 198 | |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | if (is_callable($val)) { |
| 201 | 201 | $this->current_parsing_options['methodname_callback'] = $val; |
| 202 | 202 | } else { |
| 203 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
| 203 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
| 204 | 204 | } |
| 205 | 205 | break; |
| 206 | 206 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | break; |
| 212 | 212 | |
| 213 | 213 | default: |
| 214 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
| 214 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
| 215 | 215 | } |
| 216 | 216 | unset($mergedOptions[$key]); |
| 217 | 217 | } |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | |
| 258 | 258 | try { |
| 259 | 259 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
| 260 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 260 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 261 | 261 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 262 | 262 | // error handling: xml not well formed |
| 263 | - if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 263 | + if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 264 | 264 | $errCode = xml_get_error_code($parser); |
| 265 | 265 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 266 | 266 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | $this->_xh['isf_reason'] = $errStr; |
| 269 | 269 | } |
| 270 | 270 | // no need to parse further if we already have a fatal error |
| 271 | - if ($this->_xh['isf'] >= 2) { |
|
| 271 | + if ($this->_xh['isf']>=2) { |
|
| 272 | 272 | break; |
| 273 | 273 | } |
| 274 | 274 | } |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 314 | 314 | { |
| 315 | 315 | // if invalid xml-rpc already detected, skip all processing |
| 316 | - if ($this->_xh['isf'] >= 2) { |
|
| 316 | + if ($this->_xh['isf']>=2) { |
|
| 317 | 317 | return; |
| 318 | 318 | } |
| 319 | 319 | |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | if ($acceptSingleVals === false) { |
| 328 | 328 | $accept = $this->current_parsing_options['accept']; |
| 329 | 329 | } else { |
| 330 | - $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated'); |
|
| 330 | + $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated'); |
|
| 331 | 331 | $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE; |
| 332 | 332 | } |
| 333 | 333 | if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) || |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $this->_xh['rt'] = strtolower($name); |
| 338 | 338 | } else { |
| 339 | 339 | $this->_xh['isf'] = 2; |
| 340 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 340 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 341 | 341 | |
| 342 | 342 | return; |
| 343 | 343 | } |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | |
| 443 | 443 | case 'MEMBER': |
| 444 | 444 | // set member name to null, in case we do not find in the xml later on |
| 445 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null; |
|
| 445 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null; |
|
| 446 | 446 | //$this->_xh['ac']=''; |
| 447 | 447 | // Drop trough intentionally |
| 448 | 448 | |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | */ |
| 506 | 506 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 507 | 507 | { |
| 508 | - if ($this->_xh['isf'] >= 2) { |
|
| 508 | + if ($this->_xh['isf']>=2) { |
|
| 509 | 509 | return; |
| 510 | 510 | } |
| 511 | 511 | |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - if ($rebuildXmlrpcvals > 0) { |
|
| 530 | + if ($rebuildXmlrpcvals>0) { |
|
| 531 | 531 | // build the xml-rpc val out of the data received, and substitute it |
| 532 | 532 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 533 | 533 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -535,15 +535,15 @@ discard block |
||
| 535 | 535 | $temp->_php_class = $this->_xh['php_class']; |
| 536 | 536 | } |
| 537 | 537 | $this->_xh['value'] = $temp; |
| 538 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 538 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 539 | 539 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 540 | - $this->_xh['value'] = (object)array( |
|
| 540 | + $this->_xh['value'] = (object) array( |
|
| 541 | 541 | 'xmlrpc_type' => 'datetime', |
| 542 | 542 | 'scalar' => $this->_xh['value'], |
| 543 | 543 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 544 | 544 | ); |
| 545 | 545 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 546 | - $this->_xh['value'] = (object)array( |
|
| 546 | + $this->_xh['value'] = (object) array( |
|
| 547 | 547 | 'xmlrpc_type' => 'base64', |
| 548 | 548 | 'scalar' => $this->_xh['value'] |
| 549 | 549 | ); |
@@ -558,8 +558,8 @@ discard block |
||
| 558 | 558 | // check if we are inside an array or struct: |
| 559 | 559 | // if value just built is inside an array, let's move it into array on the stack |
| 560 | 560 | $vscount = count($this->_xh['valuestack']); |
| 561 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 562 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 561 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 562 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 563 | 563 | } |
| 564 | 564 | break; |
| 565 | 565 | |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | // log if receiving something strange, even though we set the value to false anyway |
| 587 | 587 | /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL |
| 588 | 588 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) { |
| 589 | - if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' . |
|
| 589 | + if (!$this->handleParsingError('invalid data received in BOOLEAN value: '. |
|
| 590 | 590 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 591 | 591 | return; |
| 592 | 592 | } |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | $this->_xh['vt'] = strtolower($name); |
| 607 | 607 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 608 | 608 | if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) { |
| 609 | - if (!$this->handleParsingError('non numeric data received in INT value: ' . |
|
| 609 | + if (!$this->handleParsingError('non numeric data received in INT value: '. |
|
| 610 | 610 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 611 | 611 | return; |
| 612 | 612 | } |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 615 | 615 | } else { |
| 616 | 616 | // it's ok, add it on |
| 617 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 617 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 618 | 618 | } |
| 619 | 619 | break; |
| 620 | 620 | |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | $this->_xh['vt'] = Value::$xmlrpcDouble; |
| 623 | 623 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 624 | 624 | if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) { |
| 625 | - if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' . |
|
| 625 | + if (!$this->handleParsingError('non numeric data received in DOUBLE value: '. |
|
| 626 | 626 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 627 | 627 | return; |
| 628 | 628 | } |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 631 | 631 | } else { |
| 632 | 632 | // it's ok, add it on |
| 633 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 633 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 634 | 634 | } |
| 635 | 635 | break; |
| 636 | 636 | |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 639 | 639 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 640 | 640 | if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) { |
| 641 | - if (!$this->handleParsingError('invalid data received in DATETIME value: ' . |
|
| 641 | + if (!$this->handleParsingError('invalid data received in DATETIME value: '. |
|
| 642 | 642 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 643 | 643 | return; |
| 644 | 644 | } |
@@ -649,9 +649,9 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | // the default regex used to validate the date string a few lines above should make this case impossible, |
| 651 | 651 | // but one never knows... |
| 652 | - } catch(\Exception $e) { |
|
| 652 | + } catch (\Exception $e) { |
|
| 653 | 653 | // what to do? We can not guarantee that a valid date can be created. We return null... |
| 654 | - if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' . |
|
| 654 | + if (!$this->handleParsingError('invalid data received in DATETIME value. Error '. |
|
| 655 | 655 | $e->getMessage(), __METHOD__)) { |
| 656 | 656 | return; |
| 657 | 657 | } |
@@ -668,14 +668,14 @@ discard block |
||
| 668 | 668 | $v = base64_decode($this->_xh['ac'], true); |
| 669 | 669 | if ($v === false) { |
| 670 | 670 | $this->_xh['isf'] = 2; |
| 671 | - $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']); |
|
| 671 | + $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']); |
|
| 672 | 672 | return; |
| 673 | 673 | } |
| 674 | 674 | } else { |
| 675 | 675 | $v = base64_decode($this->_xh['ac']); |
| 676 | 676 | if ($v === '' && $this->_xh['ac'] !== '') { |
| 677 | 677 | // only the empty string should decode to the empty string |
| 678 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' . |
|
| 678 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '. |
|
| 679 | 679 | $this->truncateValueForLog($this->_xh['ac'])); |
| 680 | 680 | } |
| 681 | 681 | } |
@@ -683,20 +683,20 @@ discard block |
||
| 683 | 683 | break; |
| 684 | 684 | |
| 685 | 685 | case 'NAME': |
| 686 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 686 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 687 | 687 | break; |
| 688 | 688 | |
| 689 | 689 | case 'MEMBER': |
| 690 | 690 | // add to array in the stack the last element built, unless no VALUE or no NAME were found |
| 691 | 691 | if ($this->_xh['vt']) { |
| 692 | 692 | $vscount = count($this->_xh['valuestack']); |
| 693 | - if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) { |
|
| 693 | + if ($this->_xh['valuestack'][$vscount-1]['name'] === null) { |
|
| 694 | 694 | if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) { |
| 695 | 695 | return; |
| 696 | 696 | } |
| 697 | - $this->_xh['valuestack'][$vscount - 1]['name'] = ''; |
|
| 697 | + $this->_xh['valuestack'][$vscount-1]['name'] = ''; |
|
| 698 | 698 | } |
| 699 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 699 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 700 | 700 | } else { |
| 701 | 701 | if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) { |
| 702 | 702 | return; |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | public function xmlrpc_cd($parser, $data) |
| 831 | 831 | { |
| 832 | 832 | // skip processing if xml fault already detected |
| 833 | - if ($this->_xh['isf'] >= 2) { |
|
| 833 | + if ($this->_xh['isf']>=2) { |
|
| 834 | 834 | return; |
| 835 | 835 | } |
| 836 | 836 | |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | public function xmlrpc_dh($parser, $data) |
| 853 | 853 | { |
| 854 | 854 | // skip processing if xml fault already detected |
| 855 | - if ($this->_xh['isf'] >= 2) { |
|
| 855 | + if ($this->_xh['isf']>=2) { |
|
| 856 | 856 | return; |
| 857 | 857 | } |
| 858 | 858 | |
@@ -932,8 +932,8 @@ discard block |
||
| 932 | 932 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 933 | 933 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 934 | 934 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 935 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 936 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 935 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 936 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 937 | 937 | $xmlChunk, $matches)) { |
| 938 | 938 | return strtoupper(substr($matches[2], 1, -1)); |
| 939 | 939 | } |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 952 | 952 | // IANA also likes better US-ASCII, so go with it |
| 953 | 953 | if ($enc == 'ASCII') { |
| 954 | - $enc = 'US-' . $enc; |
|
| 954 | + $enc = 'US-'.$enc; |
|
| 955 | 955 | } |
| 956 | 956 | |
| 957 | 957 | return $enc; |
@@ -992,8 +992,8 @@ discard block |
||
| 992 | 992 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 993 | 993 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 994 | 994 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 995 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 996 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 995 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 996 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 997 | 997 | $xmlChunk)) { |
| 998 | 998 | return true; |
| 999 | 999 | } |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | $this->_xh['isf_reason'] = ucfirst($message); |
| 1014 | 1014 | return false; |
| 1015 | 1015 | } else { |
| 1016 | - $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message); |
|
| 1016 | + $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message); |
|
| 1017 | 1017 | return true; |
| 1018 | 1018 | } |
| 1019 | 1019 | } |
@@ -1025,8 +1025,8 @@ discard block |
||
| 1025 | 1025 | */ |
| 1026 | 1026 | protected function truncateValueForLog($data) |
| 1027 | 1027 | { |
| 1028 | - if (strlen($data) > $this->maxLogValueLength) { |
|
| 1029 | - return substr($data, 0, $this->maxLogValueLength - 3) . '...'; |
|
| 1028 | + if (strlen($data)>$this->maxLogValueLength) { |
|
| 1029 | + return substr($data, 0, $this->maxLogValueLength-3).'...'; |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | return $data; |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | public function xmlrpc_se_any($parser, $name, $attrs) |
| 1048 | 1048 | { |
| 1049 | 1049 | // this will be spamming the log if this method is in use... |
| 1050 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1050 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1051 | 1051 | |
| 1052 | 1052 | $this->xmlrpc_se($parser, $name, $attrs, true); |
| 1053 | 1053 | } |
@@ -1057,12 +1057,12 @@ discard block |
||
| 1057 | 1057 | switch ($name) { |
| 1058 | 1058 | case '_xh': |
| 1059 | 1059 | case 'xmlrpc_valid_parents': |
| 1060 | - $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated'); |
|
| 1060 | + $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated'); |
|
| 1061 | 1061 | return $this->$name; |
| 1062 | 1062 | default: |
| 1063 | 1063 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1064 | 1064 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1065 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1065 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1066 | 1066 | $result = null; |
| 1067 | 1067 | return $result; |
| 1068 | 1068 | } |
@@ -1073,18 +1073,18 @@ discard block |
||
| 1073 | 1073 | switch ($name) { |
| 1074 | 1074 | // this should only ever be called by subclasses which overtook `parse()` |
| 1075 | 1075 | case 'accept': |
| 1076 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1076 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1077 | 1077 | $this->current_parsing_options['accept'] = $value; |
| 1078 | 1078 | break; |
| 1079 | 1079 | case '_xh': |
| 1080 | 1080 | case 'xmlrpc_valid_parents': |
| 1081 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1081 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1082 | 1082 | $this->$name = $value; |
| 1083 | 1083 | break; |
| 1084 | 1084 | default: |
| 1085 | 1085 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1086 | 1086 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1087 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1087 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1088 | 1088 | } |
| 1089 | 1089 | } |
| 1090 | 1090 | |
@@ -1092,11 +1092,11 @@ discard block |
||
| 1092 | 1092 | { |
| 1093 | 1093 | switch ($name) { |
| 1094 | 1094 | case 'accept': |
| 1095 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1095 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1096 | 1096 | return isset($this->current_parsing_options['accept']); |
| 1097 | 1097 | case '_xh': |
| 1098 | 1098 | case 'xmlrpc_valid_parents': |
| 1099 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1099 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1100 | 1100 | return isset($this->$name); |
| 1101 | 1101 | default: |
| 1102 | 1102 | return false; |
@@ -1108,18 +1108,18 @@ discard block |
||
| 1108 | 1108 | switch ($name) { |
| 1109 | 1109 | // q: does this make sense at all? |
| 1110 | 1110 | case 'accept': |
| 1111 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1111 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1112 | 1112 | unset($this->current_parsing_options['accept']); |
| 1113 | 1113 | break; |
| 1114 | 1114 | case '_xh': |
| 1115 | 1115 | case 'xmlrpc_valid_parents': |
| 1116 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1116 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1117 | 1117 | unset($this->$name); |
| 1118 | 1118 | break; |
| 1119 | 1119 | default: |
| 1120 | 1120 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1121 | 1121 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1122 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1122 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1123 | 1123 | } |
| 1124 | 1124 | } |
| 1125 | 1125 | } |
