@@ -24,14 +24,16 @@ |
||
24 | 24 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80); |
25 | 25 | $this->client->setDebug($this->args['DEBUG']); |
26 | 26 | |
27 | - if ($this->args['DEBUG'] == 1) |
|
28 | - ob_start(); |
|
27 | + if ($this->args['DEBUG'] == 1) { |
|
28 | + ob_start(); |
|
29 | + } |
|
29 | 30 | } |
30 | 31 | |
31 | 32 | protected function tear_down() |
32 | 33 | { |
33 | - if ($this->args['DEBUG'] != 1) |
|
34 | - return; |
|
34 | + if ($this->args['DEBUG'] != 1) { |
|
35 | + return; |
|
36 | + } |
|
35 | 37 | $out = ob_get_clean(); |
36 | 38 | $status = $this->getStatus(); |
37 | 39 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -201,8 +201,7 @@ discard block |
||
201 | 201 | { |
202 | 202 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
203 | 203 | return; |
204 | - } |
|
205 | - else if ($this->args['PROXYSERVER'] == '') |
|
204 | + } else if ($this->args['PROXYSERVER'] == '') |
|
206 | 205 | { |
207 | 206 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
208 | 207 | return; |
@@ -226,8 +225,7 @@ discard block |
||
226 | 225 | { |
227 | 226 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
228 | 227 | return; |
229 | - } |
|
230 | - else if ($this->args['HTTPSSERVER'] == '') |
|
228 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
231 | 229 | { |
232 | 230 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
233 | 231 | return; |
@@ -278,13 +276,11 @@ discard block |
||
278 | 276 | { |
279 | 277 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
280 | 278 | return; |
281 | - } |
|
282 | - else if ($this->args['PROXYSERVER'] == '') |
|
279 | + } else if ($this->args['PROXYSERVER'] == '') |
|
283 | 280 | { |
284 | 281 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
285 | 282 | return; |
286 | - } |
|
287 | - else if ($this->args['HTTPSSERVER'] == '') |
|
283 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
288 | 284 | { |
289 | 285 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
290 | 286 | return; |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -176,8 +176,7 @@ |
||
176 | 176 | } else { |
177 | 177 | $escapedData .= $ch; |
178 | 178 | } |
179 | - } |
|
180 | - else if ($ii < 128) { |
|
179 | + } else if ($ii < 128) { |
|
181 | 180 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
182 | 181 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
183 | 182 | switch ($ii) { |
@@ -108,14 +108,16 @@ |
||
108 | 108 | |
109 | 109 | $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
110 | 110 | |
111 | - if ($this->args['DEBUG'] == 1) |
|
112 | - ob_start(); |
|
111 | + if ($this->args['DEBUG'] == 1) { |
|
112 | + ob_start(); |
|
113 | + } |
|
113 | 114 | } |
114 | 115 | |
115 | 116 | protected function tear_down() |
116 | 117 | { |
117 | - if ($this->args['DEBUG'] != 1) |
|
118 | - return; |
|
118 | + if ($this->args['DEBUG'] != 1) { |
|
119 | + return; |
|
120 | + } |
|
119 | 121 | $out = ob_get_clean(); |
120 | 122 | $status = $this->getStatus(); |
121 | 123 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -66,11 +66,12 @@ |
||
66 | 66 | $a = $req->getParam(0); |
67 | 67 | $b = $req->getParam(1); |
68 | 68 | |
69 | - if ($a->scalartyp() == Value::$xmlrpcNull) |
|
70 | - return new Response(new Value(plain_findstate($b->scalarval()))); |
|
71 | - else |
|
72 | - return new Response(new Value(plain_findstate($a->scalarval()))); |
|
73 | -} |
|
69 | + if ($a->scalartyp() == Value::$xmlrpcNull) { |
|
70 | + return new Response(new Value(plain_findstate($b->scalarval()))); |
|
71 | + } else { |
|
72 | + return new Response(new Value(plain_findstate($a->scalarval()))); |
|
73 | + } |
|
74 | + } |
|
74 | 75 | |
75 | 76 | return array( |
76 | 77 | "tests.getallheaders" => array( |
@@ -592,8 +592,9 @@ |
||
592 | 592 | } |
593 | 593 | foreach ($parsVariations as $i => $pars) { |
594 | 594 | $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
595 | - if ($i < (count($parsVariations) - 1)) |
|
596 | - $innerCode .= "else\n"; |
|
595 | + if ($i < (count($parsVariations) - 1)) { |
|
596 | + $innerCode .= "else\n"; |
|
597 | + } |
|
597 | 598 | } |
598 | 599 | $innerCode .= "if (is_a(\$retval, '" . static::$namespace . "Response')) return \$retval; else\n"; |
599 | 600 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |