@@ -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 | |
@@ -124,13 +124,13 @@ discard block |
||
124 | 124 | |
125 | 125 | $findstate10_sig = array( |
126 | 126 | /// @todo add a demo and test with closure usage |
127 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
127 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
128 | 128 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
129 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
129 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
130 | 130 | 'index of that state name in an alphabetic order.', |
131 | 131 | ); |
132 | 132 | |
133 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
133 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
134 | 134 | |
135 | 135 | /// @todo do we really need a new instance ? |
136 | 136 | $c = new handlersContainer(); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
141 | 141 | |
142 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
142 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
143 | 143 | |
144 | 144 | return array_merge( |
145 | 145 | array( |
@@ -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 | /** |
5 | 5 | * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | ); |
22 | 22 | |
23 | 23 | // the generated code does not have an autoloader included - we need to add in one |
24 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
24 | +$autoloader = __DIR__."/_prepend.php"; |
|
25 | 25 | |
26 | 26 | $targetFile = '/tmp/MyClient.php'; |
27 | 27 | $generated = file_put_contents($targetFile, |
28 | - "<?php\n\n" . |
|
29 | - "require_once '$autoloader';\n\n" . |
|
28 | + "<?php\n\n". |
|
29 | + "require_once '$autoloader';\n\n". |
|
30 | 30 | $code['code'] |
31 | 31 | ); |
32 | 32 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $client = new MyClient(); |
47 | 47 | $sorted = $client->examples_sortByAge(array( |
48 | 48 | array('name' => 'Dave', 'age' => 24), |
49 | - array('name' => 'Edd', 'age' => 45), |
|
50 | - array('name' => 'Joe', 'age' => 37), |
|
49 | + array('name' => 'Edd', 'age' => 45), |
|
50 | + array('name' => 'Joe', 'age' => 37), |
|
51 | 51 | array('name' => 'Fred', 'age' => 27), |
52 | 52 | )); |
53 | 53 |
@@ -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 | require_once __DIR__.'/methodProviders/CommentManager.php'; |
5 | 5 | |
@@ -22,19 +22,19 @@ discard block |
||
22 | 22 | // generate a file with a class definition |
23 | 23 | |
24 | 24 | // the generated code does not have an autoloader included - we need to add in one |
25 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
25 | +$autoloader = __DIR__."/_prepend.php"; |
|
26 | 26 | |
27 | 27 | file_put_contents($targetClassFile, |
28 | - "<?php\n\n" . |
|
29 | - "require_once '$autoloader';\n\n" . |
|
28 | + "<?php\n\n". |
|
29 | + "require_once '$autoloader';\n\n". |
|
30 | 30 | "class MyServerClass {\n\n" |
31 | 31 | ) || die('uh oh'); |
32 | 32 | |
33 | 33 | // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions |
34 | 34 | |
35 | -foreach($code as $methodName => $methodDef) { |
|
36 | - file_put_contents($targetClassFile, 'public static ' . $methodDef['source'] . "\n\n", FILE_APPEND) || die('uh oh'); |
|
37 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
35 | +foreach ($code as $methodName => $methodDef) { |
|
36 | + file_put_contents($targetClassFile, 'public static '.$methodDef['source']."\n\n", FILE_APPEND) || die('uh oh'); |
|
37 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
38 | 38 | unset($code[$methodName]['source']); |
39 | 39 | } |
40 | 40 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | // generate the separate file with the xml-rpc server and dispatch map |
43 | 43 | |
44 | 44 | file_put_contents($targetServerFile, |
45 | - "<?php\n\n" . |
|
45 | + "<?php\n\n". |
|
46 | 46 | |
47 | - "require_once '$autoloader';\n\n" . |
|
47 | + "require_once '$autoloader';\n\n". |
|
48 | 48 | |
49 | - "require_once '$targetClassFile';\n\n" . |
|
49 | + "require_once '$targetClassFile';\n\n". |
|
50 | 50 | |
51 | 51 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
52 | 52 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | // Wrapper::$objHolder['xmlrpc_CommentManager_addComment'] = $cm; |
57 | 57 | // Wrapper::$objHolder['xmlrpc_CommentManager_getComments'] = $cm; |
58 | 58 | |
59 | - '$dm = ' . var_export($code, true) . ";\n" . |
|
60 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" . |
|
61 | - '$s->setDebug(2);' . "\n" . |
|
62 | - '$s->exception_handling = 1;' . "\n" . |
|
63 | - '$s->service();' . "\n" |
|
59 | + '$dm = '.var_export($code, true).";\n". |
|
60 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n". |
|
61 | + '$s->setDebug(2);'."\n". |
|
62 | + '$s->exception_handling = 1;'."\n". |
|
63 | + '$s->service();'."\n" |
|
64 | 64 | ) || die('uh oh'); |
65 | 65 | |
66 | 66 | // test that everything worked by running it in realtime |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | die(); |
22 | 22 | } |
23 | 23 | |
24 | -require_once __DIR__ . "/_prepend.php"; |
|
24 | +require_once __DIR__."/_prepend.php"; |
|
25 | 25 | |
26 | 26 | use PhpXmlRpc\PhpXmlRpc; |
27 | 27 | use PhpXmlRpc\Server; |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
81 | 81 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
82 | 82 | header('HTTP/1.1 401 Unauthorized'); |
83 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
83 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
84 | 84 | die('Text visible if user hits Cancel button'); |
85 | 85 | } |
86 | 86 | } |
@@ -8,5 +8,5 @@ |
||
8 | 8 | } |
9 | 9 | |
10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
12 | 12 | PhpXmlRpc\Autoloader::register(); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | } |
9 | 9 | |
10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
12 | 12 | PhpXmlRpc\Autoloader::register(); |
13 | 13 | |
14 | 14 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
19 | 19 | |
20 | -include __DIR__ . '/common.php'; |
|
20 | +include __DIR__.'/common.php'; |
|
21 | 21 | if ($action == '') { |
22 | 22 | $action = 'list'; |
23 | 23 | } |
@@ -33,27 +33,27 @@ discard block |
||
33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or |
34 | 34 | /// relative to this debugger's folder. |
35 | 35 | if (defined('JSXMLRPC_PATH')) { |
36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
37 | 37 | } else { |
38 | 38 | $editorpaths = array( |
39 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | - __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger |
|
42 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
43 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
44 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
45 | - __DIR__ . '/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm |
|
39 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger |
|
42 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
43 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
44 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
45 | + __DIR__.'/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm |
|
46 | 46 | ); |
47 | 47 | } |
48 | - foreach($editorpaths as $editorpath) { |
|
49 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
48 | + foreach ($editorpaths as $editorpath) { |
|
49 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
50 | 50 | $haseditor = true; |
51 | 51 | break; |
52 | 52 | } |
53 | 53 | } |
54 | 54 | if ($haseditor) { |
55 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
56 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
55 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
56 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
57 | 57 | /// @todo for cases above 4, 5 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
58 | 58 | /// at this folder, as in that case the link to the visualeditor will not |
59 | 59 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } |
224 | 224 | |
225 | 225 | function activateeditor() { |
226 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
226 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
227 | 227 | if (document.frmaction.wstype.value == "1") |
228 | 228 | url += '&type=jsonrpc'; |
229 | 229 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -260,9 +260,9 @@ discard block |
||
260 | 260 | echo ' document.forms[2].submit();'; |
261 | 261 | } ?>"> |
262 | 262 | <h1>XML-RPC |
263 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
263 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
264 | 264 | / |
265 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
265 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
266 | 266 | JSON-RPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>) |
267 | 267 | </h1> |
268 | 268 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | </select> |
326 | 326 | </td> |
327 | 327 | <td class="labelcell">Timeout:</td> |
328 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
328 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
329 | 329 | <td></td> |
330 | 330 | <td></td> |
331 | 331 | </tr> |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | |
47 | 47 | // read chunk-size, chunk-extension (if any) and crlf |
48 | 48 | // get the position of the linebreak |
49 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
49 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
50 | 50 | $temp = substr($buffer, 0, $chunkEnd); |
51 | 51 | $chunkSize = hexdec(trim($temp)); |
52 | 52 | $chunkStart = $chunkEnd; |
53 | - while ($chunkSize > 0) { |
|
54 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
53 | + while ($chunkSize>0) { |
|
54 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
55 | 55 | |
56 | 56 | // just in case we got a broken connection |
57 | 57 | if ($chunkEnd == false) { |
@@ -63,19 +63,19 @@ discard block |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // read chunk-data and crlf |
66 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
66 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
67 | 67 | // append chunk-data to entity-body |
68 | 68 | $new .= $chunk; |
69 | 69 | // length := length + chunk-size |
70 | 70 | $length += strlen($chunk); |
71 | 71 | // read chunk-size and crlf |
72 | - $chunkStart = $chunkEnd + 2; |
|
72 | + $chunkStart = $chunkEnd+2; |
|
73 | 73 | |
74 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
74 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
75 | 75 | if ($chunkEnd == false) { |
76 | 76 | break; // just in case we got a broken connection |
77 | 77 | } |
78 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
78 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
79 | 79 | $chunkSize = hexdec(trim($temp)); |
80 | 80 | $chunkStart = $chunkEnd; |
81 | 81 | } |
@@ -104,11 +104,11 @@ discard block |
||
104 | 104 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
105 | 105 | $pos = strpos($data, "\r\n\r\n"); |
106 | 106 | if ($pos || is_int($pos)) { |
107 | - $bd = $pos + 4; |
|
107 | + $bd = $pos+4; |
|
108 | 108 | } else { |
109 | 109 | $pos = strpos($data, "\n\n"); |
110 | 110 | if ($pos || is_int($pos)) { |
111 | - $bd = $pos + 2; |
|
111 | + $bd = $pos+2; |
|
112 | 112 | } else { |
113 | 113 | // No separation between response headers and body: fault? |
114 | 114 | $bd = 0; |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
119 | 119 | $data = substr($data, $bd); |
120 | 120 | } else { |
121 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
122 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
121 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
122 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | |
@@ -152,19 +152,19 @@ discard block |
||
152 | 152 | } |
153 | 153 | |
154 | 154 | if ($httpResponse['status_code'] !== '200') { |
155 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
156 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
157 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
155 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
156 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
157 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
161 | 161 | $pos = strpos($data, "\r\n\r\n"); |
162 | 162 | if ($pos || is_int($pos)) { |
163 | - $bd = $pos + 4; |
|
163 | + $bd = $pos+4; |
|
164 | 164 | } else { |
165 | 165 | $pos = strpos($data, "\n\n"); |
166 | 166 | if ($pos || is_int($pos)) { |
167 | - $bd = $pos + 2; |
|
167 | + $bd = $pos+2; |
|
168 | 168 | } else { |
169 | 169 | // No separation between response headers and body: fault? |
170 | 170 | // we could take some action here instead of going on... |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | foreach ($ar as $line) { |
179 | 179 | // take care of multi-line headers and cookies |
180 | 180 | $arr = explode(':', $line, 2); |
181 | - if (count($arr) > 1) { |
|
181 | + if (count($arr)>1) { |
|
182 | 182 | $headerName = strtolower(trim($arr[0])); |
183 | 183 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
184 | 184 | /// passed using multiple header lines. |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | foreach ($cookies as $cookie) { |
196 | 196 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
197 | 197 | if (isset($httpResponse['headers'][$headerName])) { |
198 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
198 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
199 | 199 | } else { |
200 | 200 | $httpResponse['headers'][$headerName] = trim($cookie); |
201 | 201 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | } |
225 | 225 | } elseif (isset($headerName)) { |
226 | 226 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
227 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
227 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | // Decode chunked encoding sent by http 1.1 servers |
248 | 248 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
249 | 249 | if (!$data = static::decodeChunked($data)) { |
250 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
250 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
251 | 251 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
252 | 252 | } |
253 | 253 | } |
@@ -262,19 +262,19 @@ discard block |
||
262 | 262 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
263 | 263 | $data = $degzdata; |
264 | 264 | if ($debug) { |
265 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
265 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
266 | 266 | } |
267 | 267 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
268 | 268 | $data = $degzdata; |
269 | 269 | if ($debug) { |
270 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
270 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
271 | 271 | } |
272 | 272 | } else { |
273 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
273 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
274 | 274 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
275 | 275 | } |
276 | 276 | } else { |
277 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
277 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
278 | 278 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
279 | 279 | } |
280 | 280 | } |
@@ -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 ">": |