diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-09-27 15:25:10 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-09-27 15:25:10 +0000 |
| commit | 4329db25a1226593e31fba9d9395a19bbefa522c (patch) | |
| tree | 14bfd7ce84ebd050155c4008eaf290592df2c6c3 /ext | |
| parent | 72857b6dbb52d372af1cb51cb303b6f72e9dca01 (diff) | |
| download | php-git-4329db25a1226593e31fba9d9395a19bbefa522c.tar.gz | |
Fixed bug #34643 (wsdl default value has no effect)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/soap/soap.c | 12 | ||||
| -rwxr-xr-x | ext/soap/tests/bugs/bug34643.phpt | 46 | ||||
| -rwxr-xr-x | ext/soap/tests/bugs/bug34643.wsdl | 42 |
3 files changed, 100 insertions, 0 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index aaec8d9f4d..fe4343346e 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -4018,9 +4018,21 @@ static xmlNodePtr serialize_zval(zval *val, sdlParamPtr param, char *paramName, { xmlNodePtr xmlParam; encodePtr enc; + zval defval; if (param != NULL) { enc = param->encode; + if (val == NULL || Z_TYPE_P(val) == IS_NULL) { + if (param->element) { + if (param->element->fixed) { + ZVAL_STRING(&defval, param->element->fixed, 0); + val = &defval; + } else if (param->element->def && !param->element->nillable) { + ZVAL_STRING(&defval, param->element->def, 0); + val = &defval; + } + } + } } else { enc = NULL; } diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt new file mode 100755 index 0000000000..b8c92e281b --- /dev/null +++ b/ext/soap/tests/bugs/bug34643.phpt @@ -0,0 +1,46 @@ +--TEST-- +Bug #34643 (wsdl default value) +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--INI-- +soap.wsdl_cache_enabled=0 +--FILE-- +<?php +ini_set("soap.wsdl_cache_enabled", 0); + +class fp { + public function get_it($opt="zzz") { + return $opt; + } +} + +class LocalSoapClient extends SoapClient { + + function __construct($wsdl, $options) { + parent::__construct($wsdl, $options); + $this->server = new SoapServer($wsdl, $options); + $this->server->setClass('fp'); + } + + function __doRequest($request, $location, $action, $version) { + ob_start(); + $this->server->handle($request); + $response = ob_get_contents(); + ob_end_clean(); + return $response; + } + +} + +$cl = new LocalSoapClient(dirname(__FILE__).'/bug34643.wsdl', array("trace"=>1)); +print_r($cl->__getFunctions()); +echo $cl->get_it("aaa")."\n"; +echo $cl->get_it()."\n"; +?> +--EXPECT-- +Array +( + [0] => string get_it(string $opt) +) +aaa +zzz diff --git a/ext/soap/tests/bugs/bug34643.wsdl b/ext/soap/tests/bugs/bug34643.wsdl new file mode 100755 index 0000000000..24c3a50828 --- /dev/null +++ b/ext/soap/tests/bugs/bug34643.wsdl @@ -0,0 +1,42 @@ +<?xml version='1.0' encoding='UTF-8'?>
+<definitions name="wsdl" targetNamespace="urn:wsdl"
+xmlns:typens="urn:wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:wsdl">
+ <xsd:element name="opt" type="xsd:string" default="zzz" />
+ </xsd:schema>
+ </types>
+ <message name="get_it">
+ <part name="opt" element="typens:opt"/>
+ </message>
+ <message name="get_itResponse">
+ <part name="return" type="xsd:string"/>
+ </message>
+ <portType name="fpPortType">
+ <operation name="get_it">
+ <input message="typens:get_it"/>
+ <output message="typens:get_itResponse"/>
+ </operation>
+ </portType>
+ <binding name="fpBinding" type="typens:fpPortType">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="get_it">
+ <soap:operation soapAction="urn:fpAction"/>
+ <input>
+ <soap:body namespace="urn:wsdl" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </input>
+ <output>
+ <soap:body namespace="urn:wsdl" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="wsdlService">
+ <port name="fpPort" binding="typens:fpBinding">
+ <soap:address location="**********"/>
+ </port>
+ </service>
+</definitions>
|