cvs: php-src(PHP_5_0) /ext/soap php_encoding.c php_encoding.h php_schema.c /ext/soap/tests/schema schema037.phpt schema038.phpt schema039.phpt
schema040.phpt schema042.phpt schema043.phpt schema044.phpt schema045.phpt schema046.phpt schema047.phpt schema048.phpt schema062.phpt schema065.phpt
schema066.phpt schema067.phpt schema069.phpt schema070.phpt test_schema.inc
| From: | George Schlossnagle | Date: | Fri, 15 Apr 2005 06:53:08 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/soap php_encoding.c php_encoding.h php_schema.c /ext/soap/tests/schema schema037.phpt schema038.phpt schema039.phpt schema040.phpt schema042.phpt schema043.phpt schema044.phpt schema045.phpt schema046.phpt schema047.phpt schema048.phpt schema062.phpt schema065.phpt schema066.phpt schema067.phpt schema069.phpt schema070.phpt test_schema.inc |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31399@lists.php.net to get a copy of this message | ||
gschlossnagle Fri Apr 15 02:53:08 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/soap php_encoding.c php_encoding.h php_schema.c
/php-src/ext/soap/tests/schema schema037.phpt schema038.phpt
schema039.phpt schema040.phpt
schema042.phpt schema043.phpt
schema044.phpt schema045.phpt
schema046.phpt schema047.phpt
schema048.phpt schema062.phpt
schema065.phpt schema066.phpt
schema067.phpt schema069.phpt
schema070.phpt test_schema.inc
Log:
MFH - import correct handling of attribute's namespacing (broken in 5.0.4)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.16&r2=1.71.2.17&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.71.2.16 php-src/ext/soap/php_encoding.c:1.71.2.17 --- php-src/ext/soap/php_encoding.c:1.71.2.16 Tue Mar 29 08:14:56 2005 +++ php-src/ext/soap/php_encoding.c Fri Apr 15 02:53:04 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.71.2.16 2005/03/29 13:14:56 zeev Exp $ */ +/* $Id: php_encoding.c,v 1.71.2.17 2005/04/15 06:53:04 gschlossnagle Exp $ */ #include <time.h> @@ -1479,11 +1479,11 @@ if ((*attr)->fixed && strcmp((*attr)->fixed,dummy->children->content) != 0) { soap_error3(E_ERROR, "Encoding: Attribute '%s' has fixed value '%s' (value '%s' is not allowed)", (*attr)->name, (*attr)->fixed, dummy->children->content); } - if ((*attr)->namens) { -/* - if ((*attr)->namens && - (type->ns == NULL || strcmp((*attr)->namens, type->ns))) { -*/ + /* we need to handle xml: namespace specially, since it is + an implicit schema. Otherwise, use form. + */ + if ((!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || + ((*attr)->form == XSD_FORM_QUALIFIED)) && (*attr)->namens) { xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)->namens); xmlSetNsProp(xmlParam, nsp, (*attr)->name, dummy->children->content); http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.h?r1=1.35.2.2&r2=1.35.2.3&ty=u Index: php-src/ext/soap/php_encoding.h diff -u php-src/ext/soap/php_encoding.h:1.35.2.2 php-src/ext/soap/php_encoding.h:1.35.2.3 --- php-src/ext/soap/php_encoding.h:1.35.2.2 Tue Mar 22 05:18:47 2005 +++ php-src/ext/soap/php_encoding.h Fri Apr 15 02:53:04 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.h,v 1.35.2.2 2005/03/22 10:18:47 dmitry Exp $ */ +/* $Id: php_encoding.h,v 1.35.2.3 2005/04/15 06:53:04 gschlossnagle Exp $ */ #ifndef PHP_ENCODING_H #define PHP_ENCODING_H http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.49.2.3&r2=1.49.2.4&ty=u Index: php-src/ext/soap/php_schema.c diff -u php-src/ext/soap/php_schema.c:1.49.2.3 php-src/ext/soap/php_schema.c:1.49.2.4 --- php-src/ext/soap/php_schema.c:1.49.2.3 Tue Mar 22 05:18:47 2005 +++ php-src/ext/soap/php_schema.c Fri Apr 15 02:53:05 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_schema.c,v 1.49.2.3 2005/03/22 10:18:47 dmitry Exp $ */ +/* $Id: php_schema.c,v 1.49.2.4 2005/04/15 06:53:05 gschlossnagle Exp $ */ #include "php_soap.h" #include "libxml/uri.h" @@ -1397,7 +1397,6 @@ { xmlNodePtr trav; xmlAttrPtr attrs, name, ns; - TSRMLS_FETCH(); attrs = compType->properties; ns = get_attribute(attrs, "targetNamespace"); @@ -1891,7 +1890,25 @@ } attr = attr->next; } - + if(newAttr->form == XSD_FORM_DEFAULT) { + xmlNodePtr parent = attrType->parent; + while(parent) { + if(node_is_equal_ex(parent, "schema", SCHEMA_NAMESPACE)) { + xmlAttrPtr def; + def = get_attribute(parent->properties, "attributeFormDefault"); + if(def == NULL || strncmp(def->children->content, "qualified", sizeof("qualified"))) { + newAttr->form = XSD_FORM_UNQUALIFIED; + } else { + newAttr->form = XSD_FORM_QUALIFIED; + } + break; + } + parent = parent->parent; + } + if(parent == NULL) { + newAttr->form = XSD_FORM_UNQUALIFIED; + } + } trav = attrType->children; if (trav != NULL && node_is_equal(trav, "annotation")) { /* TODO: <annotation> support */ http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema037.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema037.phpt diff -u php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema037.phpt Fri Apr 15 02:53:07 2005 @@ -18,7 +18,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema038.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema038.phpt diff -u php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema038.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema039.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema039.phpt diff -u php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema039.phpt Fri Apr 15 02:53:07 2005 @@ -21,7 +21,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema040.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema040.phpt diff -u php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema040.phpt Fri Apr 15 02:53:07 2005 @@ -22,7 +22,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema042.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema042.phpt diff -u php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema042.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema043.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema043.phpt diff -u php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema043.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (3) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema044.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema044.phpt diff -u php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema044.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema045.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema045.phpt diff -u php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema045.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema046.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema046.phpt diff -u php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema046.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (3) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema047.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema047.phpt diff -u php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema047.phpt Fri Apr 15 02:53:07 2005 @@ -24,7 +24,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["int"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema048.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema048.phpt diff -u php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema048.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema062.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema062.phpt diff -u php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema062.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="1" ns1:int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="1" int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> NULL http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema065.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema065.phpt diff -u php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema065.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema066.phpt?r1=1.2.2.2&r2=1.2.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema066.phpt diff -u php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.2 php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.3 --- php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema066.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema067.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema067.phpt diff -u php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema067.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" ns1:int="5" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" int="5" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema069.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema069.phpt diff -u php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema069.phpt Fri Apr 15 02:53:07 2005 @@ -17,7 +17,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema070.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema070.phpt diff -u php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema070.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/test_schema.inc?r1=1.6.2.2&r2=1.6.2.3&ty=u Index: php-src/ext/soap/tests/schema/test_schema.inc diff -u php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.2 php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.3 --- php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.2 Mon Mar 21 10:53:32 2005 +++ php-src/ext/soap/tests/schema/test_schema.inc Fri Apr 15 02:53:07 2005 @@ -6,7 +6,7 @@ $val = $input; } -function test_schema($schema,$type,$param,$style="rpc",$use="encoded") { +function test_schema($schema,$type,$param,$style="rpc",$use="encoded", $attributeFormDefault='') { global $HTTP_RAW_POST_DATA, $val; $wsdl = <<<EOF <definitions name="InteropTest" @@ -16,9 +16,10 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" - targetNamespace="http://test-uri/"> + targetNamespace="http://test-uri/" + > <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/" $attributeFormDefault> <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" /> $schema @@ -53,7 +54,7 @@ $f = fopen($fname,"w"); fwrite($f,$wsdl); fclose($f); - ini_set("soap.wsdl_cache_enabled",0); + ini_set("soap.wsdl_cache_enabled",0); $x = new SoapClient($fname, array("trace"=>1,"exceptions"=>0)); $y = new SoapServer($fname); $y->addfunction("test"); @@ -73,4 +74,4 @@ echo $req; } } -?> \ No newline at end of file +?>
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.16&r2=1.71.2.17&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.71.2.16 php-src/ext/soap/php_encoding.c:1.71.2.17 --- php-src/ext/soap/php_encoding.c:1.71.2.16 Tue Mar 29 08:14:56 2005 +++ php-src/ext/soap/php_encoding.c Fri Apr 15 02:53:04 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.71.2.16 2005/03/29 13:14:56 zeev Exp $ */ +/* $Id: php_encoding.c,v 1.71.2.17 2005/04/15 06:53:04 gschlossnagle Exp $ */ #include <time.h> @@ -1479,11 +1479,11 @@ if ((*attr)->fixed && strcmp((*attr)->fixed,dummy->children->content) != 0) { soap_error3(E_ERROR, "Encoding: Attribute '%s' has fixed value '%s' (value '%s' is not allowed)", (*attr)->name, (*attr)->fixed, dummy->children->content); } - if ((*attr)->namens) { -/* - if ((*attr)->namens && - (type->ns == NULL || strcmp((*attr)->namens, type->ns))) { -*/ + /* we need to handle xml: namespace specially, since it is + an implicit schema. Otherwise, use form. + */ + if ((!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || + ((*attr)->form == XSD_FORM_QUALIFIED)) && (*attr)->namens) { xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)->namens); xmlSetNsProp(xmlParam, nsp, (*attr)->name, dummy->children->content); http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.h?r1=1.35.2.2&r2=1.35.2.3&ty=u Index: php-src/ext/soap/php_encoding.h diff -u php-src/ext/soap/php_encoding.h:1.35.2.2 php-src/ext/soap/php_encoding.h:1.35.2.3 --- php-src/ext/soap/php_encoding.h:1.35.2.2 Tue Mar 22 05:18:47 2005 +++ php-src/ext/soap/php_encoding.h Fri Apr 15 02:53:04 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.h,v 1.35.2.2 2005/03/22 10:18:47 dmitry Exp $ */ +/* $Id: php_encoding.h,v 1.35.2.3 2005/04/15 06:53:04 gschlossnagle Exp $ */ #ifndef PHP_ENCODING_H #define PHP_ENCODING_H http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.49.2.3&r2=1.49.2.4&ty=u Index: php-src/ext/soap/php_schema.c diff -u php-src/ext/soap/php_schema.c:1.49.2.3 php-src/ext/soap/php_schema.c:1.49.2.4 --- php-src/ext/soap/php_schema.c:1.49.2.3 Tue Mar 22 05:18:47 2005 +++ php-src/ext/soap/php_schema.c Fri Apr 15 02:53:05 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_schema.c,v 1.49.2.3 2005/03/22 10:18:47 dmitry Exp $ */ +/* $Id: php_schema.c,v 1.49.2.4 2005/04/15 06:53:05 gschlossnagle Exp $ */ #include "php_soap.h" #include "libxml/uri.h" @@ -1397,7 +1397,6 @@ { xmlNodePtr trav; xmlAttrPtr attrs, name, ns; - TSRMLS_FETCH(); attrs = compType->properties; ns = get_attribute(attrs, "targetNamespace"); @@ -1891,7 +1890,25 @@ } attr = attr->next; } - + if(newAttr->form == XSD_FORM_DEFAULT) { + xmlNodePtr parent = attrType->parent; + while(parent) { + if(node_is_equal_ex(parent, "schema", SCHEMA_NAMESPACE)) { + xmlAttrPtr def; + def = get_attribute(parent->properties, "attributeFormDefault"); + if(def == NULL || strncmp(def->children->content, "qualified", sizeof("qualified"))) { + newAttr->form = XSD_FORM_UNQUALIFIED; + } else { + newAttr->form = XSD_FORM_QUALIFIED; + } + break; + } + parent = parent->parent; + } + if(parent == NULL) { + newAttr->form = XSD_FORM_UNQUALIFIED; + } + } trav = attrType->children; if (trav != NULL && node_is_equal(trav, "annotation")) { /* TODO: <annotation> support */ http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema037.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema037.phpt diff -u php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema037.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema037.phpt Fri Apr 15 02:53:07 2005 @@ -18,7 +18,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema038.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema038.phpt diff -u php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema038.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema038.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema039.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema039.phpt diff -u php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema039.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema039.phpt Fri Apr 15 02:53:07 2005 @@ -21,7 +21,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema040.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema040.phpt diff -u php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema040.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema040.phpt Fri Apr 15 02:53:07 2005 @@ -22,7 +22,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int="123" xsi:type="ns1:testType"><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema042.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema042.phpt diff -u php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema042.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema042.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema043.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema043.phpt diff -u php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema043.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema043.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (3) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema044.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema044.phpt diff -u php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema044.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema044.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema045.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema045.phpt diff -u php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema045.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema045.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema046.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema046.phpt diff -u php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema046.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema046.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int="123" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (3) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema047.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema047.phpt diff -u php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema047.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema047.phpt Fri Apr 15 02:53:07 2005 @@ -24,7 +24,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["int"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema048.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema048.phpt diff -u php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema048.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema048.phpt Fri Apr 15 02:53:07 2005 @@ -26,7 +26,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" ns1:int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> int(123) http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema062.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema062.phpt diff -u php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema062.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="1" ns1:int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="1" int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> NULL http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema065.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema065.phpt diff -u php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema065.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema065.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema066.phpt?r1=1.2.2.2&r2=1.2.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema066.phpt diff -u php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.2 php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.3 --- php-src/ext/soap/tests/schema/schema066.phpt:1.2.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema066.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema067.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema067.phpt diff -u php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema067.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema067.phpt Fri Apr 15 02:53:07 2005 @@ -16,7 +16,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" ns1:int="5" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" int="5" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema069.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema069.phpt diff -u php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema069.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema069.phpt Fri Apr 15 02:53:07 2005 @@ -17,7 +17,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema070.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/soap/tests/schema/schema070.phpt diff -u php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.2 php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.3 --- php-src/ext/soap/tests/schema/schema070.phpt:1.1.2.2 Tue Mar 29 08:14:59 2005 +++ php-src/ext/soap/tests/schema/schema070.phpt Fri Apr 15 02:53:07 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam ns1:str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam str="str" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["str"]=> string(3) "str" http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/test_schema.inc?r1=1.6.2.2&r2=1.6.2.3&ty=u Index: php-src/ext/soap/tests/schema/test_schema.inc diff -u php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.2 php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.3 --- php-src/ext/soap/tests/schema/test_schema.inc:1.6.2.2 Mon Mar 21 10:53:32 2005 +++ php-src/ext/soap/tests/schema/test_schema.inc Fri Apr 15 02:53:07 2005 @@ -6,7 +6,7 @@ $val = $input; } -function test_schema($schema,$type,$param,$style="rpc",$use="encoded") { +function test_schema($schema,$type,$param,$style="rpc",$use="encoded", $attributeFormDefault='') { global $HTTP_RAW_POST_DATA, $val; $wsdl = <<<EOF <definitions name="InteropTest" @@ -16,9 +16,10 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" - targetNamespace="http://test-uri/"> + targetNamespace="http://test-uri/" + > <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/" $attributeFormDefault> <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" /> $schema @@ -53,7 +54,7 @@ $f = fopen($fname,"w"); fwrite($f,$wsdl); fclose($f); - ini_set("soap.wsdl_cache_enabled",0); + ini_set("soap.wsdl_cache_enabled",0); $x = new SoapClient($fname, array("trace"=>1,"exceptions"=>0)); $y = new SoapServer($fname); $y->addfunction("test"); @@ -73,4 +74,4 @@ echo $req; } } -?> \ No newline at end of file +?>