gschlossnagle Sun Apr 3 11:39:57 2005 EDT
Added files:
/php-src/ext/soap/tests/schema schema074.phpt
Modified files:
/php-src/ext/soap php_encoding.c php_schema.c
/php-src/ext/soap/tests/bugs bug29236.phpt
/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:
Fix qualified names for attributes according to attributeFormDefault.
Add SOAP Interop tests from Dmitry.
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.90&r2=1.91&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.90
php-src/ext/soap/php_encoding.c:1.91
--- php-src/ext/soap/php_encoding.c:1.90 Mon Mar 28 13:06:28 2005
+++ php-src/ext/soap/php_encoding.c Sun Apr 3 11:39:55 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.90 2005/03/28 18:06:28 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.91 2005/04/03 15:39:55 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_schema.c?r1=1.53&r2=1.54&ty=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.53 php-src/ext/soap/php_schema.c:1.54
--- php-src/ext/soap/php_schema.c:1.53 Tue Mar 22 05:19:07 2005
+++ php-src/ext/soap/php_schema.c Sun Apr 3 11:39:55 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_schema.c,v 1.53 2005/03/22 10:19:07 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.54 2005/04/03 15:39:55 gschlossnagle Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -1890,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/bugs/bug29236.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/soap/tests/bugs/bug29236.phpt
diff -u php-src/ext/soap/tests/bugs/bug29236.phpt:1.1
php-src/ext/soap/tests/bugs/bug29236.phpt:1.2
--- php-src/ext/soap/tests/bugs/bug29236.phpt:1.1 Mon Jul 19 09:58:10 2004
+++ php-src/ext/soap/tests/bugs/bug29236.phpt Sun Apr 3 11:39:56 2005
@@ -3,7 +3,7 @@
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
-<?
+<?php
$client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl");
var_dump($client->__getFunctions());
?>
@@ -17,4 +17,4 @@
string(41) "LogoutResponse Logout(Logout $parameters)"
[3]=>
string(62) "GetSystemInfoResponse GetSystemInfo(GetSystemInfo $parameters)"
-}
\ No newline at end of file
+}
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema037.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema037.phpt
diff -u php-src/ext/soap/tests/schema/schema037.phpt:1.3
php-src/ext/soap/tests/schema/schema037.phpt:1.4
--- php-src/ext/soap/tests/schema/schema037.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema037.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema038.phpt
diff -u php-src/ext/soap/tests/schema/schema038.phpt:1.3
php-src/ext/soap/tests/schema/schema038.phpt:1.4
--- php-src/ext/soap/tests/schema/schema038.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema038.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema039.phpt
diff -u php-src/ext/soap/tests/schema/schema039.phpt:1.3
php-src/ext/soap/tests/schema/schema039.phpt:1.4
--- php-src/ext/soap/tests/schema/schema039.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema039.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema040.phpt
diff -u php-src/ext/soap/tests/schema/schema040.phpt:1.3
php-src/ext/soap/tests/schema/schema040.phpt:1.4
--- php-src/ext/soap/tests/schema/schema040.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema040.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema042.phpt
diff -u php-src/ext/soap/tests/schema/schema042.phpt:1.3
php-src/ext/soap/tests/schema/schema042.phpt:1.4
--- php-src/ext/soap/tests/schema/schema042.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema042.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema043.phpt
diff -u php-src/ext/soap/tests/schema/schema043.phpt:1.3
php-src/ext/soap/tests/schema/schema043.phpt:1.4
--- php-src/ext/soap/tests/schema/schema043.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema043.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema044.phpt
diff -u php-src/ext/soap/tests/schema/schema044.phpt:1.3
php-src/ext/soap/tests/schema/schema044.phpt:1.4
--- php-src/ext/soap/tests/schema/schema044.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema044.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema045.phpt
diff -u php-src/ext/soap/tests/schema/schema045.phpt:1.3
php-src/ext/soap/tests/schema/schema045.phpt:1.4
--- php-src/ext/soap/tests/schema/schema045.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema045.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema046.phpt
diff -u php-src/ext/soap/tests/schema/schema046.phpt:1.3
php-src/ext/soap/tests/schema/schema046.phpt:1.4
--- php-src/ext/soap/tests/schema/schema046.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema046.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema047.phpt
diff -u php-src/ext/soap/tests/schema/schema047.phpt:1.3
php-src/ext/soap/tests/schema/schema047.phpt:1.4
--- php-src/ext/soap/tests/schema/schema047.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema047.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema048.phpt
diff -u php-src/ext/soap/tests/schema/schema048.phpt:1.3
php-src/ext/soap/tests/schema/schema048.phpt:1.4
--- php-src/ext/soap/tests/schema/schema048.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema048.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema062.phpt
diff -u php-src/ext/soap/tests/schema/schema062.phpt:1.3
php-src/ext/soap/tests/schema/schema062.phpt:1.4
--- php-src/ext/soap/tests/schema/schema062.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema062.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema065.phpt
diff -u php-src/ext/soap/tests/schema/schema065.phpt:1.3
php-src/ext/soap/tests/schema/schema065.phpt:1.4
--- php-src/ext/soap/tests/schema/schema065.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema065.phpt Sun Apr 3 11:39:56 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.4&r2=1.5&ty=u
Index: php-src/ext/soap/tests/schema/schema066.phpt
diff -u php-src/ext/soap/tests/schema/schema066.phpt:1.4
php-src/ext/soap/tests/schema/schema066.phpt:1.5
--- php-src/ext/soap/tests/schema/schema066.phpt:1.4 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema066.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema067.phpt
diff -u php-src/ext/soap/tests/schema/schema067.phpt:1.3
php-src/ext/soap/tests/schema/schema067.phpt:1.4
--- php-src/ext/soap/tests/schema/schema067.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema067.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema069.phpt
diff -u php-src/ext/soap/tests/schema/schema069.phpt:1.3
php-src/ext/soap/tests/schema/schema069.phpt:1.4
--- php-src/ext/soap/tests/schema/schema069.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema069.phpt Sun Apr 3 11:39:56 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.3&r2=1.4&ty=u
Index: php-src/ext/soap/tests/schema/schema070.phpt
diff -u php-src/ext/soap/tests/schema/schema070.phpt:1.3
php-src/ext/soap/tests/schema/schema070.phpt:1.4
--- php-src/ext/soap/tests/schema/schema070.phpt:1.3 Mon Mar 28 13:06:29 2005
+++ php-src/ext/soap/tests/schema/schema070.phpt Sun Apr 3 11:39:56 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.8&r2=1.9&ty=u
Index: php-src/ext/soap/tests/schema/test_schema.inc
diff -u php-src/ext/soap/tests/schema/test_schema.inc:1.8
php-src/ext/soap/tests/schema/test_schema.inc:1.9
--- php-src/ext/soap/tests/schema/test_schema.inc:1.8 Mon Mar 21 10:52:53 2005
+++ php-src/ext/soap/tests/schema/test_schema.inc Sun Apr 3 11:39:56 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/co.php/php-src/ext/soap/tests/schema/schema074.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/schema/schema074.phpt
+++ php-src/ext/soap/tests/schema/schema074.phpt
--TEST--
SOAP XML Schema 74: Structure with attributes and qualified elements
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
include "test_schema.inc";
$schema = <<<EOF
<complexType name="testType">
<sequence>
<element name="str" type="string"/>
</sequence>
<attribute name="int" type="int"/>
</complexType>
EOF;
test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5),
"rpc", "encoded", 'attributeFormDefault="qualified"');
echo "ok";
?>
--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>
object(stdClass)#%d (2) {
["str"]=>
string(3) "str"
["int"]=>
int(123)
}
ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
