Passed
Push — master ( 9d9f5a...5b4cde )
by Gaetano
10:07
created
demo/vardemo.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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>');
Please login to merge, or discard this patch.
demo/server/methodProviders/functions.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
demo/server/methodProviders/validator1.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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 &lt;i4&gt;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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 &lt;i4&gt;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
 block discarded – undo
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
 block discarded – undo
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 &lt;, &gt;, &amp; \' 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
 block discarded – undo
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 ">":
Please login to merge, or discard this patch.
tests/parse_args.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
demo/server/server.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
demo/server/legacy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
demo/server/methodProviders/testsuite.php 2 patches
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -88,11 +88,12 @@
 block discarded – undo
88 88
     $a = $req->getParam(0);
89 89
     $b = $req->getParam(1);
90 90
 
91
-    if ($a->scalarTyp() == Value::$xmlrpcNull)
92
-        return new Response(new Value(plain_findstate($b->scalarVal())));
93
-    else
94
-        return new Response(new Value(plain_findstate($a->scalarVal())));
95
-}
91
+    if ($a->scalarTyp() == Value::$xmlrpcNull) {
92
+            return new Response(new Value(plain_findstate($b->scalarVal())));
93
+    } else {
94
+            return new Response(new Value(plain_findstate($a->scalarVal())));
95
+    }
96
+    }
96 97
 
97 98
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
98 99
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
                 $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
44 44
             } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
45 45
                 $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
46
-                $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
46
+                $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass);
47 47
             } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
48 48
                 $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
49 49
             }
@@ -62,12 +62,12 @@  discard block
 block discarded – undo
62 62
     foreach ($cookies as $name => $cookieDesc) {
63 63
         if (is_array($cookieDesc)) {
64 64
             setcookie($name,
65
-                isset($cookieDesc['value']) ? (string)$cookieDesc['value'] : '',
65
+                isset($cookieDesc['value']) ? (string) $cookieDesc['value'] : '',
66 66
                 isset($cookieDesc['expires']) ? $cookieDesc['expires'] : 0,
67
-                isset($cookieDesc['path']) ? (string)$cookieDesc['path'] : '',
68
-                isset($cookieDesc['domain']) ? (string)$cookieDesc['domain'] : '',
69
-                isset($cookieDesc['secure']) ? (bool)$cookieDesc['secure'] : false,
70
-                isset($cookieDesc['httponly']) ? (bool)$cookieDesc['httponly'] : false
67
+                isset($cookieDesc['path']) ? (string) $cookieDesc['path'] : '',
68
+                isset($cookieDesc['domain']) ? (string) $cookieDesc['domain'] : '',
69
+                isset($cookieDesc['secure']) ? (bool) $cookieDesc['secure'] : false,
70
+                isset($cookieDesc['httponly']) ? (bool) $cookieDesc['httponly'] : false
71 71
             );
72 72
         } else {
73 73
             /// @todo what to do?
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
105 105
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';
106 106
 function sleepSeconds($secs) {
107
-    if ($secs > 0 && $secs < 61) {
107
+    if ($secs>0 && $secs<61) {
108 108
         sleep($secs);
109 109
     }
110 110
     return $secs;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
     // Greek word 'kosme'. NB: NOT a valid ISO8859 string!
139 139
     // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
140
-    "tests.utf8methodname." . 'κόσμε' => array(
140
+    "tests.utf8methodname.".'κόσμε' => array(
141 141
         "function" => "exampleMethods::stringEcho",
142 142
         "signature" => exampleMethods::$stringecho_sig,
143 143
         "docstring" => exampleMethods::$stringecho_doc,
Please login to merge, or discard this patch.
tests/08ServerTest.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
tests/index.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also
8 8
 // write a specific file to disk.
9 9
 // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file
10
-$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt';
10
+$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt';
11 11
 $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : '';
12 12
 $fileId = file_exists($idFile) ? file_get_contents($idFile) : '';
13 13
 if ($randId == '' || $fileId == '' || $fileId !== $randId) {
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
32 32
     }
33 33
 
34
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
34
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
35 35
 }
36 36
 
37 37
 $targetFile = null;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 }
55 55
 
56 56
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
57
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
57
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
58 58
 }
59 59
 
60 60
 /**
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         } elseif ($_GET['FORCE_AUTH'] == 'Digest') {
88 88
             if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
89 89
                 header('HTTP/1.1 401 Unauthorized');
90
-                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
90
+                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
91 91
                 die('Text visible if user hits Cancel button');
92 92
             }
93 93
         }
@@ -95,11 +95,11 @@  discard block
 block discarded – undo
95 95
     if (isset($_GET['FORCE_REDIRECT'])) {
96 96
         header('HTTP/1.0 302 Found');
97 97
         unset($_GET['FORCE_REDIRECT']);
98
-        header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : ''));
98
+        header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : ''));
99 99
         die();
100 100
     }
101
-    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS'] > 0) {
102
-        slowLoris((int)$_GET['SLOW_LORIS'], $s);
101
+    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS']>0) {
102
+        slowLoris((int) $_GET['SLOW_LORIS'], $s);
103 103
         die();
104 104
     }
105 105
 }
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
 {
114 114
     /// @todo as is, this method can not be used by eg. jsonrpc servers. We could look at the value $s::$responseClass
115 115
     ///       to improve that
116
-    $strings = array('<?xml version="1.0"?>','<methodResponse>','<params>','<param>','<value>','<string></string>','</value>','</param>','</params>','</methodResponse>');
116
+    $strings = array('<?xml version="1.0"?>', '<methodResponse>', '<params>', '<param>', '<value>', '<string></string>', '</value>', '</param>', '</params>', '</methodResponse>');
117 117
 
118 118
     header('Content-type: xml; charset=utf-8');
119
-    foreach($strings as $i => $string) {
119
+    foreach ($strings as $i => $string) {
120 120
         echo $string;
121 121
         flush();
122
-        if ($i < count($strings) && $secs > 0 && $secs <= 60) {
122
+        if ($i<count($strings) && $secs>0 && $secs<=60) {
123 123
             sleep($secs);
124 124
         }
125 125
     }
Please login to merge, or discard this patch.