git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ArrayIterator interface implementation; remove usage of arraysize(), structsize...
[plcapi.git]
/
src
/
Wrapper.php
diff --git
a/src/Wrapper.php
b/src/Wrapper.php
index
21321a6
..
10aae52
100644
(file)
--- a/
src/Wrapper.php
+++ b/
src/Wrapper.php
@@
-280,10
+280,10
@@
class Wrapper
$desc .= $doc;
} elseif (strpos($doc, '@param') === 0) {
// syntax: @param type $name [desc]
$desc .= $doc;
} elseif (strpos($doc, '@param') === 0) {
// syntax: @param type $name [desc]
- if (preg_match('/@param\s+(\S+)\s+(\$\S+)\s
+
(.+)?/', $doc, $matches)) {
+ if (preg_match('/@param\s+(\S+)\s+(\$\S+)\s
*
(.+)?/', $doc, $matches)) {
$name = strtolower(trim($matches[2]));
//$paramDocs[$name]['name'] = trim($matches[2]);
$name = strtolower(trim($matches[2]));
//$paramDocs[$name]['name'] = trim($matches[2]);
- $paramDocs[$name]['doc'] =
$matches[3]
;
+ $paramDocs[$name]['doc'] =
isset($matches[3]) ? $matches[3] : ''
;
$paramDocs[$name]['type'] = $matches[1];
}
$i++;
$paramDocs[$name]['type'] = $matches[1];
}
$i++;
@@
-822,7
+822,7
@@
class Wrapper
$decodeOptions[] = 'decode_php_objs';
}
$decodeOptions[] = 'decode_php_objs';
}
- /// @todo check for insufficient nr. of args besides excess ones
+ /// @todo check for insufficient nr. of args besides excess ones
? note that 'source' version does not...
// support one extra parameter: debug
$maxArgs = count($mSig)-1; // 1st element is the return type
// support one extra parameter: debug
$maxArgs = count($mSig)-1; // 1st element is the return type
@@
-835,7
+835,6
@@
class Wrapper
$xmlrpcArgs = array();
foreach($currentArgs as $i => $arg) {
if ($i == $maxArgs) {
$xmlrpcArgs = array();
foreach($currentArgs as $i => $arg) {
if ($i == $maxArgs) {
- /// @todo log warning? check what happens with the 'source' version
break;
}
$pType = $mSig[$i+1];
break;
}
$pType = $mSig[$i+1];
@@
-882,7
+881,7
@@
class Wrapper
* @param string $mDesc
* @return array
*/
* @param string $mDesc
* @return array
*/
- p
rotected
function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='')
+ p
ublic
function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='')
{
$timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
$protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
{
$timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
$protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';