cvs: pear /SOAP Server.php package.xml

yunosh Fri May 27 18:42:43 2005 EDT Modified files: /pear/SOAP Server.php package.xml Log: Fix PEAR bug #2694 - don't use return element for single, simple return values. http://cvs.php.net/diff.php/pear/SOAP/Server.php?r1=1.53&r2=1.54&ty=u Index: pear/SOAP/Server.php diff -u pear/SOAP/Server.php:1.53 pear/SOAP/Server.php:1.54 --- pear/SOAP/Server.php:1.53 Thu May 26 16:51:37 2005 +++ pear/SOAP/Server.php Fri May 27 18:42:42 2005 @@ -17,7 +17,7 @@ // | Authors: Dietrich Ayala <dietrich@ganx4.com> Original Author | // +----------------------------------------------------------------------+ // -// $Id: Server.php,v 1.53 2005/05/26 20:51:37 yunosh Exp $ +// $Id: Server.php,v 1.54 2005/05/27 22:42:42 yunosh Exp $ // require_once 'SOAP/Base.php'; @@ -556,7 +556,7 @@ /* If there are input parameters required. */ if ($sig = $map['in']) { $this->input_value = count($sig); - $this->return_type = $this->getReturnType($map['out']); + $this->return_type = is_array($map['out']) ? $map['out'] : false; if (is_array($params)) { /* Validate the number of parameters. */ if (count($params) == count($sig)) { @@ -598,21 +598,6 @@ return true; } - /** - * Returns string return type from dispatch map. - */ - function getReturnType($returndata) - { - if (is_array($returndata)) { - if (count($returndata) > 1) { - return $returndata; - } - $type = array_shift($returndata); - return $type; - } - return false; - } - function validateMethod($methodname, $namespace = null) { unset($this->soapobject); http://cvs.php.net/diff.php/pear/SOAP/package.xml?r1=1.59&r2=1.60&ty=u Index: pear/SOAP/package.xml diff -u pear/SOAP/package.xml:1.59 pear/SOAP/package.xml:1.60 --- pear/SOAP/package.xml:1.59 Thu May 26 18:26:17 2005 +++ pear/SOAP/package.xml Fri May 27 18:42:42 2005 @@ -84,6 +84,9 @@ userland code. - Fix PEAR bug #1657 - create WSDL element in the correct order. + + - Fix PEAR bug #2694 - don't use return element for single, simple + return values. </notes> <filelist> <dir name="/" baseinstalldir="SOAP">