@@ -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> |
@@ -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 ">": |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | */ |
240 | 240 | public static function xmlrpc_debugmsg($msg) |
241 | 241 | { |
242 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
242 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | */ |
252 | 252 | public static function error_occurred($msg) |
253 | 253 | { |
254 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
254 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
273 | 273 | $out = ''; |
274 | 274 | if ($this->debug_info != '') { |
275 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
275 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
276 | 276 | } |
277 | 277 | if (static::$_xmlrpc_debuginfo != '') { |
278 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
278 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
279 | 279 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
280 | 280 | // into return payload AFTER the beginning tag |
281 | 281 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -304,8 +304,8 @@ discard block |
||
304 | 304 | $this->debug_info = ''; |
305 | 305 | |
306 | 306 | // Save what we received, before parsing it |
307 | - if ($this->debug > 1) { |
|
308 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
307 | + if ($this->debug>1) { |
|
308 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -321,21 +321,21 @@ discard block |
||
321 | 321 | $resp->raw_data = $rawData; |
322 | 322 | } |
323 | 323 | |
324 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
325 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
326 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
324 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
325 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
326 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
327 | 327 | } |
328 | 328 | |
329 | 329 | $payload = $this->xml_header($respCharset); |
330 | - if ($this->debug > 0) { |
|
331 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
330 | + if ($this->debug>0) { |
|
331 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | // Do not create response serialization if it has already happened. Helps to build json magic |
335 | 335 | if (empty($resp->payload)) { |
336 | 336 | $resp->serialize($respCharset); |
337 | 337 | } |
338 | - $payload = $payload . $resp->payload; |
|
338 | + $payload = $payload.$resp->payload; |
|
339 | 339 | |
340 | 340 | if ($returnPayload) { |
341 | 341 | return $payload; |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | // if we get a warning/error that has output some text before here, then we cannot |
345 | 345 | // add a new header. We cannot say we are sending xml, either... |
346 | 346 | if (!headers_sent()) { |
347 | - header('Content-Type: ' . $resp->content_type); |
|
347 | + header('Content-Type: '.$resp->content_type); |
|
348 | 348 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
349 | 349 | header("Vary: Accept-Charset"); |
350 | 350 | |
@@ -367,10 +367,10 @@ discard block |
||
367 | 367 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
368 | 368 | // responses up to 8000 bytes |
369 | 369 | if ($phpNoSelfCompress) { |
370 | - header('Content-Length: ' . (int)strlen($payload)); |
|
370 | + header('Content-Length: '.(int) strlen($payload)); |
|
371 | 371 | } |
372 | 372 | } else { |
373 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
373 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
374 | 374 | } |
375 | 375 | |
376 | 376 | print $payload; |
@@ -428,9 +428,9 @@ discard block |
||
428 | 428 | $numParams = count($in); |
429 | 429 | } |
430 | 430 | foreach ($sigs as $curSig) { |
431 | - if (count($curSig) == $numParams + 1) { |
|
431 | + if (count($curSig) == $numParams+1) { |
|
432 | 432 | $itsOK = 1; |
433 | - for ($n = 0; $n < $numParams; $n++) { |
|
433 | + for ($n = 0; $n<$numParams; $n++) { |
|
434 | 434 | if (is_object($in)) { |
435 | 435 | $p = $in->getParam($n); |
436 | 436 | if ($p->kindOf() == 'scalar') { |
@@ -443,10 +443,10 @@ discard block |
||
443 | 443 | } |
444 | 444 | |
445 | 445 | // param index is $n+1, as first member of sig is return type |
446 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
446 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
447 | 447 | $itsOK = 0; |
448 | - $pno = $n + 1; |
|
449 | - $wanted = $curSig[$n + 1]; |
|
448 | + $pno = $n+1; |
|
449 | + $wanted = $curSig[$n+1]; |
|
450 | 450 | $got = $pt; |
451 | 451 | break; |
452 | 452 | } |
@@ -473,10 +473,10 @@ discard block |
||
473 | 473 | // check if $_SERVER is populated: it might have been disabled via ini file |
474 | 474 | // (this is true even when in CLI mode) |
475 | 475 | if (count($_SERVER) == 0) { |
476 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
476 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
477 | 477 | } |
478 | 478 | |
479 | - if ($this->debug > 1) { |
|
479 | + if ($this->debug>1) { |
|
480 | 480 | if (function_exists('getallheaders')) { |
481 | 481 | $this->debugmsg(''); // empty line |
482 | 482 | foreach (getallheaders() as $name => $val) { |
@@ -501,13 +501,13 @@ discard block |
||
501 | 501 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
502 | 502 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
503 | 503 | $data = $degzdata; |
504 | - if ($this->debug > 1) { |
|
505 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
504 | + if ($this->debug>1) { |
|
505 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
506 | 506 | } |
507 | 507 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
508 | 508 | $data = $degzdata; |
509 | - if ($this->debug > 1) { |
|
510 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
509 | + if ($this->debug>1) { |
|
510 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
511 | 511 | } |
512 | 512 | } else { |
513 | 513 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | if ($reqEncoding == 'ISO-8859-1') { |
600 | 600 | $data = utf8_encode($data); |
601 | 601 | } else { |
602 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
602 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
603 | 603 | } |
604 | 604 | } |
605 | 605 | } |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
627 | 627 | return new Response( |
628 | 628 | 0, |
629 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
629 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
630 | 630 | $xmlRpcParser->_xh['isf_reason']); |
631 | 631 | } elseif ($xmlRpcParser->_xh['isf']) { |
632 | 632 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc, |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | return new Response( |
635 | 635 | 0, |
636 | 636 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
637 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
637 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
638 | 638 | } else { |
639 | 639 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
640 | 640 | // this, but in the most common scenario (xmlrpc values type server with some methods registered as phpvals) |
@@ -644,20 +644,20 @@ discard block |
||
644 | 644 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
645 | 645 | ) |
646 | 646 | ) { |
647 | - if ($this->debug > 1) { |
|
648 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
647 | + if ($this->debug>1) { |
|
648 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
649 | 649 | } |
650 | 650 | |
651 | 651 | return $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
652 | 652 | } else { |
653 | 653 | // build a Request object with data parsed from xml and add parameters in |
654 | 654 | $req = new Request($xmlRpcParser->_xh['method']); |
655 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
655 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
656 | 656 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
657 | 657 | } |
658 | 658 | |
659 | - if ($this->debug > 1) { |
|
660 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
659 | + if ($this->debug>1) { |
|
660 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
661 | 661 | } |
662 | 662 | |
663 | 663 | return $this->execute($req); |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | return new Response( |
710 | 710 | 0, |
711 | 711 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
712 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
712 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
713 | 713 | ); |
714 | 714 | } |
715 | 715 | } |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | // build string representation of function 'name' |
725 | 725 | if (is_array($func)) { |
726 | 726 | if (is_object($func[0])) { |
727 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
727 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
728 | 728 | } else { |
729 | 729 | $funcName = implode('::', $func); |
730 | 730 | } |
@@ -736,17 +736,17 @@ discard block |
||
736 | 736 | |
737 | 737 | // verify that function to be invoked is in fact callable |
738 | 738 | if (!is_callable($func)) { |
739 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
739 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
740 | 740 | return new Response( |
741 | 741 | 0, |
742 | 742 | PhpXmlRpc::$xmlrpcerr['server_error'], |
743 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
743 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
744 | 744 | ); |
745 | 745 | } |
746 | 746 | |
747 | 747 | // If debug level is 3, we should catch all errors generated during processing of user function, and log them |
748 | 748 | // as part of response |
749 | - if ($this->debug > 2) { |
|
749 | + if ($this->debug>2) { |
|
750 | 750 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
751 | 751 | } |
752 | 752 | |
@@ -760,14 +760,14 @@ discard block |
||
760 | 760 | $r = call_user_func($func, $req); |
761 | 761 | } |
762 | 762 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
763 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
763 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
764 | 764 | if (is_a($r, 'PhpXmlRpc\Value')) { |
765 | 765 | $r = new Response($r); |
766 | 766 | } else { |
767 | 767 | $r = new Response( |
768 | 768 | 0, |
769 | 769 | PhpXmlRpc::$xmlrpcerr['server_error'], |
770 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
770 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
771 | 771 | ); |
772 | 772 | } |
773 | 773 | } |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
783 | 783 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
784 | 784 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
785 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
785 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
786 | 786 | } else { |
787 | 787 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
788 | 788 | // return type correctly |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | // proper error-response |
807 | 807 | switch ($this->exception_handling) { |
808 | 808 | case 2: |
809 | - if ($this->debug > 2) { |
|
809 | + if ($this->debug>2) { |
|
810 | 810 | if (self::$_xmlrpcs_prev_ehandler) { |
811 | 811 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
812 | 812 | } else { |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | // proper error-response |
830 | 830 | switch ($this->exception_handling) { |
831 | 831 | case 2: |
832 | - if ($this->debug > 2) { |
|
832 | + if ($this->debug>2) { |
|
833 | 833 | if (self::$_xmlrpcs_prev_ehandler) { |
834 | 834 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
835 | 835 | } else { |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | } |
850 | 850 | } |
851 | 851 | |
852 | - if ($this->debug > 2) { |
|
852 | + if ($this->debug>2) { |
|
853 | 853 | // note: restore the error handler we found before calling the user func, even if it has been changed |
854 | 854 | // inside the func itself |
855 | 855 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -915,7 +915,7 @@ discard block |
||
915 | 915 | */ |
916 | 916 | protected function debugmsg($string) |
917 | 917 | { |
918 | - $this->debug_info .= $string . "\n"; |
|
918 | + $this->debug_info .= $string."\n"; |
|
919 | 919 | } |
920 | 920 | |
921 | 921 | /** |
@@ -925,9 +925,9 @@ discard block |
||
925 | 925 | protected function xml_header($charsetEncoding = '') |
926 | 926 | { |
927 | 927 | if ($charsetEncoding != '') { |
928 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
928 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
929 | 929 | } else { |
930 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
930 | + return "<?xml version=\"1.0\"?".">\n"; |
|
931 | 931 | } |
932 | 932 | } |
933 | 933 | |
@@ -1199,7 +1199,7 @@ discard block |
||
1199 | 1199 | $i++; // for error message, we count params from 1 |
1200 | 1200 | return static::_xmlrpcs_multicall_error(new Response(0, |
1201 | 1201 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
1202 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
1202 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
1203 | 1203 | } |
1204 | 1204 | } |
1205 | 1205 | |
@@ -1280,7 +1280,7 @@ discard block |
||
1280 | 1280 | } |
1281 | 1281 | } else { |
1282 | 1282 | $numCalls = count($req); |
1283 | - for ($i = 0; $i < $numCalls; $i++) { |
|
1283 | + for ($i = 0; $i<$numCalls; $i++) { |
|
1284 | 1284 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
1285 | 1285 | } |
1286 | 1286 | } |