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>'); |
@@ -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( |
@@ -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; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | return true; |
| 86 | 86 | } else { |
| 87 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value'); |
|
| 87 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value'); |
|
| 88 | 88 | return false; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | $this->logDeprecationUnlessCalledBy('serialize'); |
| 135 | 135 | |
| 136 | 136 | if ($charsetEncoding != '') { |
| 137 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 137 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 138 | 138 | } else { |
| 139 | 139 | $this->content_type = 'text/xml'; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | $result = $this->xml_header($charsetEncoding); |
| 143 | - $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 144 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 143 | + $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 144 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 145 | 145 | $result .= "<params>\n"; |
| 146 | 146 | foreach ($this->params as $p) { |
| 147 | - $result .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 147 | + $result .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 148 | 148 | "</param>\n"; |
| 149 | 149 | } |
| 150 | 150 | $result .= "</params>\n"; |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | $this->logDeprecationUnlessCalledBy('createPayload'); |
| 165 | 165 | |
| 166 | 166 | if ($charsetEncoding != '') { |
| 167 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 167 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 168 | 168 | } else { |
| 169 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 169 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -228,14 +228,14 @@ discard block |
||
| 228 | 228 | */ |
| 229 | 229 | public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS) |
| 230 | 230 | { |
| 231 | - if ($this->debug > 0) { |
|
| 231 | + if ($this->debug>0) { |
|
| 232 | 232 | $this->getLogger()->debug("---GOT---\n$data\n---END---"); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 236 | 236 | |
| 237 | 237 | if ($data == '') { |
| 238 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 238 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 239 | 239 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
| 243 | 243 | if (substr($data, 0, 4) == 'HTTP') { |
| 244 | 244 | $httpParser = new Http(); |
| 245 | 245 | try { |
| 246 | - $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0); |
|
| 246 | + $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0); |
|
| 247 | 247 | } catch (HttpException $e) { |
| 248 | 248 | // failed processing of HTTP response headers |
| 249 | 249 | // save into response obj the full payload received, for debugging |
| 250 | 250 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code' => $e->statusCode())); |
| 251 | - } catch(\Exception $e) { |
|
| 251 | + } catch (\Exception $e) { |
|
| 252 | 252 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 253 | 253 | } |
| 254 | 254 | } else { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // idea from Luca Mariano, originally in PEARified version of the lib |
| 265 | 265 | $pos = strrpos($data, '</methodResponse>'); |
| 266 | 266 | if ($pos !== false) { |
| 267 | - $data = substr($data, 0, $pos + 17); |
|
| 267 | + $data = substr($data, 0, $pos+17); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | // try to 'guestimate' the character encoding of the received response |
@@ -273,21 +273,21 @@ discard block |
||
| 273 | 273 | $data |
| 274 | 274 | ); |
| 275 | 275 | |
| 276 | - if ($this->debug >= 0) { |
|
| 276 | + if ($this->debug>=0) { |
|
| 277 | 277 | $this->httpResponse = $httpResponse; |
| 278 | 278 | } else { |
| 279 | 279 | $httpResponse = null; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - if ($this->debug > 0) { |
|
| 282 | + if ($this->debug>0) { |
|
| 283 | 283 | $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 284 | 284 | if ($start) { |
| 285 | 285 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 286 | 286 | /// @todo what if there is no end tag? |
| 287 | 287 | $end = strpos($data, '-->', $start); |
| 288 | - $comments = substr($data, $start, $end - $start); |
|
| 289 | - $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" . |
|
| 290 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding)); |
|
| 288 | + $comments = substr($data, $start, $end-$start); |
|
| 289 | + $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t". |
|
| 290 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding)); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | if ($respEncoding == 'ISO-8859-1') { |
| 310 | 310 | $data = utf8_encode($data); |
| 311 | 311 | } else { |
| 312 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
| 312 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
| 313 | 313 | } |
| 314 | 314 | } |
| 315 | 315 | } |
@@ -339,16 +339,16 @@ discard block |
||
| 339 | 339 | // there could be proxies meddling with the request, or network data corruption... |
| 340 | 340 | |
| 341 | 341 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 342 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 342 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 343 | 343 | |
| 344 | - if ($this->debug > 0) { |
|
| 344 | + if ($this->debug>0) { |
|
| 345 | 345 | $this->getLogger()->debug($_xh['isf_reason']); |
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | // second error check: xml well-formed but not xml-rpc compliant |
| 349 | 349 | elseif ($_xh['isf'] == 2) { |
| 350 | 350 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 351 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 351 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 352 | 352 | |
| 353 | 353 | /// @todo echo something for the user? check if it was already done by the parser... |
| 354 | 354 | //if ($this->debug > 0) { |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | // third error check: parsing of the response has somehow gone boink. |
| 359 | 359 | /// @todo shall we omit the 2nd part of this check, since we trust the parsing code? |
| 360 | 360 | /// Either that, or check the fault results too... |
| 361 | - elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 361 | + elseif ($_xh['isf']>3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 362 | 362 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
| 363 | 363 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
| 364 | 364 | '', $httpResponse |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | |
| 367 | 367 | /// @todo echo something for the user? |
| 368 | 368 | } else { |
| 369 | - if ($this->debug > 1) { |
|
| 369 | + if ($this->debug>1) { |
|
| 370 | 370 | $this->getLogger()->debug( |
| 371 | 371 | "---PARSED---\n".var_export($_xh['value'], true)."\n---END---" |
| 372 | 372 | ); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if ($errNo == 0) { |
| 391 | 391 | // FAULT returned, errno needs to reflect that |
| 392 | 392 | /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr |
| 393 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 393 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 394 | 394 | /// @todo in Encoder::decodeXML, we use PhpXmlRpc::$xmlrpcerr['invalid_return'] for this case (see |
| 395 | 395 | /// also the todo 17 lines above) |
| 396 | 396 | $errNo = -1; |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | case '_php_class': |
| 439 | 439 | case 'payload': |
| 440 | 440 | case 'content_type': |
| 441 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 441 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 442 | 442 | return $this->$name; |
| 443 | 443 | case 'httpResponse': |
| 444 | 444 | // manually implement the 'protected property' behaviour |
@@ -450,16 +450,16 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | if ($canAccess) { |
| 453 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 453 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 454 | 454 | return $this->httpResponse; |
| 455 | 455 | } else { |
| 456 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 456 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 457 | 457 | } |
| 458 | 458 | break; |
| 459 | 459 | default: |
| 460 | 460 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 461 | 461 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 462 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 462 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 463 | 463 | $result = null; |
| 464 | 464 | return $result; |
| 465 | 465 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | case 'debug': |
| 474 | 474 | case 'payload': |
| 475 | 475 | case 'content_type': |
| 476 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 476 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 477 | 477 | $this->$name = $value; |
| 478 | 478 | break; |
| 479 | 479 | case 'httpResponse': |
@@ -486,16 +486,16 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | } |
| 488 | 488 | if ($canAccess) { |
| 489 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 489 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 490 | 490 | $this->httpResponse = $value; |
| 491 | 491 | } else { |
| 492 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 492 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 493 | 493 | } |
| 494 | 494 | break; |
| 495 | 495 | default: |
| 496 | 496 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 497 | 497 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 498 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 498 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | case 'debug': |
| 508 | 508 | case 'payload': |
| 509 | 509 | case 'content_type': |
| 510 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 510 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 511 | 511 | return isset($this->$name); |
| 512 | 512 | case 'httpResponse': |
| 513 | 513 | // manually implement the 'protected property' behaviour |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | if ($canAccess) { |
| 522 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 522 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 523 | 523 | return isset($this->httpResponse); |
| 524 | 524 | } |
| 525 | 525 | // break through voluntarily |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | case 'debug': |
| 537 | 537 | case 'payload': |
| 538 | 538 | case 'content_type': |
| 539 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 539 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 540 | 540 | unset($this->$name); |
| 541 | 541 | break; |
| 542 | 542 | case 'httpResponse': |
@@ -549,16 +549,16 @@ discard block |
||
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | 551 | if ($canAccess) { |
| 552 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 552 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 553 | 553 | unset($this->httpResponse); |
| 554 | 554 | } else { |
| 555 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 555 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 556 | 556 | } |
| 557 | 557 | break; |
| 558 | 558 | default: |
| 559 | 559 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 560 | 560 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 561 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 561 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -require_once __DIR__ . "/_prepend.php"; |
|
| 27 | +require_once __DIR__."/_prepend.php"; |
|
| 28 | 28 | |
| 29 | 29 | use PhpXmlRpc\PhpXmlRpc; |
| 30 | 30 | use PhpXmlRpc\Server; |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | // That is generally a good idea security-wise, but you might want to allow it in case of specific needs. |
| 11 | 11 | // Look at the code in demo/server.php for an example of how to enable that. |
| 12 | 12 | |
| 13 | -require_once __DIR__ . "/../../lib/xmlrpc.inc"; |
|
| 14 | -require_once __DIR__ . "/../../lib/xmlrpcs.inc"; |
|
| 13 | +require_once __DIR__."/../../lib/xmlrpc.inc"; |
|
| 14 | +require_once __DIR__."/../../lib/xmlrpcs.inc"; |
|
| 15 | 15 | |
| 16 | 16 | $signatures1 = include(__DIR__.'/methodProviders/functions.php'); |
| 17 | 17 | $signatures2 = include(__DIR__.'/methodProviders/interop.php'); |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 5 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Tests which involve interaction with the server - carried out via the client. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | // (but only if not called from subclass objects / multitests) |
| 31 | 31 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'servertest') { |
| 32 | 32 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 33 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 33 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 34 | 34 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 35 | 35 | self::$failed_tests[$trace[$i]['function']] = true; |
| 36 | 36 | break; |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | $this->validateResponse($r); |
| 81 | 81 | if (is_array($errorCode)) { |
| 82 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 82 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 83 | 83 | } else { |
| 84 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 84 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 85 | 85 | } |
| 86 | 86 | if (!$r->faultCode()) { |
| 87 | 87 | if ($returnResponse) { |
@@ -108,20 +108,20 @@ discard block |
||
| 108 | 108 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 109 | 109 | parse_str($query, $vars); |
| 110 | 110 | $query = http_build_query(array_merge($vars, $data)); |
| 111 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 111 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | public function testString() |
| 115 | 115 | { |
| 116 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 117 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 118 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 119 | - " also don't want to miss out on \$item[0]. " . |
|
| 120 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 121 | - "a simple CR here" . chr(13) . |
|
| 122 | - "a simple LF here" . chr(10) . |
|
| 123 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 124 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 116 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 117 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 118 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 119 | + " also don't want to miss out on \$item[0]. ". |
|
| 120 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 121 | + "a simple CR here".chr(13). |
|
| 122 | + "a simple LF here".chr(10). |
|
| 123 | + "and then LFCR".chr(10).chr(13). |
|
| 124 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 125 | 125 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 126 | 126 | new xmlrpcval($sendString, 'string'), |
| 127 | 127 | )); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | public function testLatin1String() |
| 143 | 143 | { |
| 144 | 144 | $sendString = |
| 145 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 145 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 146 | 146 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 147 | 147 | $sendString. |
| 148 | 148 | '</value></param></params></methodCall>'; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function testUtf8Method() |
| 252 | 252 | { |
| 253 | 253 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 254 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 254 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 255 | 255 | new xmlrpcval('hello') |
| 256 | 256 | )); |
| 257 | 257 | $v = $this->send($m); |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | )); |
| 273 | 273 | $v = $this->send($m); |
| 274 | 274 | if ($v) { |
| 275 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 275 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | )); |
| 285 | 285 | $v = $this->send($m); |
| 286 | 286 | if ($v) { |
| 287 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 287 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | if ($v) { |
| 324 | 324 | $sz = $v->arraysize(); |
| 325 | 325 | $got = ''; |
| 326 | - for ($i = 0; $i < $sz; $i++) { |
|
| 326 | + for ($i = 0; $i<$sz; $i++) { |
|
| 327 | 327 | $b = $v->arraymem($i); |
| 328 | 328 | if ($b->scalarval()) { |
| 329 | 329 | $got .= '1'; |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $got = ''; |
| 371 | 371 | $expected = '37210'; |
| 372 | 372 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 373 | - foreach($expect_array as $val) { |
|
| 373 | + foreach ($expect_array as $val) { |
|
| 374 | 374 | $b = $v->structmem($val); |
| 375 | 375 | $got .= $b->scalarVal(); |
| 376 | 376 | } |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | { |
| 874 | 874 | // make a 'deep client copy' as the original one might have many properties set |
| 875 | 875 | // also for speed only wrap one method of the whole server |
| 876 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 876 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 877 | 877 | if ($class == '') { |
| 878 | 878 | $this->fail('Registration of remote server failed'); |
| 879 | 879 | } else { |
@@ -912,9 +912,9 @@ discard block |
||
| 912 | 912 | $cookies = array( |
| 913 | 913 | //'c1' => array(), |
| 914 | 914 | 'c2' => array('value' => 'c2'), |
| 915 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 916 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 915 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 916 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 918 | 918 | ); |
| 919 | 919 | $cookiesval = php_xmlrpc_encode($cookies); |
| 920 | 920 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -962,10 +962,10 @@ discard block |
||
| 962 | 962 | $m = new xmlrpcmsg('tests.getcookies', array()); |
| 963 | 963 | foreach ($cookies as $cookie => $val) { |
| 964 | 964 | $this->client->setCookie($cookie, $val); |
| 965 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 965 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 966 | 966 | } |
| 967 | 967 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 968 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 968 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 969 | 969 | if (!$r->faultCode()) { |
| 970 | 970 | $v = $r->value(); |
| 971 | 971 | $v = php_xmlrpc_decode($v); |
