From 8594a3806fd175520fba109aacb5ff21c8480996 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 20 Apr 2005 06:35:29 +0000
Subject: [PATCH] Some tests where fixed

---
 ext/soap/tests/bugs/bug29236.phpt    |   4 +-
 ext/soap/tests/classmap.wsdl         | 120 +++++++++++++--------------
 ext/soap/tests/schema/schema074.phpt |  29 +++++++
 3 files changed, 91 insertions(+), 62 deletions(-)
 create mode 100644 ext/soap/tests/schema/schema074.phpt

diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt
index 372449fbb2..4dbc302c17 100644
--- a/ext/soap/tests/bugs/bug29236.phpt
+++ b/ext/soap/tests/bugs/bug29236.phpt
@@ -3,7 +3,7 @@ Bug #29236 (memory error when wsdl-cache is enabled)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?
+<?php
 $client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl");
 var_dump($client->__getFunctions()); 
 ?>
@@ -17,4 +17,4 @@ array(4) {
   string(41) "LogoutResponse Logout(Logout $parameters)"
   [3]=>
   string(62) "GetSystemInfoResponse GetSystemInfo(GetSystemInfo $parameters)"
-}
\ No newline at end of file
+}
diff --git a/ext/soap/tests/classmap.wsdl b/ext/soap/tests/classmap.wsdl
index 25062630ac..7fcf596244 100644
--- a/ext/soap/tests/classmap.wsdl
+++ b/ext/soap/tests/classmap.wsdl
@@ -1,60 +1,60 @@
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.nothing.com" targetNamespace="http://schemas.nothing.com">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://schemas.nothing.com">
-			<xsd:complexType name="book">
-				<xsd:all>
-					<xsd:element name="a" type="xsd:string"/>
-					<xsd:element name="b" type="xsd:string"/>
-				</xsd:all>
-			</xsd:complexType>
-  </xsd:schema>
-	</wsdl:types>
-	<message name="dotestRequest">
-		<part name="dotestReturn" type="tns:book"/>
-  </message>
-	<message name="dotestResponse">
-		<part name="res" type="xsi:string"/>
-  </message>
-	<message name="dotest2Request">
-		<part name="dotest2" type="xsi:string"/>
-  </message>
-	<message name="dotest2Response">
-		<part name="res" type="tns:book"/>
-  </message>
-	<portType name="testPortType">
-		<operation name="dotest">
-			<input message="tns:dotestRequest"/>
-			<output message="tns:dotestResponse"/>
-		</operation>
-		<operation name="dotest2">
-			<input message="tns:dotest2Request"/>
-			<output message="tns:dotest2Response"/>
-		</operation>
-	</portType>
-	<binding name="testBinding" type="tns:testPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="dotest">
-			<soap:operation soapAction="http://localhost:81/test/interface.php?class=test/dotest" style="rpc"/>
-			<input>
-				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
-			</input>
-			<output>
-				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
-			</output>
-		</operation>
-		<operation name="dotest2">
-			<soap:operation soapAction="http://localhost:81/test/interface.php?class=test/dotest2" style="rpc"/>
-			<input>
-				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
-			</input>
-			<output>
-				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="test">
-		<port name="testPort" binding="tns:testBinding">
-			<soap:address location="http://localhost:81/test/interface.php?class=test"/>
-		</port>
-	</service>
-</wsdl:definitions>
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.nothing.com" targetNamespace="http://schemas.nothing.com">
+	<wsdl:types>
+		<xsd:schema targetNamespace="http://schemas.nothing.com">
+			<xsd:complexType name="book">
+				<xsd:all>
+					<xsd:element name="a" type="xsd:string"/>
+					<xsd:element name="b" type="xsd:string"/>
+				</xsd:all>
+			</xsd:complexType>
+  </xsd:schema>
+	</wsdl:types>
+	<message name="dotestRequest">
+		<part name="dotestReturn" type="tns:book"/>
+  </message>
+	<message name="dotestResponse">
+		<part name="res" type="xsi:string"/>
+  </message>
+	<message name="dotest2Request">
+		<part name="dotest2" type="xsi:string"/>
+  </message>
+	<message name="dotest2Response">
+		<part name="res" type="tns:book"/>
+  </message>
+	<portType name="testPortType">
+		<operation name="dotest">
+			<input message="tns:dotestRequest"/>
+			<output message="tns:dotestResponse"/>
+		</operation>
+		<operation name="dotest2">
+			<input message="tns:dotest2Request"/>
+			<output message="tns:dotest2Response"/>
+		</operation>
+	</portType>
+	<binding name="testBinding" type="tns:testPortType">
+		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="dotest">
+			<soap:operation soapAction="http://localhost:81/test/interface.php?class=test/dotest" style="rpc"/>
+			<input>
+				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
+			</input>
+			<output>
+				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
+			</output>
+		</operation>
+		<operation name="dotest2">
+			<soap:operation soapAction="http://localhost:81/test/interface.php?class=test/dotest2" style="rpc"/>
+			<input>
+				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
+			</input>
+			<output>
+				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
+			</output>
+		</operation>
+	</binding>
+	<service name="test">
+		<port name="testPort" binding="tns:testBinding">
+			<soap:address location="http://localhost:81/test/interface.php?class=test"/>
+		</port>
+	</service>
+</wsdl:definitions>
diff --git a/ext/soap/tests/schema/schema074.phpt b/ext/soap/tests/schema/schema074.phpt
new file mode 100644
index 0000000000..3dbba0cd25
--- /dev/null
+++ b/ext/soap/tests/schema/schema074.phpt
@@ -0,0 +1,29 @@
+--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
-- 
2.50.1