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 ">": |
@@ -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( |
@@ -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 | |
@@ -326,10 +326,10 @@ discard block |
||
| 326 | 326 | $server = $parts['host']; |
| 327 | 327 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 328 | 328 | if (isset($parts['query'])) { |
| 329 | - $path .= '?' . $parts['query']; |
|
| 329 | + $path .= '?'.$parts['query']; |
|
| 330 | 330 | } |
| 331 | 331 | if (isset($parts['fragment'])) { |
| 332 | - $path .= '#' . $parts['fragment']; |
|
| 332 | + $path .= '#'.$parts['fragment']; |
|
| 333 | 333 | } |
| 334 | 334 | if (isset($parts['port'])) { |
| 335 | 335 | $port = $parts['port']; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | } |
| 347 | 347 | if ($path == '' || $path[0] != '/') { |
| 348 | - $this->path = '/' . $path; |
|
| 348 | + $this->path = '/'.$path; |
|
| 349 | 349 | } else { |
| 350 | 350 | $this->path = $path; |
| 351 | 351 | } |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | //$this->accepted_charset_encodings = $ch->knownCharsets(); |
| 378 | 378 | |
| 379 | 379 | // initialize user_agent string |
| 380 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 380 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | /** |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | public function setSSLVerifyPeer($i) |
| 551 | 551 | { |
| 552 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 552 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 553 | 553 | |
| 554 | 554 | $this->verifypeer = $i; |
| 555 | 555 | return $this; |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | */ |
| 567 | 567 | public function setSSLVerifyHost($i) |
| 568 | 568 | { |
| 569 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 569 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 570 | 570 | |
| 571 | 571 | $this->verifyhost = $i; |
| 572 | 572 | return $this; |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | */ |
| 582 | 582 | public function setSSLVersion($i) |
| 583 | 583 | { |
| 584 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 584 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 585 | 585 | |
| 586 | 586 | $this->sslversion = $i; |
| 587 | 587 | return $this; |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | */ |
| 647 | 647 | public function setRequestCompression($compMethod) |
| 648 | 648 | { |
| 649 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 649 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 650 | 650 | |
| 651 | 651 | $this->request_compression = $compMethod; |
| 652 | 652 | return $this; |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | */ |
| 697 | 697 | public function setCurlOptions($options) |
| 698 | 698 | { |
| 699 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 699 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 700 | 700 | |
| 701 | 701 | $this->extracurlopts = $options; |
| 702 | 702 | return $this; |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | public function setUseCurl($useCurlMode) |
| 711 | 711 | { |
| 712 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 712 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 713 | 713 | |
| 714 | 714 | $this->use_curl = $useCurlMode; |
| 715 | 715 | return $this; |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | */ |
| 728 | 728 | public function setUserAgent($agentString) |
| 729 | 729 | { |
| 730 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 730 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 731 | 731 | |
| 732 | 732 | $this->user_agent = $agentString; |
| 733 | 733 | return $this; |
@@ -758,12 +758,12 @@ discard block |
||
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - $url = $this->method . '://' . $this->server; |
|
| 761 | + $url = $this->method.'://'.$this->server; |
|
| 762 | 762 | if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) || |
| 763 | 763 | ($this->port == 443 && in_array($this->method, array('https', 'h2')))) { |
| 764 | - return $url . $this->path; |
|
| 764 | + return $url.$this->path; |
|
| 765 | 765 | } else { |
| 766 | - return $url . ':' . $this->port . $this->path; |
|
| 766 | + return $url.':'.$this->port.$this->path; |
|
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | public function send($req, $timeout = 0, $method = '') |
| 804 | 804 | { |
| 805 | 805 | if ($method !== '' || $timeout !== 0) { |
| 806 | - $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated'); |
|
| 806 | + $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated'); |
|
| 807 | 807 | } |
| 808 | 808 | |
| 809 | 809 | // if user does not specify http protocol, use native method of this client |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | $payload = $a; |
| 922 | 922 | $encodingHdr = "Content-Encoding: gzip\r\n"; |
| 923 | 923 | } else { |
| 924 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 924 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 925 | 925 | } |
| 926 | 926 | } else if (function_exists('gzcompress')) { |
| 927 | 927 | $a = @gzcompress($payload); |
@@ -929,14 +929,14 @@ discard block |
||
| 929 | 929 | $payload = $a; |
| 930 | 930 | $encodingHdr = "Content-Encoding: deflate\r\n"; |
| 931 | 931 | } else { |
| 932 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 932 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 933 | 933 | } |
| 934 | 934 | } else { |
| 935 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 935 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 936 | 936 | } |
| 937 | 937 | } else { |
| 938 | 938 | if ($opts['request_compression'] != '') { |
| 939 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 939 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 940 | 940 | } |
| 941 | 941 | } |
| 942 | 942 | |
@@ -944,16 +944,16 @@ discard block |
||
| 944 | 944 | $credentials = ''; |
| 945 | 945 | if ($opts['username'] != '') { |
| 946 | 946 | if ($opts['authtype'] != 1) { |
| 947 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 947 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 948 | 948 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 949 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0'); |
|
| 949 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0'); |
|
| 950 | 950 | } |
| 951 | - $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n"; |
|
| 951 | + $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n"; |
|
| 952 | 952 | } |
| 953 | 953 | |
| 954 | 954 | $acceptedEncoding = ''; |
| 955 | 955 | if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) { |
| 956 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n"; |
|
| 956 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n"; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | if ($port == 0) { |
@@ -969,15 +969,15 @@ discard block |
||
| 969 | 969 | $connectPort = $opts['proxyport']; |
| 970 | 970 | $transport = 'tcp'; |
| 971 | 971 | /// @todo check: should we not use https in some cases? |
| 972 | - $uri = 'http://' . $server . ':' . $port . $path; |
|
| 972 | + $uri = 'http://'.$server.':'.$port.$path; |
|
| 973 | 973 | if ($opts['proxy_user'] != '') { |
| 974 | 974 | if ($opts['proxy_authtype'] != 1) { |
| 975 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 975 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 976 | 976 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 977 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 977 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 978 | 978 | } |
| 979 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' . |
|
| 980 | - $opts['proxy_pass']) . "\r\n"; |
|
| 979 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'. |
|
| 980 | + $opts['proxy_pass'])."\r\n"; |
|
| 981 | 981 | } |
| 982 | 982 | } else { |
| 983 | 983 | $connectServer = $server; |
@@ -993,32 +993,32 @@ discard block |
||
| 993 | 993 | $version = ''; |
| 994 | 994 | foreach ($opts['cookies'] as $name => $cookie) { |
| 995 | 995 | /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments |
| 996 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 996 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 997 | 997 | } |
| 998 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 998 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | // omit port if default |
| 1002 | 1002 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 1003 | 1003 | $port = ''; |
| 1004 | 1004 | } else { |
| 1005 | - $port = ':' . $port; |
|
| 1006 | - } |
|
| 1007 | - |
|
| 1008 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 1009 | - 'User-Agent: ' . $opts['user_agent'] . "\r\n" . |
|
| 1010 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 1011 | - $credentials . |
|
| 1012 | - $proxyCredentials . |
|
| 1013 | - $acceptedEncoding . |
|
| 1014 | - $encodingHdr . |
|
| 1015 | - 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" . |
|
| 1016 | - $cookieHeader . |
|
| 1017 | - 'Content-Type: ' . $req->getContentType() . "\r\nContent-Length: " . |
|
| 1018 | - strlen($payload) . "\r\n\r\n" . |
|
| 1005 | + $port = ':'.$port; |
|
| 1006 | + } |
|
| 1007 | + |
|
| 1008 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 1009 | + 'User-Agent: '.$opts['user_agent']."\r\n". |
|
| 1010 | + 'Host: '.$server.$port."\r\n". |
|
| 1011 | + $credentials. |
|
| 1012 | + $proxyCredentials. |
|
| 1013 | + $acceptedEncoding. |
|
| 1014 | + $encodingHdr. |
|
| 1015 | + 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n". |
|
| 1016 | + $cookieHeader. |
|
| 1017 | + 'Content-Type: '.$req->getContentType()."\r\nContent-Length: ". |
|
| 1018 | + strlen($payload)."\r\n\r\n". |
|
| 1019 | 1019 | $payload; |
| 1020 | 1020 | |
| 1021 | - if ($opts['debug'] > 1) { |
|
| 1021 | + if ($opts['debug']>1) { |
|
| 1022 | 1022 | $this->getLogger()->debug("---SENDING---\n$op\n---END---"); |
| 1023 | 1023 | } |
| 1024 | 1024 | |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | |
| 1045 | 1045 | if ($opts['sslversion'] != 0) { |
| 1046 | 1046 | /// @see https://www.php.net/manual/en/function.curl-setopt.php, https://www.php.net/manual/en/migration56.openssl.php |
| 1047 | - switch($opts['sslversion']) { |
|
| 1047 | + switch ($opts['sslversion']) { |
|
| 1048 | 1048 | /// @todo what does this map to? 1.0-1.3? |
| 1049 | 1049 | //case 1: // TLSv1 |
| 1050 | 1050 | // break; |
@@ -1068,12 +1068,12 @@ discard block |
||
| 1068 | 1068 | $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT; |
| 1069 | 1069 | } else { |
| 1070 | 1070 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1071 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1071 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later'); |
|
| 1072 | 1072 | } |
| 1073 | 1073 | break; |
| 1074 | 1074 | default: |
| 1075 | 1075 | return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], |
| 1076 | - PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version'); |
|
| 1076 | + PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version'); |
|
| 1077 | 1077 | } |
| 1078 | 1078 | } |
| 1079 | 1079 | } |
@@ -1086,7 +1086,7 @@ discard block |
||
| 1086 | 1086 | |
| 1087 | 1087 | $context = stream_context_create($contextOptions); |
| 1088 | 1088 | |
| 1089 | - if ($opts['timeout'] <= 0) { |
|
| 1089 | + if ($opts['timeout']<=0) { |
|
| 1090 | 1090 | $connectTimeout = ini_get('default_socket_timeout'); |
| 1091 | 1091 | } else { |
| 1092 | 1092 | $connectTimeout = $opts['timeout']; |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 1099 | 1099 | STREAM_CLIENT_CONNECT, $context); |
| 1100 | 1100 | if ($fp) { |
| 1101 | - if ($opts['timeout'] > 0) { |
|
| 1101 | + if ($opts['timeout']>0) { |
|
| 1102 | 1102 | stream_set_timeout($fp, $opts['timeout'], 0); |
| 1103 | 1103 | } |
| 1104 | 1104 | } else { |
@@ -1107,8 +1107,8 @@ discard block |
||
| 1107 | 1107 | $this->errstr = $err['message']; |
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 1111 | - $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 1110 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 1111 | + $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 1112 | 1112 | |
| 1113 | 1113 | return $r; |
| 1114 | 1114 | } |
@@ -1175,19 +1175,19 @@ discard block |
||
| 1175 | 1175 | $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']); |
| 1176 | 1176 | |
| 1177 | 1177 | if (!$curl) { |
| 1178 | - return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1178 | + return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1179 | 1179 | ': error during curl initialization. Check php error log for details'); |
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | 1182 | $result = curl_exec($curl); |
| 1183 | 1183 | |
| 1184 | - if ($opts['debug'] > 1) { |
|
| 1184 | + if ($opts['debug']>1) { |
|
| 1185 | 1185 | $message = "---CURL INFO---\n"; |
| 1186 | 1186 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1187 | 1187 | if (is_array($val)) { |
| 1188 | 1188 | $val = implode("\n", $val); |
| 1189 | 1189 | } |
| 1190 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1190 | + $message .= $name.': '.$val."\n"; |
|
| 1191 | 1191 | } |
| 1192 | 1192 | $message .= '---END---'; |
| 1193 | 1193 | $this->getLogger()->debug($message); |
@@ -1197,8 +1197,8 @@ discard block |
||
| 1197 | 1197 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1198 | 1198 | |
| 1199 | 1199 | $this->errstr = 'no response'; |
| 1200 | - $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
|
| 1201 | - ': ' . curl_error($curl)); |
|
| 1200 | + $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail']. |
|
| 1201 | + ': '.curl_error($curl)); |
|
| 1202 | 1202 | curl_close($curl); |
| 1203 | 1203 | if ($opts['keepalive']) { |
| 1204 | 1204 | $this->xmlrpc_curl_handle = null; |
@@ -1256,7 +1256,7 @@ discard block |
||
| 1256 | 1256 | $payload = $a; |
| 1257 | 1257 | $encodingHdr = 'Content-Encoding: gzip'; |
| 1258 | 1258 | } else { |
| 1259 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request'); |
|
| 1259 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request'); |
|
| 1260 | 1260 | } |
| 1261 | 1261 | } else if (function_exists('gzcompress')) { |
| 1262 | 1262 | $a = @gzcompress($payload); |
@@ -1264,14 +1264,14 @@ discard block |
||
| 1264 | 1264 | $payload = $a; |
| 1265 | 1265 | $encodingHdr = 'Content-Encoding: deflate'; |
| 1266 | 1266 | } else { |
| 1267 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request'); |
|
| 1267 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request'); |
|
| 1268 | 1268 | } |
| 1269 | 1269 | } else { |
| 1270 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install'); |
|
| 1270 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install'); |
|
| 1271 | 1271 | } |
| 1272 | 1272 | } else { |
| 1273 | 1273 | if ($opts['request_compression'] != '') { |
| 1274 | - $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported'); |
|
| 1274 | + $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported'); |
|
| 1275 | 1275 | } |
| 1276 | 1276 | } |
| 1277 | 1277 | |
@@ -1285,12 +1285,12 @@ discard block |
||
| 1285 | 1285 | // http, https |
| 1286 | 1286 | $protocol = $method; |
| 1287 | 1287 | if (strpos($protocol, ':') !== false) { |
| 1288 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1288 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1289 | 1289 | return false; |
| 1290 | 1290 | } |
| 1291 | 1291 | } |
| 1292 | 1292 | } |
| 1293 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $path); |
|
| 1293 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$path); |
|
| 1294 | 1294 | if (!$curl) { |
| 1295 | 1295 | return false; |
| 1296 | 1296 | } |
@@ -1304,7 +1304,7 @@ discard block |
||
| 1304 | 1304 | // results into variable |
| 1305 | 1305 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1306 | 1306 | |
| 1307 | - if ($opts['debug'] > 1) { |
|
| 1307 | + if ($opts['debug']>1) { |
|
| 1308 | 1308 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1309 | 1309 | /// @todo redirect curlopt_stderr to some stream which can be piped to the logger |
| 1310 | 1310 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | } |
| 1330 | 1330 | } |
| 1331 | 1331 | // extra headers |
| 1332 | - $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings'])); |
|
| 1332 | + $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])); |
|
| 1333 | 1333 | // if no keepalive is wanted, let the server know it in advance |
| 1334 | 1334 | if (!$opts['keepalive']) { |
| 1335 | 1335 | $headers[] = 'Connection: close'; |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1347 | 1347 | // timeout is borked |
| 1348 | 1348 | if ($opts['timeout']) { |
| 1349 | - curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout'] - 1); |
|
| 1349 | + curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout']-1); |
|
| 1350 | 1350 | } |
| 1351 | 1351 | |
| 1352 | 1352 | switch ($method) { |
@@ -1360,7 +1360,7 @@ discard block |
||
| 1360 | 1360 | if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) { |
| 1361 | 1361 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1362 | 1362 | } else { |
| 1363 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1363 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1364 | 1364 | curl_close($curl); |
| 1365 | 1365 | return false; |
| 1366 | 1366 | } |
@@ -1371,11 +1371,11 @@ discard block |
||
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | 1373 | if ($opts['username'] && $opts['password']) { |
| 1374 | - curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']); |
|
| 1374 | + curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']); |
|
| 1375 | 1375 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1376 | 1376 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
| 1377 | 1377 | } elseif ($opts['authtype'] != 1) { |
| 1378 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1378 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1379 | 1379 | curl_close($curl); |
| 1380 | 1380 | return false; |
| 1381 | 1381 | } |
@@ -1420,13 +1420,13 @@ discard block |
||
| 1420 | 1420 | if ($opts['proxyport'] == 0) { |
| 1421 | 1421 | $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1422 | 1422 | } |
| 1423 | - curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']); |
|
| 1423 | + curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']); |
|
| 1424 | 1424 | if ($opts['proxy_user']) { |
| 1425 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']); |
|
| 1425 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']); |
|
| 1426 | 1426 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1427 | 1427 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
| 1428 | 1428 | } elseif ($opts['proxy_authtype'] != 1) { |
| 1429 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1429 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1430 | 1430 | curl_close($curl); |
| 1431 | 1431 | return false; |
| 1432 | 1432 | } |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | if (count($opts['cookies'])) { |
| 1439 | 1439 | $cookieHeader = ''; |
| 1440 | 1440 | foreach ($opts['cookies'] as $name => $cookie) { |
| 1441 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1441 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1442 | 1442 | } |
| 1443 | 1443 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1444 | 1444 | } |
@@ -1447,7 +1447,7 @@ discard block |
||
| 1447 | 1447 | curl_setopt($curl, $opt, $val); |
| 1448 | 1448 | } |
| 1449 | 1449 | |
| 1450 | - if ($opts['debug'] > 1) { |
|
| 1450 | + if ($opts['debug']>1) { |
|
| 1451 | 1451 | $this->getLogger()->debug("---SENDING---\n$payload\n---END---"); |
| 1452 | 1452 | } |
| 1453 | 1453 | |
@@ -1548,7 +1548,7 @@ discard block |
||
| 1548 | 1548 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1549 | 1549 | $numParams = $req->getNumParams(); |
| 1550 | 1550 | $params = array(); |
| 1551 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1551 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1552 | 1552 | $params[$i] = $req->getParam($i); |
| 1553 | 1553 | } |
| 1554 | 1554 | $call['params'] = new Value($params, 'array'); |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | $response = array(); |
| 1571 | 1571 | |
| 1572 | 1572 | if ($this->return_type == 'xml') { |
| 1573 | - for ($i = 0; $i < count($reqs); $i++) { |
|
| 1573 | + for ($i = 0; $i<count($reqs); $i++) { |
|
| 1574 | 1574 | $response[] = new Response($rets, 0, '', 'xml', $result->httpResponse()); |
| 1575 | 1575 | } |
| 1576 | 1576 | |
@@ -1578,21 +1578,21 @@ discard block |
||
| 1578 | 1578 | if (!is_array($rets)) { |
| 1579 | 1579 | // bad return type from system.multicall |
| 1580 | 1580 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1581 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse()); |
|
| 1581 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse()); |
|
| 1582 | 1582 | } |
| 1583 | 1583 | $numRets = count($rets); |
| 1584 | 1584 | if ($numRets != count($reqs)) { |
| 1585 | 1585 | // wrong number of return values. |
| 1586 | 1586 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1587 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals', |
|
| 1587 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals', |
|
| 1588 | 1588 | $result->httpResponse()); |
| 1589 | 1589 | } |
| 1590 | 1590 | |
| 1591 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1591 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1592 | 1592 | $val = $rets[$i]; |
| 1593 | 1593 | if (!is_array($val)) { |
| 1594 | 1594 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1595 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1595 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1596 | 1596 | 'phpvals', $result->httpResponse()); |
| 1597 | 1597 | } |
| 1598 | 1598 | switch (count($val)) { |
@@ -1600,7 +1600,7 @@ discard block |
||
| 1600 | 1600 | if (!isset($val[0])) { |
| 1601 | 1601 | // Bad value |
| 1602 | 1602 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1603 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value", |
|
| 1603 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value", |
|
| 1604 | 1604 | 'phpvals', $result->httpResponse()); |
| 1605 | 1605 | } |
| 1606 | 1606 | // Normal return value |
@@ -1612,20 +1612,20 @@ discard block |
||
| 1612 | 1612 | if (!is_int($code)) { |
| 1613 | 1613 | /// @todo should we check that it is != 0? |
| 1614 | 1614 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1615 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1615 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1616 | 1616 | 'phpvals', $result->httpResponse()); |
| 1617 | 1617 | } |
| 1618 | 1618 | $str = @$val['faultString']; |
| 1619 | 1619 | if (!is_string($str)) { |
| 1620 | 1620 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1621 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString", |
|
| 1621 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString", |
|
| 1622 | 1622 | 'phpvals', $result->httpResponse()); |
| 1623 | 1623 | } |
| 1624 | 1624 | $response[$i] = new Response(0, $code, $str, 'phpvals', $result->httpResponse()); |
| 1625 | 1625 | break; |
| 1626 | 1626 | default: |
| 1627 | 1627 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1628 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1628 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1629 | 1629 | 'phpvals', $result->httpResponse()); |
| 1630 | 1630 | } |
| 1631 | 1631 | } |
@@ -1634,14 +1634,14 @@ discard block |
||
| 1634 | 1634 | // return type == 'xmlrpcvals' |
| 1635 | 1635 | if ($rets->kindOf() != 'array') { |
| 1636 | 1636 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1637 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals', |
|
| 1637 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals', |
|
| 1638 | 1638 | $result->httpResponse()); |
| 1639 | 1639 | } |
| 1640 | 1640 | $numRets = $rets->count(); |
| 1641 | 1641 | if ($numRets != count($reqs)) { |
| 1642 | 1642 | // wrong number of return values. |
| 1643 | 1643 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1644 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals', |
|
| 1644 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals', |
|
| 1645 | 1645 | $result->httpResponse()); |
| 1646 | 1646 | } |
| 1647 | 1647 | |
@@ -1650,7 +1650,7 @@ discard block |
||
| 1650 | 1650 | case 'array': |
| 1651 | 1651 | if ($val->count() != 1) { |
| 1652 | 1652 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1653 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1653 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1654 | 1654 | 'phpvals', $result->httpResponse()); |
| 1655 | 1655 | } |
| 1656 | 1656 | // Normal return value |
@@ -1659,28 +1659,28 @@ discard block |
||
| 1659 | 1659 | case 'struct': |
| 1660 | 1660 | if ($val->count() != 2) { |
| 1661 | 1661 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1662 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items", |
|
| 1662 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items", |
|
| 1663 | 1663 | 'phpvals', $result->httpResponse()); |
| 1664 | 1664 | } |
| 1665 | 1665 | /** @var Value $code */ |
| 1666 | 1666 | $code = $val['faultCode']; |
| 1667 | 1667 | if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') { |
| 1668 | 1668 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1669 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1669 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1670 | 1670 | 'xmlrpcvals', $result->httpResponse()); |
| 1671 | 1671 | } |
| 1672 | 1672 | /** @var Value $str */ |
| 1673 | 1673 | $str = $val['faultString']; |
| 1674 | 1674 | if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') { |
| 1675 | 1675 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1676 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode", |
|
| 1676 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode", |
|
| 1677 | 1677 | 'xmlrpcvals', $result->httpResponse()); |
| 1678 | 1678 | } |
| 1679 | 1679 | $response[] = new Response(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse()); |
| 1680 | 1680 | break; |
| 1681 | 1681 | default: |
| 1682 | 1682 | return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'], |
| 1683 | - PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct", |
|
| 1683 | + PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct", |
|
| 1684 | 1684 | 'xmlrpcvals', $result->httpResponse()); |
| 1685 | 1685 | } |
| 1686 | 1686 | } |
@@ -1713,7 +1713,7 @@ discard block |
||
| 1713 | 1713 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 1714 | 1714 | $method = 'http') |
| 1715 | 1715 | { |
| 1716 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1716 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1717 | 1717 | |
| 1718 | 1718 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 1719 | 1719 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -1749,7 +1749,7 @@ discard block |
||
| 1749 | 1749 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 1750 | 1750 | $sslVersion = 0) |
| 1751 | 1751 | { |
| 1752 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1752 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1753 | 1753 | |
| 1754 | 1754 | return $this->sendPayloadCURL($req, $server, $port, $timeout, $username, |
| 1755 | 1755 | $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort, |
@@ -1962,7 +1962,7 @@ discard block |
||
| 1962 | 1962 | public function &__get($name) |
| 1963 | 1963 | { |
| 1964 | 1964 | if (in_array($name, static::$options)) { |
| 1965 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1965 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1966 | 1966 | return $this->$name; |
| 1967 | 1967 | } |
| 1968 | 1968 | |
@@ -1973,12 +1973,12 @@ discard block |
||
| 1973 | 1973 | case 'server': |
| 1974 | 1974 | case 'port': |
| 1975 | 1975 | case 'path': |
| 1976 | - $this->logDeprecation('Getting property Client::' . $name . ' is deprecated'); |
|
| 1976 | + $this->logDeprecation('Getting property Client::'.$name.' is deprecated'); |
|
| 1977 | 1977 | return $this->$name; |
| 1978 | 1978 | default: |
| 1979 | 1979 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1980 | 1980 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1981 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1981 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1982 | 1982 | $result = null; |
| 1983 | 1983 | return $result; |
| 1984 | 1984 | } |
@@ -1987,7 +1987,7 @@ discard block |
||
| 1987 | 1987 | public function __set($name, $value) |
| 1988 | 1988 | { |
| 1989 | 1989 | if (in_array($name, static::$options)) { |
| 1990 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 1990 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 1991 | 1991 | $this->$name = $value; |
| 1992 | 1992 | return; |
| 1993 | 1993 | } |
@@ -1999,20 +1999,20 @@ discard block |
||
| 1999 | 1999 | case 'server': |
| 2000 | 2000 | case 'port': |
| 2001 | 2001 | case 'path': |
| 2002 | - $this->logDeprecation('Setting property Client::' . $name . ' is deprecated'); |
|
| 2002 | + $this->logDeprecation('Setting property Client::'.$name.' is deprecated'); |
|
| 2003 | 2003 | $this->$name = $value; |
| 2004 | 2004 | return; |
| 2005 | 2005 | default: |
| 2006 | 2006 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2007 | 2007 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2008 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2008 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2009 | 2009 | } |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | public function __isset($name) |
| 2013 | 2013 | { |
| 2014 | 2014 | if (in_array($name, static::$options)) { |
| 2015 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2015 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2016 | 2016 | return isset($this->$name); |
| 2017 | 2017 | } |
| 2018 | 2018 | |
@@ -2023,7 +2023,7 @@ discard block |
||
| 2023 | 2023 | case 'server': |
| 2024 | 2024 | case 'port': |
| 2025 | 2025 | case 'path': |
| 2026 | - $this->logDeprecation('Checking property Client::' . $name . ' is deprecated'); |
|
| 2026 | + $this->logDeprecation('Checking property Client::'.$name.' is deprecated'); |
|
| 2027 | 2027 | return isset($this->$name); |
| 2028 | 2028 | default: |
| 2029 | 2029 | return false; |
@@ -2033,7 +2033,7 @@ discard block |
||
| 2033 | 2033 | public function __unset($name) |
| 2034 | 2034 | { |
| 2035 | 2035 | if (in_array($name, static::$options)) { |
| 2036 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2036 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2037 | 2037 | unset($this->$name); |
| 2038 | 2038 | return; |
| 2039 | 2039 | } |
@@ -2045,13 +2045,13 @@ discard block |
||
| 2045 | 2045 | case 'server': |
| 2046 | 2046 | case 'port': |
| 2047 | 2047 | case 'path': |
| 2048 | - $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated'); |
|
| 2048 | + $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated'); |
|
| 2049 | 2049 | unset($this->$name); |
| 2050 | 2050 | return; |
| 2051 | 2051 | default: |
| 2052 | 2052 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 2053 | 2053 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 2054 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 2054 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 2055 | 2055 | } |
| 2056 | 2056 | } |
| 2057 | 2057 | } |
@@ -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 | /** |
| 6 | 6 | * Tests involving the Client class (and mostly no server). |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $this->client->server .= 'XXX'; |
| 60 | 60 | $dnsinfo = @dns_get_record($this->client->server); |
| 61 | 61 | if ($dnsinfo) { |
| 62 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 62 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 63 | 63 | } else { |
| 64 | 64 | $r = $this->client->send($m, 5); |
| 65 | 65 | // make sure there's no freaking catchall DNS in effect |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | // now test a successful connection |
| 88 | 88 | $server = explode(':', $this->args['HTTPSERVER']); |
| 89 | - if (count($server) > 1) { |
|
| 89 | + if (count($server)>1) { |
|
| 90 | 90 | $this->client->port = $server[1]; |
| 91 | 91 | } |
| 92 | 92 | $this->client->server = $server[0]; |
