551 files changed, 0 insertions, 24299 deletions
diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt
deleted file mode 100755
index 306557b302..0000000000
--- a/ext/soap/tests/any.phpt
+++ /dev/null
@@ -1,83 +0,0 @@
---TEST--
-SOAP handling of <any>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-
-function echoAnyElement($x) {
-	global $g;
-
-	$g = $x;
-	$struct = $x->inputAny->any;
-	if ($struct instanceof SOAPComplexType) {
-		return array("return" => array("any" => new SoapVar($struct, SOAP_ENC_OBJECT, "SOAPComplexType", "http://soapinterop.org/xsd", "SOAPComplexType", "http://soapinterop.org/")));
-	} else {
-		return "?";
-	}
-}
-
-class TestSoapClient extends SoapClient {
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('echoAnyElement');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new TestSoapClient(dirname(__FILE__)."/interop/Round4/GroupI/round4_groupI_xsd.wsdl",
-                             array("trace"=>1,"exceptions"=>0,
-                             'classmap' => array('SOAPComplexType'=>'SOAPComplexType')));
-$ret = $client->echoAnyElement(
-  array(
-    "inputAny"=>array(
-       "any"=>new SoapVar($struct, SOAP_ENC_OBJECT, "SOAPComplexType", "http://soapinterop.org/xsd", "SOAPComplexType", "http://soapinterop.org/")
-     )));
-var_dump($g);
-var_dump($ret);
-?>
---EXPECT--
-object(stdClass)#5 (1) {
-  ["inputAny"]=>
-  object(stdClass)#6 (1) {
-    ["any"]=>
-    object(SOAPComplexType)#7 (3) {
-      ["varInt"]=>
-      int(34)
-      ["varString"]=>
-      string(3) "arg"
-      ["varFloat"]=>
-      float(325.325)
-    }
-  }
-}
-object(stdClass)#8 (1) {
-  ["return"]=>
-  object(stdClass)#9 (1) {
-    ["any"]=>
-    object(SOAPComplexType)#10 (3) {
-      ["varInt"]=>
-      int(34)
-      ["varString"]=>
-      string(3) "arg"
-      ["varFloat"]=>
-      float(325.325)
-    }
-  }
-}
diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt
deleted file mode 100644
index 5df6adb816..0000000000
--- a/ext/soap/tests/bugs/bug27722.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Bug #27722 (Segfault on schema without targetNamespace)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---GET--
-wsdl
---FILE--
-<?php
-$x = new SoapClient(dirname(__FILE__)."/bug27722.wsdl");
-echo "ok\n";
-?>
---EXPECT--
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug27722.wsdl b/ext/soap/tests/bugs/bug27722.wsdl
deleted file mode 100644
index 51f11e6c0f..0000000000
--- a/ext/soap/tests/bugs/bug27722.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" ?>
-<definitions
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    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/"
-    xmlns:si="http://soapinterop.org/xsd"
-    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-  <types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:annotation>
-  <xsd:documentation xml:lang="en">
-   Purchase order schema for Example.com.
-   Copyright 2000 Example.com. All rights reserved.
-  </xsd:documentation>
- </xsd:annotation>
-
- <xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
-
- <xsd:element name="comment" type="xsd:string"/>
-
- <xsd:complexType name="PurchaseOrderType">
-  <xsd:sequence>
-   <xsd:element name="shipTo" type="USAddress"/>
-   <xsd:element name="billTo" type="USAddress"/>
-   <xsd:element ref="comment" minOccurs="0"/>
-   <xsd:element name="items"  type="Items"/>
-  </xsd:sequence>
-  <xsd:attribute name="orderDate" type="xsd:date"/>
- </xsd:complexType>
-
- <xsd:complexType name="USAddress">
-  <xsd:sequence>
-   <xsd:element name="name"   type="xsd:string"/>
-   <xsd:element name="street" type="xsd:string"/>
-   <xsd:element name="city"   type="xsd:string"/>
-   <xsd:element name="state"  type="xsd:string"/>
-   <xsd:element name="zip"    type="xsd:decimal"/>
-  </xsd:sequence>
-  <xsd:attribute name="country" type="xsd:NMTOKEN"
-     fixed="US"/>
- </xsd:complexType>
-
- <xsd:complexType name="Items">
-  <xsd:sequence>
-   <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-    <xsd:complexType>
-     <xsd:sequence>
-      <xsd:element name="productName" type="xsd:string"/>
-      <xsd:element name="quantity">
-       <xsd:simpleType>
-        <xsd:restriction base="xsd:positiveInteger">
-         <xsd:maxExclusive value="100"/>
-        </xsd:restriction>
-       </xsd:simpleType>
-      </xsd:element>
-      <xsd:element name="USPrice"  type="xsd:decimal"/>
-      <xsd:element ref="comment"   minOccurs="0"/>
-      <xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
-     </xsd:sequence>
-     <xsd:attribute name="partNum" type="SKU" use="required"/>
-    </xsd:complexType>
-   </xsd:element>
-  </xsd:sequence>
- </xsd:complexType>
-
- <!-- Stock Keeping Unit, a code for identifying products -->
- <simpleType name="SKU">
-  <restriction base="xsd:string">
-   <pattern value="\d{3}-[A-Z]{2}"/>
-  </restriction>
- </simpleType>
-
-</xsd:schema>
-</types>
-  <portType name="TestServicePortType">
-  </portType>
-
-  <binding name="TestServiceBinding" type="tns:TestServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-  </binding>
-
-  <service name="TestService">
-    <port name="TestServicePort" binding="tns:TestServiceBinding">
-      <soap:address location="test://" />
-    </port>
-  </service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt
deleted file mode 100644
index 1de856828e..0000000000
--- a/ext/soap/tests/bugs/bug27742.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Bug #27742 (WDSL SOAP Parsing Schema bug)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---GET--
-wsdl
---FILE--
-<?php
-$x = new SoapClient(dirname(__FILE__)."/bug27742.wsdl");
-echo "ok\n";
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/bugs/bug27742.wsdl b/ext/soap/tests/bugs/bug27742.wsdl
deleted file mode 100644
index f38d911852..0000000000
--- a/ext/soap/tests/bugs/bug27742.wsdl
+++ /dev/null
@@ -1,854 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Rakesh Vidyadharan (Enterprise Application Development Tribune Media Services) -->
-<wsdl:definitions name="xtvdWebService" targetNamespace="urn:TMSWebServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tms="urn:TMSWebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<wsdl:types>
-		<xsd:schema targetNamespace="urn:TMSWebServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tms="urn:TMSWebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<simpleType name="duration">
-		<annotation>
-			<documentation xml:lang="en">ISO 8601 pattern used to denote program durations.  Year, month and day are not relevent in our context and are omitted.</documentation>
-		</annotation>
-		<restriction base="xsd:duration">
-			<pattern value="PT[0-9][0-9]H[0-5][0-9]M"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="dateTime">
-		<annotation>
-			<documentation xml:lang="en">ISO 8601 pattern for date+time information : YYYY-MM-DDThh:mm:ssZ</documentation>
-		</annotation>
-		<restriction base="xsd:dateTime">
-			<pattern value="20[0-9]{2}\-[0-1][0-9]\-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9]Z"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="date">
-		<annotation>
-			<documentation xml:lang="en">ISO 8601 pattern for date: YYYY-MM-DD</documentation>
-		</annotation>
-		<restriction base="xsd:date">
-			<pattern value="(19|20)[0-9]{2}\-[0-1][0-9]\-[0-3][0-9]"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="time">
-		<annotation>
-			<documentation xml:lang="en">ISO 8601 pattern for time of day : hh:mm:ss</documentation>
-		</annotation>
-		<restriction base="xsd:time">
-			<pattern value="\d\d:\d\d:\d\d"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="mpaaRatings">
-		<annotation>
-			<documentation xml:lang="en">MPAA standard ratings for a movie as defined in the movie and TV database schemas.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="Adult">
-				<annotation>
-					<documentation xml:lang="en">This is the way this rating is defined in the movies database schema.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="AO">
-				<annotation>
-					<documentation xml:lang="en">This is the way this rating is defined in the TV database schema.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="G"/>
-			<enumeration value="NC-17"/>
-			<enumeration value="NONE">
-				<annotation>
-					<documentation xml:lang="en">Films in the movie database that do not have any ratings associated with them are sometimes marked with this value.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="NOT RATED">
-				<annotation>
-					<documentation xml:lang="en">This is the way films without any rating are defined in the movies database schema.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="NR">
-				<annotation>
-					<documentation xml:lang="en">This is the way films without any rating are defined in the TV database schema.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="PG"/>
-			<enumeration value="PG-13"/>
-			<enumeration value="R"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="starRating">
-		<annotation>
-			<documentation xml:lang="en">A Zap2it reviewer assigned rating for a given film.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="*"/>
-			<enumeration value="*+"/>
-			<enumeration value="**"/>
-			<enumeration value="**+"/>
-			<enumeration value="***"/>
-			<enumeration value="***+"/>
-			<enumeration value="****"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="movieCrewRole">
-		<annotation>
-			<documentation xml:lang="en">The roles that are currently defined for the production crew associated with a given film.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="Actor"/>
-			<enumeration value="Director"/>
-			<enumeration value="Executive Producer"/>
-			<enumeration value="Guest Star"/>
-			<enumeration value="Producer"/>
-			<enumeration value="Writer"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="movieGenres">
-		<annotation>
-			<documentation xml:lang="en">The standard genres that are used to classify films in the movies database schema.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value=""/>
-			<enumeration value="Action"/>
-			<enumeration value="Adults only"/>
-			<enumeration value="Adventure"/>
-			<enumeration value="Animated musical"/>
-			<enumeration value="Biography"/>
-			<enumeration value="Children"/>
-			<enumeration value="Comedy"/>
-			<enumeration value="Comedy-drama"/>
-			<enumeration value="Crime drama"/>
-			<enumeration value="Docudrama"/>
-			<enumeration value="Documentary"/>
-			<enumeration value="Drama"/>
-			<enumeration value="Fantasy"/>
-			<enumeration value="French"/>
-			<enumeration value="Historical drama"/>
-			<enumeration value="Horror"/>
-			<enumeration value="Martial arts"/>
-			<enumeration value="Musical"/>
-			<enumeration value="Musical comedy"/>
-			<enumeration value="Musical romance"/>
-			<enumeration value="Mystery"/>
-			<enumeration value="Romance"/>
-			<enumeration value="Romance-comedy"/>
-			<enumeration value="Science fiction"/>
-			<enumeration value="Spanish"/>
-			<enumeration value="Suspense"/>
-			<enumeration value="Suspense-comedy"/>
-			<enumeration value="War"/>
-			<enumeration value="Western"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="movieAdvisories">
-		<annotation>
-			<documentation xml:lang="en">The standard advisory messages that are associated with a movie shown on TV.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="Adult Situations"/>
-			<enumeration value="Adolescentes y Adultos"/>
-			<enumeration value="Adultos"/>
-			<enumeration value="Brief Nudity"/>
-			<enumeration value="Graphic Language"/>
-			<enumeration value="Graphic Violence"/>
-			<enumeration value="Language"/>
-			<enumeration value="Mild Violence"/>
-			<enumeration value="Nudity"/>
-			<enumeration value="Publico General"/>
-			<enumeration value="Rape"/>
-			<enumeration value="Strong Sexual Content"/>
-			<enumeration value="Violence"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="tvRatings">
-		<annotation>
-			<documentation xml:lang="en">The FCC standard ratings for TV programs (http://www.fcc.gov/vchip/#guidelines)</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="TVY"/>
-			<enumeration value="TVY7"/>
-			<enumeration value="TVG"/>
-			<enumeration value="TVPG"/>
-			<enumeration value="TV14"/>
-			<enumeration value="TVMA"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="tvColorCode">
-		<annotation>
-			<documentation>The standard color codes used to denote the color scheme used by a TV program (eg. Color, B &amp; W ...).</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="B &amp; W">
-				<annotation>
-					<documentation xml:lang="en">Indicates that the program is begin telecast in Black and White.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Color">
-				<annotation>
-					<documentation xml:lang="en">Indicates that the program being telecast is in color.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Colorized">
-				<annotation>
-					<documentation xml:lang="en">Indicates that the program being telecast is a colorised version of the original program.</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Color and B &amp; W">
-				<annotation>
-					<documentation xml:lang="en">Indicates that the program being telecast is partly in color and partly in Black and White.</documentation>
-				</annotation>
-			</enumeration>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="filmDataAttributes">
-		<annotation>
-			<documentation xml:lang="en">Common attributes that are applicable to all the root elements of the XML schemas developed to represent film data.</documentation>
-		</annotation>
-		<attribute name="postalCode" type="xsd:string" use="optional">
-			<annotation>
-				<documentation xml:lang="en">The ZIP/Postal code for which the theatre list was generated.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="radius" type="xsd:float" use="optional" default="5">
-			<annotation>
-				<documentation xml:lang="en">The radius around the centroid of the ZIP/Postal code within which the films are located.  A default value of 20 (miles for US customers and kilometres for non-US customers) will be used if the client making the request did not specify a radius.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="maxCount" type="xsd:int" use="optional">
-			<annotation>
-				<documentation xml:lang="en">The maximum number of film/theatre records that are included in the document.  This number may be specified by the client making the request for the list of films/theatres/showtimes.</documentation>
-			</annotation>
-		</attribute>
-	</attributeGroup>
-	<complexType name="crewMember">
-		<annotation>
-			<documentation xml:lang="en">A cast or production crew member for a film or TV show.</documentation>
-		</annotation>
-		<sequence>
-			<element name="role" type="xsd:string">
-				<annotation>
-					<documentation xml:lang="en">Describes the role of the crew member.  Eg. Actor, Director ...</documentation>
-				</annotation>
-			</element>
-			<element name="givenname" type="xsd:string" nillable="true">
-				<annotation>
-					<documentation xml:lang="en">The given/first name of the crew member.  The element name follows LDAP naming convention.  TMS does not have given/first names for all cast/crew members.  Hence this element is nillable.</documentation>
-				</annotation>
-			</element>
-			<element name="surname" type="xsd:string">
-				<annotation>
-					<documentation xml:lang="en">The surname/last-name of the crew member.  The element name follows LDAP naming convention.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<complexType name="image">
-		<annotation>
-			<documentation>Complex type that contains the attributes of an image.  The only attribute available at present is its URI.</documentation>
-		</annotation>
-		<sequence>
-			<element name="imageUri" type="xsd:anyURI" nillable="true">
-				<annotation>
-					<documentation>This element contains an absolute URI to an image associated with the film.</documentation>
-				</annotation>
-			</element>
-			<element name="width" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation>This element defines the width of the image associated with the film.  This element is a place holder.  The width attribute is not available at present.</documentation>
-				</annotation>
-			</element>
-			<element name="height" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation>This element defines the height of the image associated with the film.  This element is a place holder.  The height attribute is not available at present.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<complexType name="address">
-		<annotation>
-			<documentation xml:lang="en">This complex type describes a generic address.</documentation>
-		</annotation>
-		<sequence>
-			<element name="streetAddress">
-				<annotation>
-					<documentation xml:lang="en">This element groups together the various street address parts for the entire address.</documentation>
-				</annotation>
-				<complexType>
-					<sequence>
-						<element name="street" type="xsd:string" maxOccurs="unbounded">
-							<annotation>
-								<documentation xml:lang="en">This field contains each entry for the street address part of the entire address.</documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="city" type="xsd:string">
-				<annotation>
-					<documentation xml:lang="en">This field contains the city for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="state" type="xsd:string">
-				<annotation>
-					<documentation xml:lang="en">This field contains the name/code of the state for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="postalCode" type="xsd:string">
-				<annotation>
-					<documentation xml:lang="en">This field contains the ZIP/Postal code for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="telephone" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation xml:lang="en">This field contains the telephone number if available for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="fax" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation xml:lang="en">This field contains the fax number if available for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="mobile" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation xml:lang="en">This field contains the mobile phone number if available for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="email" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation xml:lang="en">This field contains the email address if available for the address.</documentation>
-				</annotation>
-			</element>
-			<element name="country" type="xsd:string" minOccurs="0">
-				<annotation>
-					<documentation xml:lang="en">This field contains the country of the address.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<element name="xtvd">
-		<annotation>
-			<documentation>Root element of the document.  @IMPORTANT : All time and dates are specified in UTC !</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="tms:stations"/>
-				<element ref="tms:lineups"/>
-				<element ref="tms:schedules"/>
-				<element ref="tms:programs"/>
-				<element ref="tms:productionCrew" minOccurs="0"/>
-				<element ref="tms:genres"/>
-			</sequence>
-			<attribute name="from" type="tms:dateTime" use="required">
-				<annotation>
-					<documentation xml:lang="en">Date and time defining the start of the period covered by this XTVD document.</documentation>
-				</annotation>
-			</attribute>
-			<attribute name="to" type="tms:dateTime" use="required">
-				<annotation>
-					<documentation xml:lang="en">Date and time defining the end of the period covered by this XTVD document.</documentation>
-				</annotation>
-			</attribute>
-			<attribute name="schemaVersion" type="xsd:float" use="required" fixed="1.2">
-				<annotation>
-					<documentation xml:lang="en">Version number of the schema used to build this document.</documentation>
-				</annotation>
-			</attribute>
-		</complexType>
-		<key name="station_key">
-			<selector xpath="./stations/station"/>
-			<field xpath="@id"/>
-		</key>
-		<keyref name="station_keyref_schedule" refer="tms:station_key">
-			<selector xpath="./schedules/schedule"/>
-			<field xpath="@station"/>
-		</keyref>
-		<keyref name="station_keyref_map" refer="tms:station_key">
-			<selector xpath="./lineups/lineup/map"/>
-			<field xpath="@station"/>
-		</keyref>
-		<unique name="program_key">
-			<selector xpath="./programs/program"/>
-			<field xpath="@id"/>
-		</unique>
-		<keyref name="program_keyref" refer="tms:program_key">
-			<selector xpath="./schedules/schedule"/>
-			<field xpath="@program"/>
-		</keyref>
-		<keyref name="crew_keyref" refer="tms:program_key">
-			<selector xpath="./productionCrew/crew"/>
-			<field xpath="@program"/>
-		</keyref>
-		<keyref name="genre_keyref" refer="tms:program_key">
-			<selector xpath="./genres/programGenre"/>
-			<field xpath="@program"/>
-		</keyref>
-		<keyref name="advisory_keyref" refer="tms:program_key">
-			<selector xpath="./advisories/advisory"/>
-			<field xpath="@program"/>
-		</keyref>
-	</element>
-	<element name="stations">
-		<annotation>
-			<documentation>Collection of user selected station elements (across all lineups).</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<element name="station">
-					<annotation>
-						<documentation>Defines a TV broadcast station - each station is identified with an unique ID.</documentation>
-					</annotation>
-					<complexType>
-						<sequence>
-							<element name="callSign">
-								<annotation>
-									<documentation>Short name of the station (eg. CNN).</documentation>
-								</annotation>
-							</element>
-							<element name="name" minOccurs="0">
-								<annotation>
-									<documentation>Long name of the station (eg. Cable News Network).</documentation>
-								</annotation>
-							</element>
-							<element name="fccChannelNumber" type="xsd:positiveInteger" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">FCC channel number of a broadcast station.</documentation>
-								</annotation>
-							</element>
-							<element name="affiliate" type="xsd:string" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">Network, cable or broadcasting group with which the station is associated.</documentation>
-								</annotation>
-							</element>
-						</sequence>
-						<attribute name="id" type="xsd:int" use="required">
-							<annotation>
-								<documentation xml:lang="en">ID string of the station.</documentation>
-							</annotation>
-						</attribute>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="lineups">
-		<annotation>
-			<documentation>Collection of lineup elements selected by the user.</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<element name="lineup">
-					<annotation>
-						<documentation>Defines all the station that were selected for the given lineup. </documentation>
-					</annotation>
-					<complexType>
-						<sequence maxOccurs="unbounded">
-							<element name="map">
-								<annotation>
-									<documentation>This element defines the mapping between one station and one channel number. As channel numbers may change over time, attributes to define a validity period for the mapping are available.</documentation>
-								</annotation>
-								<complexType>
-									<sequence minOccurs="0" maxOccurs="unbounded">
-										<element name="onAir">
-											<annotation>
-												<documentation xml:lang="en">Specifies the time(s) of day when the given station-channel mapping is in effect.</documentation>
-											</annotation>
-											<complexType>
-												<attribute name="from" type="tms:time" use="required">
-													<annotation>
-														<documentation xml:lang="en">The time of day from which the station-channel mapping is effective.</documentation>
-													</annotation>
-												</attribute>
-												<attribute name="to" type="tms:time" use="required">
-													<annotation>
-														<documentation xml:lang="en">The time of day until which the station-channel mapping is effective.</documentation>
-													</annotation>
-												</attribute>
-											</complexType>
-										</element>
-									</sequence>
-									<attribute name="station" type="xsd:int" use="required">
-										<annotation>
-											<documentation xml:lang="en">Reference to a station.</documentation>
-										</annotation>
-									</attribute>
-									<attribute name="channel" type="xsd:positiveInteger" use="required">
-										<annotation>
-											<documentation xml:lang="en">Channel number associated to the station.</documentation>
-										</annotation>
-									</attribute>
-									<attribute name="channelMinor" type="xsd:positiveInteger" use="optional">
-										<annotation>
-											<documentation xml:lang="en">The major channel (the channel attribute) number is used to group all services associated with a broadcaster's NTSC brand, for example Channel 4. The minor channel number specifies a particular channel within that group. Zero (0) is reserved for the NTSC channel; all other values (1-999) are allowed for digital services. One common approach is to start with 1 and to continue numerically for different programming services.</documentation>
-										</annotation>
-									</attribute>
-									<attribute name="from" type="tms:date" use="optional">
-										<annotation>
-											<documentation xml:lang="en">Date from which the mapping is valid, according to the validity period of the whole XTVD document. @IMPORTANT : It is assumed that the change will occur at midnight.</documentation>
-										</annotation>
-									</attribute>
-									<attribute name="to" type="tms:date" use="optional">
-										<annotation>
-											<documentation xml:lang="en">Date untill which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight.</documentation>
-										</annotation>
-									</attribute>
-								</complexType>
-							</element>
-						</sequence>
-						<attribute name="name" type="xsd:string" use="required">
-							<annotation>
-								<documentation xml:lang="en">Name given to the lineup.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="type" type="tms:lineupTypes" use="required">
-							<annotation>
-								<documentation xml:lang="en">Defines the type of the lineup (CABLE, SATELLITE, ...).</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="device" type="xsd:string" use="optional">
-							<annotation>
-								<documentation xml:lang="en">The name of the device associated with the headend.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="postalCode" type="xsd:string" use="optional">
-							<annotation>
-								<documentation xml:lang="en">The ZIP/Postal code for which the specified lineup was selected by the user.</documentation>
-							</annotation>
-						</attribute>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="schedules">
-		<annotation>
-			<documentation>Contain all schedule records (across all selected lineups).</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<annotation>
-					<documentation>Sequence of schedule records.</documentation>
-				</annotation>
-				<element name="schedule">
-					<annotation>
-						<documentation>Describes a schedule entry.</documentation>
-					</annotation>
-					<complexType>
-						<sequence minOccurs="0">
-							<element name="part" minOccurs="0">
-								<annotation>
-									<documentation>Designates which part, when a program is split into 2 or more viewings.</documentation>
-								</annotation>
-								<complexType>
-									<attribute name="number" use="required">
-										<annotation>
-											<documentation xml:lang="en">Designates which part, when a program is split into 2 or more viewings. </documentation>
-										</annotation>
-										<simpleType>
-											<restriction base="xsd:unsignedInt">
-												<minInclusive value="1"/>
-											</restriction>
-										</simpleType>
-									</attribute>
-									<attribute name="total" use="required">
-										<annotation>
-											<documentation xml:lang="en">Designates when a program is split into 2 or more parts for viewing. </documentation>
-										</annotation>
-										<simpleType>
-											<restriction base="xsd:unsignedInt">
-												<minInclusive value="2"/>
-											</restriction>
-										</simpleType>
-									</attribute>
-								</complexType>
-							</element>
-						</sequence>
-						<attribute name="program" type="xsd:string" use="required">
-							<annotation>
-								<documentation xml:lang="en">Reference to a program ID.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="station" type="xsd:int" use="required">
-							<annotation>
-								<documentation xml:lang="en">Reference to a station ID.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="time" type="tms:dateTime" use="required">
-							<annotation>
-								<documentation xml:lang="en">Air date and time for the schedule.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="duration" type="tms:duration" use="required">
-							<annotation>
-								<documentation xml:lang="en">Duration of the schedule.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="repeat" type="xsd:boolean" use="optional">
-							<annotation>
-								<documentation xml:lang="en">Designates a program which has been aired previously.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="tvRating" type="tms:tvRatings" use="optional">
-							<annotation>
-								<documentation xml:lang="en">The FCC standard ratings applied to TV shows.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="stereo" type="xsd:boolean" use="optional">
-							<annotation>
-								<documentation xml:lang="en">Indicates whether the program has stereo sound or not.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="subtitled" type="xsd:boolean" use="optional">
-							<annotation>
-								<documentation xml:lang="en">Indicates whether the program has subtitles.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="hdtv" type="xsd:boolean" use="optional">
-							<annotation>
-								<documentation xml:lang="en">Indicates whether the program broadcast is HDTV compatible.</documentation>
-							</annotation>
-						</attribute>
-						<attribute name="closeCaptioned" type="xsd:boolean" use="optional">
-							<annotation>
-								<documentation xml:lang="en">Indicates whether the program has closed captions.</documentation>
-							</annotation>
-						</attribute>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="programs">
-		<annotation>
-			<documentation>Contains all the program records that are referenced by the schedule records.</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<element name="program" minOccurs="0">
-					<annotation>
-						<documentation>Defines a program entry.</documentation>
-					</annotation>
-					<complexType>
-						<sequence>
-							<element name="title" type="xsd:string">
-								<annotation>
-									<documentation>Title of the program.</documentation>
-								</annotation>
-							</element>
-							<element name="subtitle" type="xsd:string" minOccurs="0">
-								<annotation>
-									<documentation>Subtitle of the program (episode title, game title, ...)</documentation>
-								</annotation>
-							</element>
-							<element name="description" type="xsd:string" minOccurs="0">
-								<annotation>
-									<documentation>Word string that describes the program.</documentation>
-								</annotation>
-							</element>
-							<element name="mpaaRating" type="tms:mpaaRatings" minOccurs="0">
-								<annotation>
-									<documentation>MPAA rating of the program (applies to movies only).</documentation>
-								</annotation>
-							</element>
-							<element name="starRating" type="tms:starRating" minOccurs="0">
-								<annotation>
-									<documentation>Star rating of the program (applies to movies only).</documentation>
-								</annotation>
-							</element>
-							<element name="runTime" type="tms:duration" minOccurs="0">
-								<annotation>
-									<documentation>Actual length of  the program. Not the same as schedule/@duration. Applies to movies only.</documentation>
-								</annotation>
-							</element>
-							<element name="year" type="xsd:gYear" minOccurs="0">
-								<annotation>
-									<documentation>The year in which a feature film was released; YYYY format.  Applies to movies only.</documentation>
-								</annotation>
-							</element>
-							<element name="showType" type="xsd:string" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">Distinguishes how a program was originally produced and/or distributed.</documentation>
-								</annotation>
-							</element>
-							<element name="series" type="xsd:string" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">The series ID associated with episodic programs.  For instance an episode with programId "EP5544720193" has a series ID "SH5544720000".  The series ID may be used to group together all episodes for a given series.</documentation>
-								</annotation>
-							</element>
-							<element name="colorCode" type="tms:tvColorCode" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">Indicates whether the program is in black and white, colorized or color.  Since most programs are in "Color" this element will be populated only if a program is not in "Color".</documentation>
-								</annotation>
-							</element>
-							<element name="advisories" minOccurs="0">
-								<annotation>
-									<documentation xml:lang="en">This element groups together all the advisories associated with the program.  Advisories apply only to movies.</documentation>
-								</annotation>
-								<complexType>
-									<sequence maxOccurs="6">
-										<element name="advisory" type="tms:movieAdvisories">
-											<annotation>
-												<documentation xml:lang="en">An individual advisory message associated with the movie.</documentation>
-											</annotation>
-										</element>
-									</sequence>
-								</complexType>
-							</element>
-						</sequence>
-						<attribute name="id" type="xsd:string" use="required">
-							<annotation>
-								<documentation xml:lang="en">Unique ID of the program.</documentation>
-							</annotation>
-						</attribute>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="productionCrew">
-		<annotation>
-			<documentation>Contains information about the personnel associated with each program record.</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<element name="crew">
-					<annotation>
-						<documentation xml:lang="en">This element groups together all the crew members associated with the given program.</documentation>
-					</annotation>
-					<complexType>
-						<sequence maxOccurs="unbounded">
-							<element name="member" type="tms:crewMember">
-								<annotation>
-									<documentation xml:lang="en">This element describes an individual production crew member associated with a program.</documentation>
-								</annotation>
-							</element>
-						</sequence>
-						<attribute name="program" type="xsd:string" use="required"/>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="genres">
-		<annotation>
-			<documentation xml:lang="en">Containes genre information where available for the program records.  A program may have more than one genre with different relevence factors.</documentation>
-		</annotation>
-		<complexType>
-			<sequence maxOccurs="unbounded">
-				<element name="programGenre">
-					<annotation>
-						<documentation xml:lang="en">This element groups together all the genres under which the specified program falls.</documentation>
-					</annotation>
-					<complexType>
-						<sequence maxOccurs="unbounded">
-							<element name="genre">
-								<annotation>
-									<documentation xml:lang="en">This element groups together the different elements associated with each genre with which the program is associated.</documentation>
-								</annotation>
-								<complexType>
-									<sequence>
-										<element name="class" type="xsd:string">
-											<annotation>
-												<documentation xml:lang="en">The genre that is associated with a specified program record.</documentation>
-											</annotation>
-										</element>
-										<element name="relevance" type="xsd:int">
-											<annotation>
-												<documentation xml:lang="en">A relevence factor that applies to the genre classification for the program.  A relevence factor of 1 indicates that this is the top-level genre under which the program is classified.</documentation>
-											</annotation>
-										</element>
-									</sequence>
-								</complexType>
-							</element>
-						</sequence>
-						<attribute name="program" type="xsd:string" use="required"/>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<simpleType name="lineupTypes">
-		<annotation>
-			<documentation xml:lang="en">Standard lineup types.</documentation>
-		</annotation>
-		<restriction base="xsd:string">
-			<enumeration value="Cable"/>
-			<enumeration value="CableDigital"/>
-			<enumeration value="Satellite"/>
-			<enumeration value="LocalBroadcast"/>
-		</restriction>
-	</simpleType>
-			<xsd:complexType name="xtvdResponse">
-				<xsd:sequence>
-					<xsd:element name="messages">
-						<xsd:annotation>
-							<xsd:documentation xml:lang="en">A collection of messages that may be sent back by the server to the client.  Messages are usually used by the server to notify the user of changes to their subscription caused by automatic changes in station's that are part of their subscription.  For instance, messages are passed back if a lineup selected by the user is no-longer valid, if all the stations selected by the user has been removed as they are no longer valid ... </xsd:documentation>
-						</xsd:annotation>
-						<xsd:complexType>
-							<xsd:sequence maxOccurs="unbounded" minOccurs="0">
-								<xsd:element name="message" type="xsd:string">
-									<xsd:annotation>
-										<xsd:documentation xml:lang="en">An individual message that is passed back by the server.</xsd:documentation>
-									</xsd:annotation>
-								</xsd:element>
-							</xsd:sequence>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="xtvdDocument" type="tms:xtvd"/>
-				</xsd:sequence>
-			</xsd:complexType>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="downloadResponse">
-		<wsdl:part name="xtvdResponse" type="tms:xtvdResponse"/>
-	</wsdl:message>
-	<wsdl:message name="downloadRequest">
-		<wsdl:part name="startTime" type="tms:dateTime"/>
-		<wsdl:part name="endTime" type="tms:dateTime"/>
-	</wsdl:message>
-	<wsdl:message name="activateRequest">
-		<wsdl:part name="deviceType" type="xsd:string"/>
-		<wsdl:part name="activationKey" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="webserviceFault"/>
-	<wsdl:message name="activateResponse"/>
-	<wsdl:portType name="xtvdPortType">
-		<wsdl:operation name="activate">
-			<wsdl:input message="tms:activateRequest"/>
-			<wsdl:output message="tms:activateResponse"/>
-			<wsdl:fault message="tms:webserviceFault" name="webserviceFault"/>
-		</wsdl:operation>
-		<wsdl:operation name="download">
-			<wsdl:input message="tms:downloadRequest"/>
-			<wsdl:output message="tms:downloadResponse"/>
-			<wsdl:fault message="tms:webserviceFault" name="webserviceFault"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="xtvdBinding" type="tms:xtvdPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="activate">
-			<soap:operation soapAction="urn:TMSWebServices:xtvdWebService#activate"/>
-			<wsdl:input>
-				<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:TMSWebServices" use="encoded"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-			</wsdl:output>
-			<wsdl:fault name="webserviceFault">
-				<soap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="tms:webserviceFault" namespace="urn:TMSWebServices" use="encoded"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="download">
-			<soap:operation soapAction="urn:TMSWebServices:xtvdWebService#download"/>
-			<wsdl:input>
-				<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:TMSWebServices" use="encoded"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-			</wsdl:output>
-			<wsdl:fault name="webserviceFault">
-				<soap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="tms:webserviceFault" namespace="urn:TMSWebServices" use="encoded"/>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="xtvdWebService">
-		<wsdl:port binding="tms:xtvdBinding" name="xtvdWebServicePort">
-			<soap:address location="http://datadirect.webservices.zap2it.com/tvlistings/xtvdService"/>
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/bugs/bug28751.phpt b/ext/soap/tests/bugs/bug28751.phpt
deleted file mode 100644
index a37a2c15eb..0000000000
--- a/ext/soap/tests/bugs/bug28751.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-Bug #28751 (SoapServer does not call _autoload())
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function __autoload($className) {
-	class SoapServerActions {
-    function test() {
-      return "Hello World";
-    }
-	}
-}
-
-$server = new SoapServer(NULL, array('uri'=>"http://testuri.org"));
-$server->setClass("SoapServerActions");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt
deleted file mode 100644
index 6634888eac..0000000000
--- a/ext/soap/tests/bugs/bug28969.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-Bug #28969 (Wrong data encoding of special characters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-  return "��";
-//  return utf8_encode("��");
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
-                                    'uri'=>'http://testuri.org',
-                                    'encoding'=>'ISO-8859-1')); 
-var_dump($x->test());
-echo "ok\n";
-?>
---EXPECT--
-string(3) "��"
-ok
diff --git a/ext/soap/tests/bugs/bug28985.phpt b/ext/soap/tests/bugs/bug28985.phpt
deleted file mode 100644
index 291cce0cbb..0000000000
--- a/ext/soap/tests/bugs/bug28985.phpt
+++ /dev/null
@@ -1,204 +0,0 @@
---TEST--
-Bug #28985 (__getTypes() returning nothing on complex WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SOAPClient(dirname(__FILE__).'/bug28985.wsdl', array('trace'=>1));
-var_dump($client->__getTypes());
-?>
---EXPECT--
-array(42) {
-  [0]=>
-  string(100) "struct LoginMGDIS {
- string iUserLogin;
- string iUserId;
- string iUserPassword;
- string iProfilId;
-}"
-  [1]=>
-  string(29) "struct LoginMGDISResponse {
-}"
-  [2]=>
-  string(28) "struct GetIdentification {
-}"
-  [3]=>
-  string(77) "struct GetIdentificationResponse {
- ArrayOfAnyType GetIdentificationResult;
-}"
-  [4]=>
-  string(43) "struct ArrayOfAnyType {
- anyType anyType;
-}"
-  [5]=>
-  string(37) "struct RollbackCurrentTransaction {
-}"
-  [6]=>
-  string(45) "struct RollbackCurrentTransactionResponse {
-}"
-  [7]=>
-  string(68) "struct GetListeProfil {
- string iUserLogin;
- string iUserPassword;
-}"
-  [8]=>
-  string(86) "struct MGCodeLibelle {
- string Code;
- string Libelle;
- boolean Defaut;
- anyType Tag;
-}"
-  [9]=>
-  string(61) "struct ArrayOfMGCodeLibelle {
- MGCodeLibelle MGCodeLibelle;
-}"
-  [10]=>
-  string(77) "struct GetListeProfilResponse {
- ArrayOfMGCodeLibelle GetListeProfilResult;
-}"
-  [11]=>
-  string(41) "struct GetListeValCodif {
- string Code;
-}"
-  [12]=>
-  string(43) "struct ArrayOfMGCodif {
- MGCodif MGCodif;
-}"
-  [13]=>
-  string(18) "struct MGCodif {
-}"
-  [14]=>
-  string(75) "struct GetListeValCodifResponse {
- ArrayOfMGCodif GetListeValCodifResult;
-}"
-  [15]=>
-  string(39) "struct TestPhpSoap {
- MGCodif entree;
-}"
-  [16]=>
-  string(57) "struct TestPhpSoapResponse {
- string TestPhpSoapResult;
-}"
-  [17]=>
-  string(50) "struct GetListeCodif {
- boolean iGetListeValeur;
-}"
-  [18]=>
-  string(87) "struct MGCodifGrp {
- string TypeCodif;
- string LibCodif;
- ArrayOfMGCodif ListeCodifs;
-}"
-  [19]=>
-  string(52) "struct ArrayOfMGCodifGrp {
- MGCodifGrp MGCodifGrp;
-}"
-  [20]=>
-  string(72) "struct GetListeCodifResponse {
- ArrayOfMGCodifGrp GetListeCodifResult;
-}"
-  [21]=>
-  string(57) "struct DroitCreation {
- string iObjet;
- string iProfil;
-}"
-  [22]=>
-  string(62) "struct DroitCreationResponse {
- boolean DroitCreationResult;
-}"
-  [23]=>
-  string(74) "struct ListeDroitCreation {
- ArrayOfString iListeObjet;
- string iProfil;
-}"
-  [24]=>
-  string(40) "struct ArrayOfString {
- string string;
-}"
-  [25]=>
-  string(79) "struct ListeDroitCreationResponse {
- ArrayOfAnyType ListeDroitCreationResult;
-}"
-  [26]=>
-  string(87) "struct GetDroitsObjetProtege {
- string iObjet;
- string iProfil;
- string iUtilisateur;
-}"
-  [27]=>
-  string(154) "struct MGDroitsObjetProtege {
- string LbUti;
- string LbProf;
- string LbServ;
- string LbDir;
- boolean isProtected;
- ArrayOfMGDroitAcces ListeDroitsAcces;
-}"
-  [28]=>
-  string(58) "struct ArrayOfMGDroitAcces {
- MGDroitAcces MGDroitAcces;
-}"
-  [29]=>
-  string(104) "struct MGDroitAcces {
- string IdProfil;
- boolean Lecture;
- boolean Modification;
- boolean Suppression;
-}"
-  [30]=>
-  string(91) "struct GetDroitsObjetProtegeResponse {
- MGDroitsObjetProtege GetDroitsObjetProtegeResult;
-}"
-  [31]=>
-  string(76) "struct GetPrivileges {
- string iIdSupport;
- int iIdForme;
- string iProfil;
-}"
-  [32]=>
-  string(68) "struct GetPrivilegesResponse {
- ArrayOfString GetPrivilegesResult;
-}"
-  [33]=>
-  string(46) "struct GetLibelleProfil {
- string iIdProfil;
-}"
-  [34]=>
-  string(67) "struct GetLibelleProfilResponse {
- string GetLibelleProfilResult;
-}"
-  [35]=>
-  string(91) "struct GetValeurRecherche {
- string iChampSource;
- string iTable;
- string iOrderByClause;
-}"
-  [36]=>
-  string(78) "struct GetValeurRechercheResponse {
- ArrayOfString GetValeurRechercheResult;
-}"
-  [37]=>
-  string(128) "struct GetValeurRechercheWithClauseWhere {
- string iChampSource;
- string iTable;
- string iClauseWhere;
- string iOrderByClause;
-}"
-  [38]=>
-  string(108) "struct GetValeurRechercheWithClauseWhereResponse {
- ArrayOfString GetValeurRechercheWithClauseWhereResult;
-}"
-  [39]=>
-  string(27) "struct GetEnvironnement {
-}"
-  [40]=>
-  string(106) "struct MGEnvironnement {
- string RepBureautique;
- string RepBureautiqueImage;
- string RepBureautiqueDoc;
-}"
-  [41]=>
-  string(76) "struct GetEnvironnementResponse {
- MGEnvironnement GetEnvironnementResult;
-}"
-}
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug28985.wsdl b/ext/soap/tests/bugs/bug28985.wsdl
deleted file mode 100644
index ee528818bb..0000000000
--- a/ext/soap/tests/bugs/bug28985.wsdl
+++ /dev/null
@@ -1,683 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-xmlns:s="http://www.w3.org/2001/XMLSchema"
-xmlns:s0="http://tempuri.org/"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
-xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-targetNamespace="http://tempuri.org/"
-xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified"
-targetNamespace="http://tempuri.org/">
-      <s:element name="LoginMGDIS">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iUserLogin"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iUserId"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iUserPassword"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iProfilId"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="LoginMGDISResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="GetIdentification">
-        <s:complexType />
-      </s:element>
-      <s:element name="GetIdentificationResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetIdentificationResult" type="s0:ArrayOfAnyType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfAnyType">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="anyType"
-nillable="true" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="RollbackCurrentTransaction">
-        <s:complexType />
-      </s:element>
-      <s:element name="RollbackCurrentTransactionResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="GetListeProfil">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iUserLogin"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iUserPassword"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="MGCodeLibelle">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="Code"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Libelle"
-type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Defaut"
-type="s:boolean" />
-          <s:element minOccurs="0" maxOccurs="1" name="Tag" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfMGCodeLibelle">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded"
-name="MGCodeLibelle" nillable="true" type="s0:MGCodeLibelle" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="GetListeProfilResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetListeProfilResult" type="s0:ArrayOfMGCodeLibelle" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetListeValCodif">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="Code"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfMGCodif">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="MGCodif"
-nillable="true" type="s0:MGCodif" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="MGCodif">
-        <s:complexContent mixed="false">
-          <s:extension base="s0:MGCodeLibelle" />
-        </s:complexContent>
-      </s:complexType>
-      <s:element name="GetListeValCodifResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetListeValCodifResult" type="s0:ArrayOfMGCodif" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="TestPhpSoap">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="entree"
-type="s0:MGCodif" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="TestPhpSoapResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="TestPhpSoapResult" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetListeCodif">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1"
-name="iGetListeValeur" type="s:boolean" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="MGCodifGrp">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="TypeCodif"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="LibCodif"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="ListeCodifs"
-type="s0:ArrayOfMGCodif" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfMGCodifGrp">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded"
-name="MGCodifGrp" nillable="true" type="s0:MGCodifGrp" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="GetListeCodifResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetListeCodifResult" type="s0:ArrayOfMGCodifGrp" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="DroitCreation">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iObjet"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iProfil"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="DroitCreationResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1"
-name="DroitCreationResult" type="s:boolean" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ListeDroitCreation">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iListeObjet"
-type="s0:ArrayOfString" />
-            <s:element minOccurs="0" maxOccurs="1" name="iProfil"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfString">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="string"
-nillable="true" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="ListeDroitCreationResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="ListeDroitCreationResult" type="s0:ArrayOfAnyType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetDroitsObjetProtege">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iObjet"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iProfil"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iUtilisateur"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="MGDroitsObjetProtege">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="LbUti"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="LbProf"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="LbServ"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="LbDir"
-type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="isProtected"
-type="s:boolean" />
-          <s:element minOccurs="0" maxOccurs="1" name="ListeDroitsAcces"
-type="s0:ArrayOfMGDroitAcces" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfMGDroitAcces">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded"
-name="MGDroitAcces" nillable="true" type="s0:MGDroitAcces" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="MGDroitAcces">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="IdProfil"
-type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Lecture"
-type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="Modification"
-type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="Suppression"
-type="s:boolean" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="GetDroitsObjetProtegeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetDroitsObjetProtegeResult" type="s0:MGDroitsObjetProtege" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetPrivileges">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iIdSupport"
-type="s:string" />
-            <s:element minOccurs="1" maxOccurs="1" name="iIdForme"
-type="s:int" />
-            <s:element minOccurs="0" maxOccurs="1" name="iProfil"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetPrivilegesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetPrivilegesResult" type="s0:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetLibelleProfil">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iIdProfil"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetLibelleProfilResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetLibelleProfilResult" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetValeurRecherche">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iChampSource"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iTable"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iOrderByClause"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetValeurRechercheResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetValeurRechercheResult" type="s0:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetValeurRechercheWithClauseWhere">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="iChampSource"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iTable"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iClauseWhere"
-type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="iOrderByClause"
-type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetValeurRechercheWithClauseWhereResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetValeurRechercheWithClauseWhereResult" type="s0:ArrayOfString"
-/>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetEnvironnement">
-        <s:complexType />
-      </s:element>
-      <s:complexType name="MGEnvironnement">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="RepBureautique"
-type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1"
-name="RepBureautiqueImage" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1"
-name="RepBureautiqueDoc" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="GetEnvironnementResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1"
-name="GetEnvironnementResult" type="s0:MGEnvironnement" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-    </s:schema>
-  </types>
-  <message name="LoginMGDISSoapIn">
-    <part name="parameters" element="s0:LoginMGDIS" />
-  </message>
-  <message name="LoginMGDISSoapOut">
-    <part name="parameters" element="s0:LoginMGDISResponse" />
-  </message>
-  <message name="GetIdentificationSoapIn">
-    <part name="parameters" element="s0:GetIdentification" />
-  </message>
-  <message name="GetIdentificationSoapOut">
-    <part name="parameters" element="s0:GetIdentificationResponse" />
-  </message>
-  <message name="RollbackCurrentTransactionSoapIn">
-    <part name="parameters" element="s0:RollbackCurrentTransaction" />
-  </message>
-  <message name="RollbackCurrentTransactionSoapOut">
-    <part name="parameters"
-element="s0:RollbackCurrentTransactionResponse" />
-  </message>
-  <message name="GetListeProfilSoapIn">
-    <part name="parameters" element="s0:GetListeProfil" />
-  </message>
-  <message name="GetListeProfilSoapOut">
-    <part name="parameters" element="s0:GetListeProfilResponse" />
-  </message>
-  <message name="GetListeValCodifSoapIn">
-    <part name="parameters" element="s0:GetListeValCodif" />
-  </message>
-  <message name="GetListeValCodifSoapOut">
-    <part name="parameters" element="s0:GetListeValCodifResponse" />
-  </message>
-  <message name="TestPhpSoapSoapIn">
-    <part name="parameters" element="s0:TestPhpSoap" />
-  </message>
-  <message name="TestPhpSoapSoapOut">
-    <part name="parameters" element="s0:TestPhpSoapResponse" />
-  </message>
-  <message name="GetListeCodifSoapIn">
-    <part name="parameters" element="s0:GetListeCodif" />
-  </message>
-  <message name="GetListeCodifSoapOut">
-    <part name="parameters" element="s0:GetListeCodifResponse" />
-  </message>
-  <message name="DroitCreationSoapIn">
-    <part name="parameters" element="s0:DroitCreation" />
-  </message>
-  <message name="DroitCreationSoapOut">
-    <part name="parameters" element="s0:DroitCreationResponse" />
-  </message>
-  <message name="ListeDroitCreationSoapIn">
-    <part name="parameters" element="s0:ListeDroitCreation" />
-  </message>
-  <message name="ListeDroitCreationSoapOut">
-    <part name="parameters" element="s0:ListeDroitCreationResponse" />
-  </message>
-  <message name="GetDroitsObjetProtegeSoapIn">
-    <part name="parameters" element="s0:GetDroitsObjetProtege" />
-  </message>
-  <message name="GetDroitsObjetProtegeSoapOut">
-    <part name="parameters" element="s0:GetDroitsObjetProtegeResponse"
-/>
-  </message>
-  <message name="GetPrivilegesSoapIn">
-    <part name="parameters" element="s0:GetPrivileges" />
-  </message>
-  <message name="GetPrivilegesSoapOut">
-    <part name="parameters" element="s0:GetPrivilegesResponse" />
-  </message>
-  <message name="GetLibelleProfilSoapIn">
-    <part name="parameters" element="s0:GetLibelleProfil" />
-  </message>
-  <message name="GetLibelleProfilSoapOut">
-    <part name="parameters" element="s0:GetLibelleProfilResponse" />
-  </message>
-  <message name="GetValeurRechercheSoapIn">
-    <part name="parameters" element="s0:GetValeurRecherche" />
-  </message>
-  <message name="GetValeurRechercheSoapOut">
-    <part name="parameters" element="s0:GetValeurRechercheResponse" />
-  </message>
-  <message name="GetValeurRechercheWithClauseWhereSoapIn">
-    <part name="parameters"
-element="s0:GetValeurRechercheWithClauseWhere" />
-  </message>
-  <message name="GetValeurRechercheWithClauseWhereSoapOut">
-    <part name="parameters"
-element="s0:GetValeurRechercheWithClauseWhereResponse" />
-  </message>
-  <message name="GetEnvironnementSoapIn">
-    <part name="parameters" element="s0:GetEnvironnement" />
-  </message>
-  <message name="GetEnvironnementSoapOut">
-    <part name="parameters" element="s0:GetEnvironnementResponse" />
-  </message>
-  <portType name="MGServiceNoyauNETSoap">
-    <operation name="LoginMGDIS">
-      <input message="s0:LoginMGDISSoapIn" />
-      <output message="s0:LoginMGDISSoapOut" />
-    </operation>
-    <operation name="GetIdentification">
-      <input message="s0:GetIdentificationSoapIn" />
-      <output message="s0:GetIdentificationSoapOut" />
-    </operation>
-    <operation name="RollbackCurrentTransaction">
-      <input message="s0:RollbackCurrentTransactionSoapIn" />
-      <output message="s0:RollbackCurrentTransactionSoapOut" />
-    </operation>
-    <operation name="GetListeProfil">
-      <input message="s0:GetListeProfilSoapIn" />
-      <output message="s0:GetListeProfilSoapOut" />
-    </operation>
-    <operation name="GetListeValCodif">
-      <input message="s0:GetListeValCodifSoapIn" />
-      <output message="s0:GetListeValCodifSoapOut" />
-    </operation>
-    <operation name="TestPhpSoap">
-      <input message="s0:TestPhpSoapSoapIn" />
-      <output message="s0:TestPhpSoapSoapOut" />
-    </operation>
-    <operation name="GetListeCodif">
-      <input message="s0:GetListeCodifSoapIn" />
-      <output message="s0:GetListeCodifSoapOut" />
-    </operation>
-    <operation name="DroitCreation">
-      <input message="s0:DroitCreationSoapIn" />
-      <output message="s0:DroitCreationSoapOut" />
-    </operation>
-    <operation name="ListeDroitCreation">
-      <input message="s0:ListeDroitCreationSoapIn" />
-      <output message="s0:ListeDroitCreationSoapOut" />
-    </operation>
-    <operation name="GetDroitsObjetProtege">
-      <input message="s0:GetDroitsObjetProtegeSoapIn" />
-      <output message="s0:GetDroitsObjetProtegeSoapOut" />
-    </operation>
-    <operation name="GetPrivileges">
-      <input message="s0:GetPrivilegesSoapIn" />
-      <output message="s0:GetPrivilegesSoapOut" />
-    </operation>
-    <operation name="GetLibelleProfil">
-      <input message="s0:GetLibelleProfilSoapIn" />
-      <output message="s0:GetLibelleProfilSoapOut" />
-    </operation>
-    <operation name="GetValeurRecherche">
-      <input message="s0:GetValeurRechercheSoapIn" />
-      <output message="s0:GetValeurRechercheSoapOut" />
-    </operation>
-    <operation name="GetValeurRechercheWithClauseWhere">
-      <input message="s0:GetValeurRechercheWithClauseWhereSoapIn" />
-      <output message="s0:GetValeurRechercheWithClauseWhereSoapOut" />
-    </operation>
-    <operation name="GetEnvironnement">
-      <input message="s0:GetEnvironnementSoapIn" />
-      <output message="s0:GetEnvironnementSoapOut" />
-    </operation>
-  </portType>
-  <binding name="MGServiceNoyauNETSoap"
-type="s0:MGServiceNoyauNETSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-style="document" />
-    <operation name="LoginMGDIS">
-      <soap:operation soapAction="http://tempuri.org/LoginMGDIS"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetIdentification">
-      <soap:operation soapAction="http://tempuri.org/GetIdentification"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="RollbackCurrentTransaction">
-      <soap:operation
-soapAction="http://tempuri.org/RollbackCurrentTransaction"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetListeProfil">
-      <soap:operation soapAction="http://tempuri.org/GetListeProfil"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetListeValCodif">
-      <soap:operation soapAction="http://tempuri.org/GetListeValCodif"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="TestPhpSoap">
-      <soap:operation soapAction="http://tempuri.org/TestPhpSoap"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetListeCodif">
-      <soap:operation soapAction="http://tempuri.org/GetListeCodif"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="DroitCreation">
-      <soap:operation soapAction="http://tempuri.org/DroitCreation"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="ListeDroitCreation">
-      <soap:operation soapAction="http://tempuri.org/ListeDroitCreation"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetDroitsObjetProtege">
-      <soap:operation
-soapAction="http://tempuri.org/GetDroitsObjetProtege" style="document"
-/>
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetPrivileges">
-      <soap:operation soapAction="http://tempuri.org/GetPrivileges"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetLibelleProfil">
-      <soap:operation soapAction="http://tempuri.org/GetLibelleProfil"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetValeurRecherche">
-      <soap:operation soapAction="http://tempuri.org/GetValeurRecherche"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetValeurRechercheWithClauseWhere">
-      <soap:operation
-soapAction="http://tempuri.org/GetValeurRechercheWithClauseWhere"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetEnvironnement">
-      <soap:operation soapAction="http://tempuri.org/GetEnvironnement"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <service name="MGServiceNoyauNET">
-    <port name="MGServiceNoyauNETSoap"
-binding="s0:MGServiceNoyauNETSoap">
-      <soap:address
-location="http://localhost/SoapSrvSOFI/MGServiceNoyauNET.asmx" />
-    </port>
-  </service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt
deleted file mode 100644
index 0bf8917fa5..0000000000
--- a/ext/soap/tests/bugs/bug29061.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Bug #29061 (soap extension segfaults)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0)); 
-$client->getQuote("ibm"); 
-echo "ok\n";
-?>
---EXPECT--
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug29061.wsdl b/ext/soap/tests/bugs/bug29061.wsdl
deleted file mode 100644
index fb4d9aa3b5..0000000000
--- a/ext/soap/tests/bugs/bug29061.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://
-schemas.xmlsoap.org/wsdl/http/"
-xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/e
-ncoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-xmlns:y="http://new.webservice.namespace" targetNamespace="http
-://new.webservice.namespace">
-<types>
-<xs:schema/>
-</types>
-<message name="getQuoteResponse">
-<part name="parameter" element="" type="xs:string"/>
-</message>
-<message name="getQuoteRequest">
-<part name="String" element="" type="xs:string"/>
-</message>
-<portType name="SOAPport">
-<operation name="getQuote">
-<input message="y:getQuoteRequest"/>
-<output message="y:getQuoteResponse"/>
-</operation>
-</portType>
-<binding name="bindingName" type="y:SOAPport">
-<soap:binding style="rpc"
-transport="http://schemas.xmlsoap.org/soap/http"/>
-<operation name="getQuote">
-<input>
-<soap:body use="literal"/>
-</input>
-<output>
-<soap:body use="literal"/>
-</output>
-</operation>
-</binding>
-<service name="myService">
-<port name="myPort" binding="y:bindingName">
-<soap:address location="test://"/>
-</port>
-</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt
deleted file mode 100644
index 91d3ea265f..0000000000
--- a/ext/soap/tests/bugs/bug29109.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Bug #29109 (Uncaught SoapFault exception: [WSDL] Out of memory)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/bug29109.wsdl");
-var_dump($client->__getFunctions()); 
-?>
---EXPECT--
-array(3) {
-  [0]=>
-  string(53) "HelloWorldResponse HelloWorld(HelloWorld $parameters)"
-  [1]=>
-  string(19) "string HelloWorld()"
-  [2]=>
-  string(19) "string HelloWorld()"
-}
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug29109.wsdl b/ext/soap/tests/bugs/bug29109.wsdl
deleted file mode 100644
index 800cd2357d..0000000000
--- a/ext/soap/tests/bugs/bug29109.wsdl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>
-<definitions xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-xmlns:s0="http://tempuri.org/"
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-xmlns:s="http://www.w3.org/2001/XMLSchema"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
-xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" name="test"
-targetNamespace="http://tempuri.org/"
-xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <xs:schema elementFormDefault="qualified"
-targetNamespace="http://tempuri.org/"
-xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="HelloWorld">
-        <xs:complexType />
-      </xs:element>
-      <xs:element name="HelloWorldResponse">
-        <xs:complexType>
-          <xs:sequence>
-
-            <xs:element minOccurs="0" maxOccurs="1"
-name="HelloWorldResult" type="xs:string" />
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="string" type="xs:string" />
-    </xs:schema>
-  </types>
-  <message name="HelloWorldSoapIn">
-    <part name="parameters" element="s0:HelloWorld" />
-
-  </message>
-  <message name="HelloWorldSoapOut">
-    <part name="parameters" element="s0:HelloWorldResponse" />
-  </message>
-  <message name="HelloWorldHttpGetIn" />
-  <message name="HelloWorldHttpGetOut">
-    <part name="Body" element="s0:string" />
-  </message>
-  <message name="HelloWorldHttpPostIn" />
-
-  <message name="HelloWorldHttpPostOut">
-    <part name="Body" element="s0:string" />
-  </message>
-  <portType name="testSoap">
-    <operation name="HelloWorld">
-      <input message="s0:HelloWorldSoapIn" />
-      <output message="s0:HelloWorldSoapOut" />
-    </operation>
-  </portType>
-
-  <portType name="testHttpGet">
-    <operation name="HelloWorld">
-      <input message="s0:HelloWorldHttpGetIn" />
-      <output message="s0:HelloWorldHttpGetOut" />
-    </operation>
-  </portType>
-  <portType name="testHttpPost">
-    <operation name="HelloWorld">
-      <input message="s0:HelloWorldHttpPostIn" />
-
-      <output message="s0:HelloWorldHttpPostOut" />
-    </operation>
-  </portType>
-  <binding name="testSoap" type="s0:testSoap">
-    <soap:binding style="document"
-transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="HelloWorld">
-      <soap:operation soapAction="http://tempuri.org/HelloWorld"
-style="document" />
-      <input>
-        <soap:body use="literal" />
-
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <binding name="testHttpGet" type="s0:testHttpGet">
-    <http:binding verb="GET" />
-    <operation name="HelloWorld">
-
-      <http:operation location="/HelloWorld" />
-      <input>
-        <http:urlEncoded />
-      </input>
-      <output>
-        <mime:mimeXml part="Body" />
-      </output>
-    </operation>
-  </binding>
-
-  <binding name="testHttpPost" type="s0:testHttpPost">
-    <http:binding verb="POST" />
-    <operation name="HelloWorld">
-      <http:operation location="/HelloWorld" />
-      <input>
-        <mime:content part="" type="application/x-www-form-urlencoded"
-/>
-      </input>
-      <output>
-        <mime:mimeXml part="Body" />
-
-      </output>
-    </operation>
-  </binding>
-  <service name="test">
-    <port name="testSoap" binding="s0:testSoap">
-      <soap:address location="http://localhost:81/test.asmx" />
-    </port>
-    <port name="testHttpGet" binding="s0:testHttpGet">
-      <http:address location="http://localhost:81/test.asmx" />
-
-    </port>
-    <port name="testHttpPost" binding="s0:testHttpPost">
-      <http:address location="http://localhost:81/test.asmx" />
-    </port>
-  </service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt
deleted file mode 100644
index 4dbc302c17..0000000000
--- a/ext/soap/tests/bugs/bug29236.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-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()); 
-?>
---EXPECT--
-array(4) {
-  [0]=>
-  string(59) "StartSessionResponse StartSession(StartSession $parameters)"
-  [1]=>
-  string(62) "VerifySessionResponse VerifySession(VerifySession $parameters)"
-  [2]=>
-  string(41) "LogoutResponse Logout(Logout $parameters)"
-  [3]=>
-  string(62) "GetSystemInfoResponse GetSystemInfo(GetSystemInfo $parameters)"
-}
diff --git a/ext/soap/tests/bugs/bug29236.wsdl b/ext/soap/tests/bugs/bug29236.wsdl
deleted file mode 100644
index d60a4871d4..0000000000
--- a/ext/soap/tests/bugs/bug29236.wsdl
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://isis.ais.ucla.edu/ws/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://isis.ais.ucla.edu/ws/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://isis.ais.ucla.edu/ws/">
-      <s:element name="StartSession">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="uclaId" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="userIpAddr" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="StartSessionResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="iwsResponse" nillable="true" type="s0:IwsResponse" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="IwsResponse">
-        <s:sequence>
-          <s:element minOccurs="1" maxOccurs="1" name="sessionInfo" nillable="true" type="s0:IwsSession" />
-          <s:element minOccurs="1" maxOccurs="1" name="errorInfo" nillable="true" type="s0:IwsErrorCollection" />
-        </s:sequence>
-        <s:attribute name="action" type="s0:ActionEnum" />
-        <s:attribute name="hasErrors" type="s:boolean" />
-        <s:attribute name="transactionId" type="s:long" />
-      </s:complexType>
-      <s:complexType name="IwsSession">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="userAttributes" type="s0:ArrayOfIwsUserAttribute" />
-          <s:element minOccurs="0" maxOccurs="1" name="accounts" type="s0:ArrayOfIwsAccount" />
-          <s:element minOccurs="1" maxOccurs="1" name="ticket" nillable="true" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="uclaId" nillable="true" type="s:string" />
-        </s:sequence>
-        <s:attribute name="status" type="s0:SessionStatus" />
-      </s:complexType>
-      <s:complexType name="ArrayOfIwsUserAttribute">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="attribute" type="s0:IwsUserAttribute" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="IwsUserAttribute">
-        <s:attribute name="name" type="s:string" />
-        <s:attribute name="value" type="s:string" />
-      </s:complexType>
-      <s:complexType name="ArrayOfIwsAccount">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="account" type="s0:IwsAccount" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="IwsAccount">
-        <s:attribute name="loginId" type="s:string" />
-        <s:attribute name="type" type="s0:LoginType" />
-        <s:attribute name="status" type="s0:AccountStatus" />
-      </s:complexType>
-      <s:simpleType name="LoginType">
-        <s:restriction base="s:string">
-          <s:enumeration value="BruinOnline" />
-          <s:enumeration value="ACF2" />
-          <s:enumeration value="QDB" />
-          <s:enumeration value="UID" />
-          <s:enumeration value="CommonLogon" />
-          <s:enumeration value="RACF" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="AccountStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Unknown" />
-          <s:enumeration value="Active" />
-          <s:enumeration value="Authenticated" />
-          <s:enumeration value="AuthenticatedWithCachedCredential" />
-          <s:enumeration value="NotAuthenticated" />
-          <s:enumeration value="PermmanentlySuspended" />
-          <s:enumeration value="TemporarilySuspended" />
-          <s:enumeration value="PasswordResetRequired" />
-          <s:enumeration value="InvalidID" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="SessionStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Uninitialized" />
-          <s:enumeration value="Active" />
-          <s:enumeration value="ActiveWithCachedCredential" />
-          <s:enumeration value="ActiveWithMultipleCredentials" />
-          <s:enumeration value="Expired" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="IwsErrorCollection">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="errors" type="s0:ArrayOfIwsError" />
-        </s:sequence>
-        <s:attribute name="count" type="s:int" />
-      </s:complexType>
-      <s:complexType name="ArrayOfIwsError">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="error" type="s0:IwsError" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="IwsError">
-        <s:attribute name="errorCode" type="s:int" />
-        <s:attribute name="detail" type="s:string" />
-      </s:complexType>
-      <s:simpleType name="ActionEnum">
-        <s:restriction base="s:string">
-          <s:enumeration value="GetInfo" />
-          <s:enumeration value="Start" />
-          <s:enumeration value="Verify" />
-          <s:enumeration value="Logout" />
-        </s:restriction>
-      </s:simpleType>
-      <s:element name="wsConsumerCredential" type="s0:WsConsumerCredential" />
-      <s:complexType name="WsConsumerCredential">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="id" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="password" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="VerifySession">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ticket" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="userIpAddr" type="s:string" />
-            <s:element minOccurs="1" maxOccurs="1" name="returnExtendedAttributes" type="s:boolean" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="VerifySessionResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="iwsResponse" nillable="true" type="s0:IwsResponse" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="Logout">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ticket" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="userIpAddr" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="LogoutResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="iwsResponse" nillable="true" type="s0:IwsResponse" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetSystemInfo">
-        <s:complexType />
-      </s:element>
-      <s:element name="GetSystemInfoResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetSystemInfoResult" type="s0:ArrayOfIwsAttribute" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfIwsAttribute">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="IwsAttribute" type="s0:IwsAttribute" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="IwsAttribute">
-        <s:attribute name="name" type="s:string" />
-        <s:attribute name="value" type="s:string" />
-      </s:complexType>
-    </s:schema>
-  </types>
-  <message name="StartSessionSoapIn">
-    <part name="parameters" element="s0:StartSession" />
-  </message>
-  <message name="StartSessionSoapOut">
-    <part name="parameters" element="s0:StartSessionResponse" />
-  </message>
-  <message name="StartSessionwsConsumerCredential">
-    <part name="wsConsumerCredential" element="s0:wsConsumerCredential" />
-  </message>
-  <message name="VerifySessionSoapIn">
-    <part name="parameters" element="s0:VerifySession" />
-  </message>
-  <message name="VerifySessionSoapOut">
-    <part name="parameters" element="s0:VerifySessionResponse" />
-  </message>
-  <message name="VerifySessionwsConsumerCredential">
-    <part name="wsConsumerCredential" element="s0:wsConsumerCredential" />
-  </message>
-  <message name="LogoutSoapIn">
-    <part name="parameters" element="s0:Logout" />
-  </message>
-  <message name="LogoutSoapOut">
-    <part name="parameters" element="s0:LogoutResponse" />
-  </message>
-  <message name="LogoutwsConsumerCredential">
-    <part name="wsConsumerCredential" element="s0:wsConsumerCredential" />
-  </message>
-  <message name="GetSystemInfoSoapIn">
-    <part name="parameters" element="s0:GetSystemInfo" />
-  </message>
-  <message name="GetSystemInfoSoapOut">
-    <part name="parameters" element="s0:GetSystemInfoResponse" />
-  </message>
-  <message name="GetSystemInfowsConsumerCredential">
-    <part name="wsConsumerCredential" element="s0:wsConsumerCredential" />
-  </message>
-  <portType name="IsisSoap">
-    <operation name="StartSession">
-      <input message="s0:StartSessionSoapIn" />
-      <output message="s0:StartSessionSoapOut" />
-    </operation>
-    <operation name="VerifySession">
-      <input message="s0:VerifySessionSoapIn" />
-      <output message="s0:VerifySessionSoapOut" />
-    </operation>
-    <operation name="Logout">
-      <input message="s0:LogoutSoapIn" />
-      <output message="s0:LogoutSoapOut" />
-    </operation>
-    <operation name="GetSystemInfo">
-      <input message="s0:GetSystemInfoSoapIn" />
-      <output message="s0:GetSystemInfoSoapOut" />
-    </operation>
-  </portType>
-  <portType name="IsisHttpGet" />
-  <portType name="IsisHttpPost" />
-  <binding name="IsisSoap" type="s0:IsisSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="StartSession">
-      <soap:operation soapAction="http://isis.ais.ucla.edu/ws/StartSession" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header d5p1:required="true" message="s0:StartSessionwsConsumerCredential" part="wsConsumerCredential" use="literal" xmlns:d5p1="http://schemas.xmlsoap.org/wsdl/" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="VerifySession">
-      <soap:operation soapAction="http://isis.ais.ucla.edu/ws/VerifySession" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header d5p1:required="true" message="s0:VerifySessionwsConsumerCredential" part="wsConsumerCredential" use="literal" xmlns:d5p1="http://schemas.xmlsoap.org/wsdl/" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="Logout">
-      <soap:operation soapAction="http://isis.ais.ucla.edu/ws/Logout" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header d5p1:required="true" message="s0:LogoutwsConsumerCredential" part="wsConsumerCredential" use="literal" xmlns:d5p1="http://schemas.xmlsoap.org/wsdl/" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="GetSystemInfo">
-      <soap:operation soapAction="http://isis.ais.ucla.edu/ws/GetSystemInfo" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header d5p1:required="true" message="s0:GetSystemInfowsConsumerCredential" part="wsConsumerCredential" use="literal" xmlns:d5p1="http://schemas.xmlsoap.org/wsdl/" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <binding name="IsisHttpGet" type="s0:IsisHttpGet">
-    <http:binding verb="GET" />
-  </binding>
-  <binding name="IsisHttpPost" type="s0:IsisHttpPost">
-    <http:binding verb="POST" />
-  </binding>
-  <service name="Isis">
-    <port name="IsisSoap" binding="s0:IsisSoap">
-      <soap:address location="http://isisdev1.tig.ucla.edu/iws/v4.asmx" />
-    </port>
-    <port name="IsisHttpGet" binding="s0:IsisHttpGet">
-      <http:address location="http://isisdev1.tig.ucla.edu/iws/v4.asmx" />
-    </port>
-    <port name="IsisHttpPost" binding="s0:IsisHttpPost">
-      <http:address location="http://isisdev1.tig.ucla.edu/iws/v4.asmx" />
-    </port>
-  </service>
-</definitions>
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt
deleted file mode 100644
index 52f8862fda..0000000000
--- a/ext/soap/tests/bugs/bug29795.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Bug #29795 (SegFault with Soap and Amazon's Web Services)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" 
-xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body><Price><Amount>3995</Amount><CurrencyCode>USD</CurrencyCode></Price></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-  }
-
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29795.wsdl",array("trace"=>1));
-$ar=$client->GetPrice();
-echo "o";
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29795.wsdl",array("trace"=>1));
-$ar=$client->GetPrice();
-echo "k\n";
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/bugs/bug29795.wsdl b/ext/soap/tests/bugs/bug29795.wsdl
deleted file mode 100644
index 5a4499da0d..0000000000
--- a/ext/soap/tests/bugs/bug29795.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://xml.amazon.com/AWSProductData/2004-08-01" targetNamespace="http://xml.amazon.com/AWSProductData/2004-08-01">
-	<types>
-		<xs:schema targetNamespace="http://xml.amazon.com/AWSProductData/2004-08-01" elementFormDefault="qualified">
-			<xs:complexType name="Price">
-				<xs:sequence>
-					<xs:element name="Amount" type="xs:integer" minOccurs="0"/>
-					<xs:element name="CurrencyCode" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-	</types>
-	<message name="GetPriceRequest">
-	</message>
-	<message name="GetPriceResponse">
-		<part name="Price" type="tns:Price"/>
-	</message>
-	<portType name="AWSProductDataPortType">
-		<operation name="GetPrice">
-			<input message="tns:GetPriceRequest"/>
-			<output message="tns:GetPriceResponse"/>
-		</operation>
-	</portType>
-	<binding name="AWSProductDataBinding" type="tns:AWSProductDataPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="GetPrice">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="AWSProductData">
-		<port name="AWSProductDataPort" binding="tns:AWSProductDataBinding">
-			<soap:address location="http://aws-beta.amazon.com/onca/soap?Service=AWSProductData"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug29830.phpt b/ext/soap/tests/bugs/bug29830.phpt
deleted file mode 100644
index dc090f82cc..0000000000
--- a/ext/soap/tests/bugs/bug29830.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-Bug #29844 (SoapServer::setClass() should not export non-public methods)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-class hello_world {   
-  public function hello($to) {
-    return 'Hello ' . $to;
-  }    
-  private function bye($to) {
-    return 'Bye ' . $to;
-  }    
-}
-
-$server = new SoapServer(NULL, array("uri"=>"test://"));
-$server->setClass('hello_world');
-$functions = $server->getFunctions();
-foreach($functions as $func) {
-  echo $func . "\n";
-}
-?>
---EXPECT--
-hello
diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
deleted file mode 100644
index 25b4512a72..0000000000
--- a/ext/soap/tests/bugs/bug29839.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Bug #29839 incorrect convert (xml:lang to lang)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-function EchoString($s) {
-  return $s;
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('EchoString');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); 
-$client->EchoString(array("value"=>"hello","lang"=>"en"));
-echo $client->__getLastRequest();
-echo $client->__getLastResponse();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug29839.wsdl b/ext/soap/tests/bugs/bug29839.wsdl
deleted file mode 100644
index d8ccb97954..0000000000
--- a/ext/soap/tests/bugs/bug29839.wsdl
+++ /dev/null
@@ -1,42 +0,0 @@
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://test-uri" targetNamespace="http://test-uri">
-	<types>
-		<xs:schema targetNamespace="http://test-uri" elementFormDefault="qualified">
-			<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" />
-			<complexType name="LocalizedString">
-				<sequence>
-					<element name="value" type="xsd:string"/>
-				</sequence>
-				<attribute ref="xml:lang" use="required"/>
-			</complexType>
-		</xs:schema>
-	</types>
-	<message name="EchoStringRequest">
-		<part name="string" type="tns:LocalizedString"/>
-	</message>
-	<message name="EchoStringResponse">
-		<part name="string" type="tns:LocalizedString"/>
-	</message>
-	<portType name="AWSProductDataPortType">
-		<operation name="EchoString">
-			<input message="tns:EchoStringRequest"/>
-			<output message="tns:EchoStringResponse"/>
-		</operation>
-	</portType>
-	<binding name="AWSProductDataBinding" type="tns:AWSProductDataPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="EchoString">
-			<soap:operation soapAction="http://test-uri"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="AWSProductData">
-		<port name="AWSProductDataPort" binding="tns:AWSProductDataBinding">
-			<soap:address location="http://aws-beta.amazon.com/onca/soap?Service=AWSProductData"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt
deleted file mode 100644
index bef8335709..0000000000
--- a/ext/soap/tests/bugs/bug29844.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-Bug #29844 (SOAP doesn't return the result of a valid SOAP request)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-class hello_world {   
-  public function hello($to) {
-    return 'Hello ' . $to;
-  }    
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->setClass('hello_world');;
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1)); 
-var_dump($client->hello('davey'));
-?>
---EXPECT--
-string(11) "Hello davey"
diff --git a/ext/soap/tests/bugs/bug29844.wsdl b/ext/soap/tests/bugs/bug29844.wsdl
deleted file mode 100644
index b45aa3666f..0000000000
--- a/ext/soap/tests/bugs/bug29844.wsdl
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" ?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://davey.synapticmedia.net/php-mag/shafikdavey_automaticwebservices/src/Listing%201.php" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" name="Crtx_SOAP_AutoDiscover_Example" targetNamespace="http://davey.synapticmedia.net/php-mag/shafikdavey_automaticwebservices/src/Listing%201.php">
-  <portType name="Crtx_SOAP_AutoDiscover_ExamplePort">
-    <operation name="hello">
-      <input message="tns:helloRequest" />
-      <output message="tns:helloResponse" />
-      <documentation>Say Hello to Somebody</documentation>
-    </operation>
-    <operation name="goodBye">
-      <input message="tns:goodByeRequest" />
-      <output message="tns:goodByeResponse" />
-      <documentation>Say Goodbye to Somebody</documentation>
-    </operation>
-  </portType>
-  <binding name="Crtx_SOAP_AutoDiscover_ExampleBinding"
-  type="tns:Crtx_SOAP_AutoDiscover_ExamplePort">
-    <soap:binding style="document"
-    transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="hello">
-      <input>
-        <soap:body use="encoded"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-      <output>
-        <soap:body use="encoded"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </output>
-      <soap:operation soapAction="http://davey.synapticmedia.net/php-mag/shafikdavey_automaticwebservices/src/Listing%201.php#hello" />
-    </operation>
-    <soap:binding style="document"
-    transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="goodBye">
-      <input>
-        <soap:body use="encoded"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-      <output>
-        <soap:body use="encoded"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </output>
-      <soap:operation soapAction="http://davey.synapticmedia.net/php-mag/shafikdavey_automaticwebservices/src/Listing%201.php#goodBye" />
-    </operation>
-  </binding>
-  <service name="Crtx_SOAP_AutoDiscover_ExampleService">
-    <port name="tns:Crtx_SOAP_AutoDiscover_ExamplePort"
-    binding="tns:Crtx_SOAP_AutoDiscover_ExampleBinding">
-      <soap:address location="http://davey.synapticmedia.net/php-mag/shafikdavey_automaticwebservices/src/Listing%201.php" />
-    </port>
-  </service>
-  <message name="helloRequest">
-    <part name="to" type="xsd:string" />
-    <documentation>Say Hello to Somebody</documentation>
-  </message>
-  <message name="helloResponse">
-    <part name="helloReturn" type="xsd:string" />
-    <documentation>The greeting</documentation>
-  </message>
-  <message name="goodByeRequest">
-    <part name="to" type="xsd:string" />
-    <documentation>Say Goodbye to Somebody</documentation>
-  </message>
-  <message name="goodByeResponse">
-    <part name="goodByeReturn" type="xsd:string" />
-    <documentation>The goodbye</documentation>
-  </message>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt
deleted file mode 100644
index 02424713c5..0000000000
--- a/ext/soap/tests/bugs/bug30045.phpt
+++ /dev/null
@@ -1,171 +0,0 @@
---TEST--
-Bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests)
---SKIPIF--
-<?php 
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-  if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
-?>
---FILE--
-<?php
-
-function foo($type, $num) {
-  return new SoapVar($num, $type);
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('foo');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    $xml = simplexml_load_string($request);
-    echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";
-    unset($xml);
-
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-
-    return $response;
-  }
-
-}
-
-$soap = new LocalSoapClient(NULL, array("uri"=>"http://test-uri", "location"=>"test://"));
-
-function test($type, $num) {
-  global $soap;
-  try {
-	  printf("  %0.0f\n    ", $num);  	
-	  $ret = $soap->foo($type, new SoapVar($num, $type));
-	  printf("    %0.0f\n", $ret);
-	} catch (SoapFault $ex) {
-	  var_dump($ex);
-	}
-}
-/*
-echo "byte\n";
-//test(XSD_BYTE, -129);
-test(XSD_BYTE, -128);
-test(XSD_BYTE,  127);
-//test(XSD_BYTE,  128);
-
-echo "\nshort\n";
-//test(XSD_SHORT, -32769);
-test(XSD_SHORT, -32768);
-test(XSD_SHORT,  32767);
-//test(XSD_SHORT,  32768);
-
-echo "\nint\n";
-//test(XSD_INT, -2147483649);
-test(XSD_INT, -2147483648);
-test(XSD_INT,  2147483647);
-//test(XSD_INT,  2147483648);
-
-echo "\nlong\n";
-//test(XSD_LONG, -9223372036854775809);
-test(XSD_LONG, -9223372036854775808);
-test(XSD_LONG,  9223372036854775807);
-//test(XSD_LONG,  9223372036854775808);
-
-echo "\nunsignedByte\n";
-//test(XSD_UNSIGNEDBYTE, -1);
-test(XSD_UNSIGNEDBYTE,  0);
-test(XSD_UNSIGNEDBYTE,  255);
-//test(XSD_UNSIGNEDBYTE,  256);
-
-echo "\nunsignedShort\n";
-//test(XSD_UNSIGNEDSHORT, -1);
-test(XSD_UNSIGNEDSHORT,  0);
-test(XSD_UNSIGNEDSHORT,  65535);
-//test(XSD_UNSIGNEDSHORT,  65536);
-
-echo "\nunsignedInt\n";
-//test(XSD_UNSIGNEDINT, -1);
-test(XSD_UNSIGNEDINT,  0);
-test(XSD_UNSIGNEDINT,  4294967295);
-//test(XSD_UNSIGNEDINT,  4294967296);
-
-echo "\nunsignedLong\n";
-//test(XSD_UNSIGNEDLONG, -1);
-test(XSD_UNSIGNEDLONG,  0);
-test(XSD_UNSIGNEDLONG,  18446744073709551615);
-//test(XSD_UNSIGNEDLONG,  18446744073709551616);
-
-echo "\nnegativeInteger\n";
-test(XSD_NEGATIVEINTEGER, -18446744073709551616);
-test(XSD_NEGATIVEINTEGER, -1);
-//test(XSD_NEGATIVEINTEGER,  0);
-
-echo "\nnonPositiveInteger\n";
-test(XSD_NONPOSITIVEINTEGER, -18446744073709551616);
-test(XSD_NONPOSITIVEINTEGER,  0);
-//test(XSD_NONPOSITIVEINTEGER,  1);
-
-echo "\nnonNegativeInteger\n";
-//test(XSD_NONNEGATIVEINTEGER, -1);
-test(XSD_NONNEGATIVEINTEGER,  0);
-test(XSD_NONNEGATIVEINTEGER,  18446744073709551616);
-
-echo "\nPositiveInteger\n";
-//test(XSD_POSITIVEINTEGER,  0);
-test(XSD_POSITIVEINTEGER,  1);
-test(XSD_POSITIVEINTEGER,  18446744073709551616);
-
-echo "\ninteger\n";
-test(XSD_INTEGER, -18446744073709551616);
-test(XSD_INTEGER,  18446744073709551616);
-*/
-echo "long\n";
-test(XSD_LONG, 2147483647);
-test(XSD_LONG, 2147483648);
-test(XSD_LONG,  4294967296);
-test(XSD_LONG,  8589934592);
-test(XSD_LONG, 17179869184); 
-
-echo "\nunsignedLong\n";
-test(XSD_UNSIGNEDLONG,  2147483647);
-test(XSD_UNSIGNEDLONG,  2147483648);
-test(XSD_UNSIGNEDLONG,  4294967296);
-test(XSD_UNSIGNEDLONG,  8589934592);
-test(XSD_UNSIGNEDLONG, 17179869184);
-
-?>
---EXPECT--
-long
-  2147483647
-    <param1 xsi:type="xsd:long">2147483647</param1>
-    2147483647
-  2147483648
-    <param1 xsi:type="xsd:long">2147483648</param1>
-    2147483648
-  4294967296
-    <param1 xsi:type="xsd:long">4294967296</param1>
-    4294967296
-  8589934592
-    <param1 xsi:type="xsd:long">8589934592</param1>
-    8589934592
-  17179869184
-    <param1 xsi:type="xsd:long">17179869184</param1>
-    17179869184
-
-unsignedLong
-  2147483647
-    <param1 xsi:type="xsd:unsignedLong">2147483647</param1>
-    2147483647
-  2147483648
-    <param1 xsi:type="xsd:unsignedLong">2147483648</param1>
-    2147483648
-  4294967296
-    <param1 xsi:type="xsd:unsignedLong">4294967296</param1>
-    4294967296
-  8589934592
-    <param1 xsi:type="xsd:unsignedLong">8589934592</param1>
-    8589934592
-  17179869184
-    <param1 xsi:type="xsd:unsignedLong">17179869184</param1>
-    17179869184
diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
deleted file mode 100644
index dbc44f6f0d..0000000000
--- a/ext/soap/tests/bugs/bug30106.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-Bug #30106 SOAP cannot not parse 'ref' element. Causes Uncaught SoapFault exception.
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled", 0);
-
-function getContinentList() {
-	return array("getContinentListResult"=>array(
-	  "schema"=>"<xsd:schema><element name=\"test\" type=\"xsd:string\"/></xsd:schema>",
-	  "any"=>"<test>Hello World!</test><test>Bye World!</test>"));
-}
-
-class LocalSoapClient extends SoapClient {
-  function __construct($wsdl, $options=array()) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-		$this->server->addFunction("getContinentList"); 
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-  	echo $request;
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-  	echo $response;
-    return $response;
-  }
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug30106.wsdl");
-var_dump($client->__getFunctions());
-var_dump($client->__getTypes());
-$x = $client->getContinentList(array("AFFILIATE_ID"=>1,"PASSWORD"=>"x"));
-var_dump($x);
-?>
---EXPECTF--
-array(1) {
-  [0]=>
-  string(71) "getContinentListResponse getContinentList(getContinentList $parameters)"
-}
-array(3) {
-  [0]=>
-  string(64) "struct getContinentList {
- int AFFILIATE_ID;
- string PASSWORD;
-}"
-  [1]=>
-  string(83) "struct getContinentListResponse {
- getContinentListResult getContinentListResult;
-}"
-  [2]=>
-  string(66) "struct getContinentListResult {
- <anyXML> schema;
- <anyXML> any;
-}"
-}
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://tempuri.org/PRWebServ/getOtherInformation"><SOAP-ENV:Body><ns1:getContinentList><ns1:AFFILIATE_ID>1</ns1:AFFILIATE_ID><ns1:PASSWORD>x</ns1:PASSWORD></ns1:getContinentList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://tempuri.org/PRWebServ/getOtherInformation"><SOAP-ENV:Body><ns1:getContinentListResponse><ns1:getContinentListResult><xsd:schema><element name="test" type="xsd:string"/></xsd:schema><test>Hello World!</test><test>Bye World!</test></ns1:getContinentListResult></ns1:getContinentListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (1) {
-  ["getContinentListResult"]=>
-  object(stdClass)#%d (2) {
-    ["schema"]=>
-    string(65) "<xsd:schema><element name="test" type="xsd:string"/></xsd:schema>"
-    ["any"]=>
-    string(48) "<test>Hello World!</test><test>Bye World!</test>"
-  }
-}
diff --git a/ext/soap/tests/bugs/bug30106.wsdl b/ext/soap/tests/bugs/bug30106.wsdl
deleted file mode 100644
index db1922da33..0000000000
--- a/ext/soap/tests/bugs/bug30106.wsdl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://tempuri.org/PRWebServ/getOtherInformation" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://tempuri.org/PRWebServ/getOtherInformation" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/PRWebServ/getOtherInformation">
-      <s:import namespace="http://www.w3.org/2001/XMLSchema" />
-      <s:element name="getContinentList">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="AFFILIATE_ID" type="s:int" />
-            <s:element minOccurs="0" maxOccurs="1" name="PASSWORD" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="getContinentListResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="getContinentListResult">
-              <s:complexType>
-                <s:sequence>
-                  <s:element ref="s:schema" />
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="getContinentListSoapIn">
-    <wsdl:part name="parameters" element="tns:getContinentList" />
-  </wsdl:message>
-  <wsdl:message name="getContinentListSoapOut">
-    <wsdl:part name="parameters" element="tns:getContinentListResponse" />
-  </wsdl:message>
-  <wsdl:portType name="getOtherInformationSoap">
-    <wsdl:operation name="getContinentList">
-      <wsdl:input message="tns:getContinentListSoapIn" />
-      <wsdl:output message="tns:getContinentListSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="getOtherInformationSoap" type="tns:getOtherInformationSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <wsdl:operation name="getContinentList">
-      <soap:operation soapAction="http://tempuri.org/PRWebServ/getOtherInformation/getContinentList" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="getOtherInformation">
-    <wsdl:port name="getOtherInformationSoap" binding="tns:getOtherInformationSoap">
-      <soap:address location="http://www.precisionreservations.com/PRWebServ/getOtherInformation.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug30175.phpt b/ext/soap/tests/bugs/bug30175.phpt
deleted file mode 100644
index f5501ac9bd..0000000000
--- a/ext/soap/tests/bugs/bug30175.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-Bug #30175 (SOAP results aren't parsed correctly)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-
-class LocalSoapClient extends SoapClient {
-
-  function __doRequest($request, $location, $action, $version) {
-    return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope
-xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:ns1="urn:qweb">
-<SOAP-ENV:Body
-SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-id="_0">
-<ns1:HostInfo xsi:type="ns1:HostInfo">
-<name xsi:type="xsd:string">blah blah some name field</name>
-<shortDescription xsi:type="xsd:string">This is a description. more blah blah blah</shortDescription>
-<ipAddress xsi:type="xsd:string">127.0.0.1</ipAddress>
-</ns1:HostInfo>
-</SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-  }
-
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug30175.wsdl");
-var_dump($client->qwebGetHostInfo());
-?>
---EXPECT--
-array(3) {
-  ["name"]=>
-  string(25) "blah blah some name field"
-  ["shortDescription"]=>
-  string(42) "This is a description. more blah blah blah"
-  ["ipAddress"]=>
-  string(9) "127.0.0.1"
-}
diff --git a/ext/soap/tests/bugs/bug30175.wsdl b/ext/soap/tests/bugs/bug30175.wsdl
deleted file mode 100644
index f4cae2554e..0000000000
--- a/ext/soap/tests/bugs/bug30175.wsdl
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="qweb"
- targetNamespace="http://www.newsblob.com/qweb.wsdl"
- xmlns:tns="http://www.newsblob.com/qweb.wsdl"
- xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="urn:qweb"
- xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-<types>
-
- <schema targetNamespace="urn:qweb"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns1="urn:qweb"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified">
-  <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-  <complexType name="qwebGetHostInfoResponse">
-   <sequence>
-    <element name="return" type="ns1:HostInfo" minOccurs="1" maxOccurs="1"/>
-   </sequence>
-  </complexType>
-  <complexType name="ArrayOfHostInfo">
-   <complexContent>
-    <restriction base="SOAP-ENC:Array">
-     <sequence>
-      <element name="item" type="ns1:HostInfo" minOccurs="0" maxOccurs="unbounded"/>
-     </sequence>
-     <attribute ref="SOAP-ENC:arrayType" WSDL:arrayType="ns1:HostInfo[]"/>
-    </restriction>
-   </complexContent>
-  </complexType>
- </schema>
-
-</types>
-
-<message name="qwebSquareRequest">
- <part name="mynum" type="xsd:int"/>
-</message>
-
-<message name="qwebSquareResponse">
- <part name="result" type="xsd:int"/>
-</message>
-
-<message name="qwebStrlenRequest">
- <part name="mystr" type="xsd:string"/>
-</message>
-
-<message name="qwebStrlenResponse">
- <part name="result" type="xsd:int"/>
-</message>
-
-<message name="qwebGetHostInfoRequest">
-</message>
-
-<message name="HostInfo">
- <part name="name" type="xsd:string"/>
- <part name="shortDescription" type="xsd:string"/>
- <part name="ipAddress" type="xsd:string"/>
-</message>
-
-<portType name="qwebPortType">
- <operation name="qwebSquare">
-  <documentation>Service definition of function ns1__qwebSquare</documentation>
-  <input message="tns:qwebSquareRequest"/>
-  <output message="tns:qwebSquareResponse"/>
- </operation>
- <operation name="qwebStrlen">
-  <documentation>Service definition of function ns1__qwebStrlen</documentation>
-  <input message="tns:qwebStrlenRequest"/>
-  <output message="tns:qwebStrlenResponse"/>
- </operation>
- <operation name="qwebGetHostInfo">
-  <documentation>Service definition of function ns1__qwebGetHostInfo</documentation>
-  <input message="tns:qwebGetHostInfoRequest"/>
-  <output message="tns:HostInfo"/>
- </operation>
-</portType>
-
-<binding name="qweb" type="tns:qwebPortType">
- <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="qwebSquare">
-  <SOAP:operation style="rpc" soapAction=""/>
-  <input>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </input>
-  <output>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </output>
- </operation>
- <operation name="qwebStrlen">
-  <SOAP:operation style="rpc" soapAction=""/>
-  <input>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </input>
-  <output>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </output>
- </operation>
- <operation name="qwebGetHostInfo">
-  <SOAP:operation style="rpc" soapAction=""/>
-  <input>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </input>
-  <output>
-   <SOAP:body use="encoded" namespace="urn:qweb" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-  </output>
- </operation>
-</binding>
-
-<service name="qweb">
- <documentation>Demo Qweb SOAP interface</documentation>
- <port name="qweb" binding="tns:qweb">
-  <SOAP:address location="http://www.newsblob.com:6969"/>
- </port>
-</service>
-
-</definitions>
diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt
deleted file mode 100644
index d5f2da5170..0000000000
--- a/ext/soap/tests/bugs/bug30799.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-Bug #30799 SoapServer doesn't handle private or protected properties 
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class foo {
-	public    $a="a";
-	private   $b="b";
-	protected $c="c";
-		
-}
-
-$x = new SoapClient(NULL,array("location"=>"test://",
-                               "uri" => "test://",
-                               "exceptions" => 0,
-                               "trace" => 1 ));
-$x->test(new foo());
-echo $x->__getLastRequest();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" 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><param0 xsi:type="SOAP-ENC:Struct"><a xsi:type="xsd:string">a</a><b xsi:type="xsd:string">b</b><c xsi:type="xsd:string">c</c></param0></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
deleted file mode 100644
index c7b497c0ed..0000000000
--- a/ext/soap/tests/bugs/bug30928.phpt
+++ /dev/null
@@ -1,63 +0,0 @@
---TEST--
-Bug #30928 When Using WSDL, SoapServer doesn't handle private or protected properties 
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled", 0);
-
-class foo {
-	public    $a="a";
-	private   $b="b";
-	protected $c="c";
-}
-
-function test($x) {
-  return $x;
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", 
-                         array());
-var_dump($x->test(new foo()));
-
-$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", 
-                         array("classmap" => array('testType'=>'foo')));
-var_dump($x->test(new foo()));
-
-echo "ok\n";
-?>
---EXPECTF--
-object(stdClass)#%d (3) {
-  ["a"]=>
-  string(1) "a"
-  ["b"]=>
-  string(1) "b"
-  ["c"]=>
-  string(1) "c"
-}
-object(foo)#%d (3) {
-  ["a"]=>
-  string(1) "a"
-  ["b:private"]=>
-  string(1) "b"
-  ["c:protected"]=>
-  string(1) "c"
-}
-ok
diff --git a/ext/soap/tests/bugs/bug30928.wsdl b/ext/soap/tests/bugs/bug30928.wsdl
deleted file mode 100644
index 7ed34d31a2..0000000000
--- a/ext/soap/tests/bugs/bug30928.wsdl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions name="InteropTest"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-    xmlns:tns="http://test-uri/"
-    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/">
-  <types>
-  <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/">
-   <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-   <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" />
-	 <complexType name="testType">
-		<sequence>
-			<element name="a" type="string"/>
-			<element name="b" type="string"/>
-		</sequence>
-		<attribute name="c" type="string"/>
-	 </complexType>
-  </schema>
-  </types>
-  <message name="testMessage">
-  	<part name="testParam" type="tns:testType"/>
-  </message>
-	<portType name="testPortType">
-		<operation name="test">
-			<input message="testMessage"/>
-			<output message="testMessage"/>
-		</operation>
-	</portType>
-	<binding name="testBinding" type="testPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="test">
-			<soap:operation soapAction="#test" style="rpc"/>
-			<input>
-				<soap:body use="encoded" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="testService">
-   <port name="testPort" binding="tns:testBinding">
-     <soap:address location="test://" /> 
-   </port>
- </service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt
deleted file mode 100644
index 7e811bbbf9..0000000000
--- a/ext/soap/tests/bugs/bug30994.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-Bug #30994 SOAP server unable to handle request with references 
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-	xmlns:tns="http://spock/kunta/kunta"
-	xmlns:types="http://spock/kunta/kunta/encodedTypes"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<soap:Body
-soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-	<q1:bassCall xmlns:q1="http://spock/bass/types/kunta">
-		<system xsi:type="xsd:string">XXX</system>
-		<function xsi:type="xsd:string">TASKTEST</function>
-		<parameter href="#id1" />
-	</q1:bassCall>
-	
-	<soapenc:Array id="id1" soapenc:arrayType="tns:Item[1]">
-		<Item href="#id2" />
-	</soapenc:Array>
-	
-	<tns:Item id="id2" xsi:type="tns:Item">
-		<key xsi:type="xsd:string">ABCabc123</key>
-		<val xsi:type="xsd:string">123456</val>
-	</tns:Item>
-	
-</soap:Body>
-</soap:Envelope>
-EOF;
-
-function bassCall() {
-  return "ok";
-}
-
-$x = new SoapServer(NULL, array("uri"=>"http://spock/kunta/kunta"));
-$x->addFunction("bassCall");
-$x->handle();
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://spock/kunta/kunta" 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:bassCallResponse><return xsi:type="xsd:string">ok</return></ns1:bassCallResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt
deleted file mode 100644
index fbad1cbd98..0000000000
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-Bug #31422 No Error-Logging on SoapServer-Side
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-log_errors=1
---FILE--
-<?php
-function Add($x,$y) {
-	fopen();
-	user_error("Hello", E_USER_ERROR);
-  return $x+$y;
-}
-
-$server = new SoapServer(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("Add");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Add xmlns:ns1="http://testuri.org">
-      <x xsi:type="xsd:int">22</x>
-      <y xsi:type="xsd:int">33</y>
-    </ns1:Add>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECTF--
-PHP Warning:  fopen() expects at least 2 parameters, 0 given in %sbug31422.php on line %d
-PHP Fatal error:  Hello in %sbug31422.php on line %d
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Hello</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
deleted file mode 100644
index 770f5b4b6d..0000000000
--- a/ext/soap/tests/bugs/bug31695.phpt
+++ /dev/null
@@ -1,62 +0,0 @@
---TEST--
-Bug #31695 Cannot redefine endpoint when using WSDL
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled", 0);
-
-function Test($x) {
-	return $x;
-}
-
-class LocalSoapClient extends SoapClient {
-  function __construct($wsdl, $options=array()) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-		$this->server->addFunction("Test"); 
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-  	echo "$location\n";
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl");
-$client->Test("str");
-$client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl", array("location"=>"test://1"));
-$client->Test("str");
-$client->__soapCall("Test", 
-                    array("arg1"),
-                     array("location"=>"test://2"));
-$old = $client->__setLocation("test://3");
-echo "$old\n";
-$client->Test("str");
-$client->Test("str");
-$client->__setLocation($old);
-$client->Test("str");
-$old = $client->__setLocation();
-$client->Test("str");
-$client->__setLocation($old);
-$client->Test("str");
-$client->__setLocation(null);
-$client->Test("str");
-var_dump($client->__setLocation());
-?>
---EXPECT--
-test://0
-test://1
-test://2
-test://1
-test://3
-test://3
-test://1
-test://0
-test://1
-test://0
-NULL
diff --git a/ext/soap/tests/bugs/bug31695.wsdl b/ext/soap/tests/bugs/bug31695.wsdl
deleted file mode 100644
index 5785cb0770..0000000000
--- a/ext/soap/tests/bugs/bug31695.wsdl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<definitions
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    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/"
-    xmlns:si="http://soapinterop.org/xsd"
-    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-
-  <message name="TestRequest">
-    <part name="x" type="xsd:string" />
-  </message>
-  <message name="TestResponse">
-    <part name="result" type="xsd:string" />
-  </message>
-
-  <portType name="TestServicePortType">
-    <operation name="Test">
-      <input message="tns:TestRequest" />
-      <output message="tns:TestResponse" />
-    </operation>
-  </portType>
-
-  <binding name="TestServiceBinding" type="tns:TestServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="Test">
-      <soap:operation soapAction="Test" style="rpc" />
-      <input>
-        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-      <output>
-        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </output>
-    </operation>
-  </binding>
-
-  <service name="TestService">
-    <port name="TestServicePort" binding="tns:TestServiceBinding">
-      <soap:address location="test://0" />
-    </port>
-  </service>
-
-</definitions>
diff --git a/ext/soap/tests/bugs/bug31755.phpt b/ext/soap/tests/bugs/bug31755.phpt
deleted file mode 100644
index 6523588c92..0000000000
--- a/ext/soap/tests/bugs/bug31755.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Bug #31422 No Error-Logging on SoapServer-Side
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client=new SOAPClient(null, array('location' => 'http://localhost',
-'uri' => 'myNS', 'exceptions' => false, 'trace' => true));
-
-$header = new SOAPHeader(null, 'foo', 'bar');
-
-$response= $client->__call('function', array(), null, $header);
-
-print $client->__getLastRequest();
-?>
---EXPECTF--
-Fatal error: SoapHeader::SoapHeader(): Invalid parameters. Invalid namespace. in %s on line %d
diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
deleted file mode 100644
index b3c4ff0170..0000000000
--- a/ext/soap/tests/bugs/bug32776.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-Bug #32776 SOAP doesn't support one-way operations
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$d = null;
-
-function test($x) {
-	global $d;
-	$d = $x;
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); 
-var_dump($x->test("Hello"));
-var_dump($d);
-var_dump($x->__getLastRequest());
-var_dump($x->__getLastResponse());
-echo "ok\n";
-?>
---EXPECT--
-NULL
-string(5) "Hello"
-string(459) "<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" 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><SOAP-ENV:test><x xsi:type="xsd:string">Hello</x></SOAP-ENV:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-"
-string(0) ""
-ok
diff --git a/ext/soap/tests/bugs/bug32776.wsdl b/ext/soap/tests/bugs/bug32776.wsdl
deleted file mode 100644
index 733901849e..0000000000
--- a/ext/soap/tests/bugs/bug32776.wsdl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<definitions
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    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/"
-    xmlns:si="http://soapinterop.org/xsd"
-    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-
-  <types>
-    <xsd:schema targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" />
-    </xsd:schema>
-  </types>
-
-  <message name="TestRequest">
-    <part name="x" type="xsd:string" />
-  </message>
-
-  <portType name="TestServicePortType">
-    <operation name="test">
-      <input message="tns:TestRequest" />
-    </operation>
-  </portType>
-
-  <binding name="TestServiceBinding" type="tns:TestServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="test">
-      <soap:operation soapAction="Add" style="rpc" />
-      <input>
-        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-    </operation>
-  </binding>
-
-  <service name="TestService">
-    <port name="TestServicePort" binding="tns:TestServiceBinding">
-      <soap:address location="http://linuxsrv.home/~dmitry/soap/soap_server.php" />
-    </port>
-  </service>
-
-</definitions>
diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt
deleted file mode 100755
index 5fd17df18e..0000000000
--- a/ext/soap/tests/bugs/bug32941.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Bug #32941 (Sending structured exception kills a php)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
-  	return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope
-xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<soapenv:Body>
-		<soapenv:Fault>
-			<faultcode>soapenv:Server.userException</faultcode>
-			<faultstring>service.EchoServiceException</faultstring>
-			<detail>
-				<service.EchoServiceException xsi:type="ns1:EchoServiceException" xmlns:ns1="urn:service.EchoService">
-					<intParameter xsi:type="xsd:int">105</intParameter>
-					<parameter xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">string param</parameter>
-				</service.EchoServiceException>
-				<ns2:hostname xmlns:ns2="http://xml.apache.org/axis/">steckovic</ns2:hostname>
-			</detail>
-		</soapenv:Fault>
-	</soapenv:Body>
-</soapenv:Envelope>
-EOF;
-	}
-}
-
-ini_set("soap.wsdl_cache_enabled", 1);
-$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0));
-$ahoj = $client->echoString('exception');
-$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0));
-$ahoj = $client->echoString('exception');
-echo "ok\n";
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/bugs/bug32941.wsdl b/ext/soap/tests/bugs/bug32941.wsdl
deleted file mode 100755
index 61fd13dcbc..0000000000
--- a/ext/soap/tests/bugs/bug32941.wsdl
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://212.24.157.117:8080/axis/services/echo" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://212.24.157.117:8080/axis/services/echo" xmlns:intf="http://212.24.157.117:8080/axis/services/echo" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:service.EchoService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.2RC3
-Built on Feb 28, 2005 (10:15:14 EST)-->
- <wsdl:types>
-  <schema targetNamespace="urn:service.EchoService" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="EchoServiceException">
-    <sequence>
-     <element name="intParameter" type="xsd:int"/>
-     <element name="parameter" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="Person">
-    <sequence>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="surname" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="echoStringResponse">
-
-      <wsdl:part name="echoStringReturn" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="EchoServiceException">
-
-      <wsdl:part name="EchoServiceException" type="tns1:EchoServiceException"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="echoStringRequest">
-
-      <wsdl:part name="e" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="echoPersonResponse">
-
-      <wsdl:part name="echoPersonReturn" type="tns1:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="echoPersonRequest">
-
-      <wsdl:part name="p" type="tns1:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="EchoService">
-
-      <wsdl:operation name="echoString" parameterOrder="e">
-
-         <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/>
-
-         <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/>
-
-         <wsdl:fault message="impl:EchoServiceException" name="EchoServiceException"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="echoPerson" parameterOrder="p">
-
-         <wsdl:input message="impl:echoPersonRequest" name="echoPersonRequest"/>
-
-         <wsdl:output message="impl:echoPersonResponse" name="echoPersonResponse"/>
-
-         <wsdl:fault message="impl:EchoServiceException" name="EchoServiceException"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="echoSoapBinding" type="impl:EchoService">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="echoString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="echoStringRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:service.EchoService" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="echoStringResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://212.24.157.117:8080/axis/services/echo" use="encoded"/>
-
-         </wsdl:output>
-
-         <wsdl:fault name="EchoServiceException">
-
-            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="EchoServiceException" namespace="urn:service.EchoService" use="encoded"/>
-
-         </wsdl:fault>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="echoPerson">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="echoPersonRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://service" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="echoPersonResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://212.24.157.117:8080/axis/services/echo" use="encoded"/>
-
-         </wsdl:output>
-
-         <wsdl:fault name="EchoServiceException">
-
-            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="EchoServiceException" namespace="http://212.24.157.117:8080/axis/services/echo" use="encoded"/>
-
-         </wsdl:fault>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="EchoServiceService">
-
-      <wsdl:port binding="impl:echoSoapBinding" name="echo">
-
-         <wsdlsoap:address location="http://212.24.157.117:8080/axis/services/echo"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt
deleted file mode 100755
index 1bc9ff8749..0000000000
--- a/ext/soap/tests/bugs/bug34449.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Bug #34449 (ext/soap: XSD_ANYXML functionality not exposed)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
-  	echo "$request\n";
-  	exit;
-  }
-}
-
-$my_xml = "<array><item/><item/><item/></array>";
-$client = new TestSoapClient(null, array('location' => 'test://', 'uri' => 'test://'));
-$client->AnyFunction(new SoapVar($my_xml, XSD_ANYXML));
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:AnyFunction><array><item/><item/><item/></array></ns1:AnyFunction></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
deleted file mode 100755
index 7b6bba0253..0000000000
--- a/ext/soap/tests/bugs/bug34453.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Bug #29839 incorrect convert (xml:lang to lang)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-function EchoString($s) {
-  return $s;
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('EchoString');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1)); 
-$client->EchoString(array("value"=>"hello","lang"=>"en"));
-echo $client->__getLastRequest();
-echo $client->__getLastResponse();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug34453.wsdl b/ext/soap/tests/bugs/bug34453.wsdl
deleted file mode 100755
index 205e1c95b5..0000000000
--- a/ext/soap/tests/bugs/bug34453.wsdl
+++ /dev/null
@@ -1,42 +0,0 @@
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://test-uri" targetNamespace="http://test-uri">
-	<types>
-		<xs:schema targetNamespace="http://test-uri" elementFormDefault="qualified">
-			<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml2.xsd" />
-			<complexType name="LocalizedString">
-				<sequence>
-					<element name="value" type="xsd:string"/>
-				</sequence>
-				<attribute ref="xml:lang" use="required"/>
-			</complexType>
-		</xs:schema>
-	</types>
-	<message name="EchoStringRequest">
-		<part name="string" type="tns:LocalizedString"/>
-	</message>
-	<message name="EchoStringResponse">
-		<part name="string" type="tns:LocalizedString"/>
-	</message>
-	<portType name="AWSProductDataPortType">
-		<operation name="EchoString">
-			<input message="tns:EchoStringRequest"/>
-			<output message="tns:EchoStringResponse"/>
-		</operation>
-	</portType>
-	<binding name="AWSProductDataBinding" type="tns:AWSProductDataPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="EchoString">
-			<soap:operation soapAction="http://test-uri"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="AWSProductData">
-		<port name="AWSProductDataPort" binding="tns:AWSProductDataBinding">
-			<soap:address location="http://aws-beta.amazon.com/onca/soap?Service=AWSProductData"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt
deleted file mode 100755
index d05f9bd7f5..0000000000
--- a/ext/soap/tests/bugs/bug34643.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-Bug #34643 (wsdl default value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled", 0);
-
-class fp {
-	public function get_it($opt="zzz") {
-		return $opt;
-	}
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->setClass('fp');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$cl = new LocalSoapClient(dirname(__FILE__).'/bug34643.wsdl', array("trace"=>1));
-print_r($cl->__getFunctions());
-echo $cl->get_it("aaa")."\n";
-echo $cl->get_it()."\n";
-var_dump($cl->get_it(null));
-?>
---EXPECT--
-Array
-(
-    [0] => string get_it(string $opt)
-)
-aaa
-zzz
-NULL
diff --git a/ext/soap/tests/bugs/bug34643.wsdl b/ext/soap/tests/bugs/bug34643.wsdl
deleted file mode 100755
index 24c3a50828..0000000000
--- a/ext/soap/tests/bugs/bug34643.wsdl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<definitions name="wsdl" targetNamespace="urn:wsdl"
-xmlns:typens="urn:wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:wsdl">
-			<xsd:element name="opt" type="xsd:string" default="zzz" />
-		</xsd:schema>
-	</types>
-	<message name="get_it">
-		<part name="opt" element="typens:opt"/>
-	</message>
-	<message name="get_itResponse">
-		<part name="return" type="xsd:string"/>
-	</message>
-	<portType name="fpPortType">
-		<operation name="get_it">
-			<input message="typens:get_it"/>
-			<output message="typens:get_itResponse"/>
-		</operation>
-	</portType>
-	<binding name="fpBinding" type="typens:fpPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="get_it">
-			<soap:operation soapAction="urn:fpAction"/>
-			<input>
-				<soap:body namespace="urn:wsdl" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body namespace="urn:wsdl" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="wsdlService">
-		<port name="fpPort" binding="typens:fpBinding">
-			<soap:address location="**********"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
deleted file mode 100755
index e12b5ad98a..0000000000
--- a/ext/soap/tests/bugs/bug35142.phpt
+++ /dev/null
@@ -1,135 +0,0 @@
---TEST--
-Bug #35142 SOAP Client/Server Complex Object Support 
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled",0);
-$timestamp = "2005-11-08T11:22:07+03:00";
-$wsdl = dirname(__FILE__)."/bug35142.wsdl";
-
-function PostEvents($x) {
-	var_dump($x);
-	exit();
-  return $x;
-}
-
-class TestSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('PostEvents');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-		echo "$request\n";
-    $this->server->handle($request);
-    return $response;
-  }
-
-}
-
-$soapClient = new TestSoapClient($wsdl, 
-	array('trace' => 1, 'exceptions' => 0,
-		'classmap' => array('logOnEvent' => 'LogOnEvent',
-			'logOffEvent' => 'LogOffEvent',
-			'events' => 'IVREvents')));
-
-$logOnEvent = new LogOnEvent(34567, $timestamp);
-$logOffEvents[] = new LogOffEvent(34567, $timestamp, "Smoked");
-$logOffEvents[] = new LogOffEvent(34568, $timestamp, "SmokeFree");
-$ivrEvents = new IVREvents("1.0", 101, 12345, 'IVR', $logOnEvent, $logOffEvents);
-
-$result = $soapClient->PostEvents($ivrEvents);
-
-class LogOffEvent {
-  public $audienceMemberId;
-  public $timestamp;
-  public $smokeStatus;
-  public $callInitiator;
-
-  function __construct($audienceMemberId, $timestamp, $smokeStatus) {
-    $this->audienceMemberId = $audienceMemberId;
-    $this->timestamp = $timestamp;
-    $this->smokeStatus = $smokeStatus;
-    $this->callInitiator = "IVR";
-  }
-}
-
-class LogOnEvent {
-  public $audienceMemberId;
-  public $timestamp;
-
-  function __construct($audienceMemberId, $timestamp) {
-    $this->audienceMemberId = $audienceMemberId;
-    $this->timestamp = $timestamp;
-  }
-}
-
-class IVREvents {
-  public $version;
-  public $activityId;
-  public $messageId;
-  public $source;
-  public $logOnEvent;
-  public $logOffEvent;
-
-  function __construct($version, $activityId, $messageId, $source, $logOnEvent=NULL, $logOffEvent=NULL) {
-    $this->version = $version;
-    $this->activityId = $activityId;
-    $this->messageId = $messageId;
-    $this->source = $source;
-    $this->logOnEvent = $logOnEvent;
-    $this->logOffEvent = $logOffEvent;
-  }
-}
-?>
---EXPECTF--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testurl/Message"><SOAP-ENV:Body><ns1:ivrEvents version="1.0" activityId="101" messageId="12345" source="IVR"><ns1:logOffEvent audienceMemberId="34567" timestamp="2005-11-08T11:22:07+03:00" smokeStatus="Smoked" callInitiator="IVR"/><ns1:logOffEvent audienceMemberId="34568" timestamp="2005-11-08T11:22:07+03:00" smokeStatus="SmokeFree" callInitiator="IVR"/><ns1:logOnEvent audienceMemberId="34567" timestamp="2005-11-08T11:22:07+03:00"/></ns1:ivrEvents></SOAP-ENV:Body></SOAP-ENV:Envelope>
-
-object(IVREvents)#%d (6) {
-  ["version"]=>
-  string(3) "1.0"
-  ["activityId"]=>
-  int(101)
-  ["messageId"]=>
-  int(12345)
-  ["source"]=>
-  string(3) "IVR"
-  ["logOnEvent"]=>
-  object(LogOnEvent)#%d (2) {
-    ["audienceMemberId"]=>
-    int(34567)
-    ["timestamp"]=>
-    string(25) "2005-11-08T11:22:07+03:00"
-  }
-  ["logOffEvent"]=>
-  array(2) {
-    [0]=>
-    object(LogOffEvent)#%d (4) {
-      ["audienceMemberId"]=>
-      int(34567)
-      ["timestamp"]=>
-      string(25) "2005-11-08T11:22:07+03:00"
-      ["smokeStatus"]=>
-      string(6) "Smoked"
-      ["callInitiator"]=>
-      string(3) "IVR"
-    }
-    [1]=>
-    object(LogOffEvent)#%d (4) {
-      ["audienceMemberId"]=>
-      int(34568)
-      ["timestamp"]=>
-      string(25) "2005-11-08T11:22:07+03:00"
-      ["smokeStatus"]=>
-      string(9) "SmokeFree"
-      ["callInitiator"]=>
-      string(3) "IVR"
-    }
-  }
-}
diff --git a/ext/soap/tests/bugs/bug35142.wsdl b/ext/soap/tests/bugs/bug35142.wsdl
deleted file mode 100755
index 2c712ec108..0000000000
--- a/ext/soap/tests/bugs/bug35142.wsdl
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:s1="http://testurl/Events" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://testurl/Message" xmlns:s3="http://testurl/Smoker" xmlns:soap12enc="http://www.w3.org/2002/06/soap-envelope" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s4="http://testurl/AudienceMember" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s2="http://testurl/Actions" xmlns:tns="http://testurl/Service" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://testurl/Service" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://testurl/Message">
-      <s:import namespace="http://testurl/Events" />
-      <s:import namespace="http://testurl/Actions" />
-      <s:element name="ivrActions" type="s0:actions" />
-      <s:complexType name="actions">
-        <s:complexContent mixed="false">
-          <s:extension base="s0:abstractMessage">
-            <s:sequence>
-              <s:choice minOccurs="0" maxOccurs="unbounded">
-                <s:element minOccurs="0" maxOccurs="1" name="pauseSmokerAction" type="s2:pauseSmokerAction" />
-                <s:element minOccurs="0" maxOccurs="1" name="terminateSmokerAction" type="s2:terminateSmokerAction" />
-                <s:element minOccurs="0" maxOccurs="1" name="activateSmokerAction" type="s2:activateSmokerAction" />
-                <s:element minOccurs="0" maxOccurs="1" name="addSmokerAction" type="s2:addSmokerAction" />
-                <s:element minOccurs="0" maxOccurs="1" name="updateSmokerAction" type="s2:updateSmokerAction" />
-                <s:element minOccurs="0" maxOccurs="1" name="deleteSmokerAction" type="s2:deleteSmokerAction" />
-              </s:choice>
-            </s:sequence>
-            <s:attribute default="Client" name="source" type="s0:ivrMessageSource" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="abstractMessage" abstract="true">
-        <s:attribute default="1.0" name="version" type="s:string" />
-        <s:attribute name="activityId" type="s:unsignedLong" use="required" />
-        <s:attribute name="messageId" type="s:unsignedLong" use="required" />
-      </s:complexType>
-      <s:complexType name="events">
-        <s:complexContent mixed="false">
-          <s:extension base="s0:abstractMessage">
-            <s:sequence>
-              <s:choice minOccurs="0" maxOccurs="unbounded">
-                <s:element minOccurs="0" maxOccurs="1" name="authFailureEvent" type="s1:authFailureEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="logOffEvent" type="s1:logOffEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="cravingLineEvent" type="s1:cravingLineEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="terminateEvent" type="s1:terminateEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="relapseWakeSmsReplaceEvent" type="s1:relapseWakeSmsReplaceEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="confessionLineEvent" type="s1:confessionLineEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="rfqRecordedEvent" type="s1:rfqRecordedEvent" />
-                <s:element minOccurs="0" maxOccurs="1" name="logOnEvent" type="s1:logOnEvent" />
-              </s:choice>
-            </s:sequence>
-            <s:attribute default="IVR" name="source" type="s0:ivrMessageSource" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:simpleType name="ivrMessageSource">
-        <s:restriction base="s:string">
-          <s:enumeration value="IVR" />
-          <s:enumeration value="Client" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="actionResults">
-        <s:complexContent mixed="false">
-          <s:extension base="s0:abstractMessage">
-            <s:sequence>
-              <s:choice minOccurs="0" maxOccurs="unbounded">
-                <s:element minOccurs="0" maxOccurs="1" name="updateSmokerActionResult" type="s2:updateSmokerActionResult" />
-                <s:element minOccurs="0" maxOccurs="1" name="activateSmokerActionResult" type="s2:activateSmokerActionResult" />
-                <s:element minOccurs="0" maxOccurs="1" name="deleteSmokerActionResult" type="s2:deleteSmokerActionResult" />
-                <s:element minOccurs="0" maxOccurs="1" name="addSmokerActionResult" type="s2:addSmokerActionResult" />
-                <s:element minOccurs="0" maxOccurs="1" name="pauseSmokerActionResult" type="s2:pauseSmokerActionResult" />
-                <s:element minOccurs="0" maxOccurs="1" name="terminateSmokerActionResult" type="s2:terminateSmokerActionResult" />
-              </s:choice>
-            </s:sequence>
-            <s:attribute default="IVR" name="source" type="s0:ivrMessageSource" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="eventResults">
-        <s:complexContent mixed="false">
-          <s:extension base="s0:abstractMessage">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="eventResult" type="s1:eventResult" />
-            </s:sequence>
-            <s:attribute default="IVR" name="source" type="s0:ivrMessageSource" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:element name="ivrActionResults" type="s0:actionResults" />
-      <s:element name="ivrEvents" type="s0:events" />
-      <s:element name="ivrEventResults" type="s0:eventResults" />
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://testurl/Events">
-      <s:complexType name="authFailureEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent">
-            <s:attribute name="mobileNumber" type="s:string" />
-            <s:attribute name="line" type="s1:line" use="required" />
-            <s:attribute name="reason" type="s:string" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="abstractEvent" abstract="true">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" />
-        <s:attribute name="timestamp" type="s:dateTime" use="required" />
-      </s:complexType>
-      <s:complexType name="logOnEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent" />
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="cravingLineEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="selection" type="s1:cravingLineEventSelection" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="cravingLineEventSelection">
-        <s:attribute name="type" type="s1:cravingLineMessageType" use="required" />
-        <s:attribute name="msgNumber" type="s:positiveInteger" />
-      </s:complexType>
-      <s:simpleType name="cravingLineMessageType">
-        <s:restriction base="s:string">
-          <s:enumeration value="Motivational" />
-          <s:enumeration value="StressReval" />
-          <s:enumeration value="EffectReg" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="confessionLineEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent">
-            <s:attribute name="smokeStatus" type="s1:smokeStatus" use="required" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:simpleType name="smokeStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Smoked" />
-          <s:enumeration value="SmokeFree" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="rfqRecordedEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent" />
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="terminateEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent" />
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="logOffEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent">
-            <s:attribute name="smokeStatus" type="s1:smokeStatus" use="required" />
-            <s:attribute name="callInitiator" type="s1:callInitiator" use="required" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:simpleType name="callInitiator">
-        <s:restriction base="s:string">
-          <s:enumeration value="AudienceMember" />
-          <s:enumeration value="IVR" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="relapseWakeSmsReplaceEvent">
-        <s:complexContent mixed="false">
-          <s:extension base="s1:abstractEvent">
-            <s:attribute name="relapseCount" type="s:positiveInteger" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:simpleType name="line">
-        <s:restriction base="s:string">
-          <s:enumeration value="LogOnOffLine" />
-          <s:enumeration value="CravingLine" />
-          <s:enumeration value="ConfessionLine" />
-          <s:enumeration value="ReasonsForQuittingLine" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="eventResult">
-        <s:attribute name="success" type="s:boolean" use="required" />
-      </s:complexType>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://testurl/Actions">
-      <s:import namespace="http://testurl/Smoker" />
-      <s:complexType name="updateSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:updateSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="abstractActionResult">
-        <s:attribute name="resultId" type="s:unsignedLong" use="required" />
-      </s:complexType>
-      <s:complexType name="pauseSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:pauseSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="pauseSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:pauseSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:pauseSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="pauseSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Paused" />
-          <s:enumeration value="NotPaused" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="pauseSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="IDNotFound" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="addSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:addSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="addSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:addSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:addSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="addSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Added" />
-          <s:enumeration value="NotAdded" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="addSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="DuplicateID" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="deleteSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:deleteSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="deleteSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:deleteSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:deleteSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="deleteSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Deleted" />
-          <s:enumeration value="NotDeleted" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="deleteSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="IDNotFound" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="activateSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:activateSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="activateSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:activateSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:activateSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="activateSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Activated" />
-          <s:enumeration value="NotActivated" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="activateSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="IDNotFound" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="terminateSmokerActionResult">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractActionResult">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s2:terminateSmokerActionResultSmoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="terminateSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:terminateSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:terminateSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="terminateSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Terminated" />
-          <s:enumeration value="NotTerminated" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="terminateSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="IDNotFound" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="updateSmokerActionResultSmoker">
-        <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-        <s:attribute name="status" type="s2:updateSmokerActionResultSmokerStatus" use="required" />
-        <s:attribute name="exception" type="s2:updateSmokerActionResultSmokerException" />
-      </s:complexType>
-      <s:simpleType name="updateSmokerActionResultSmokerStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Updated" />
-          <s:enumeration value="NotUpdated" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="updateSmokerActionResultSmokerException">
-        <s:restriction base="s:string">
-          <s:enumeration value="UnspecifiedError" />
-          <s:enumeration value="IDNotFound" />
-        </s:restriction>
-      </s:simpleType>
-      <s:complexType name="pauseSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="audienceMemberID" type="s:unsignedLong" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="abstractAction" abstract="true">
-        <s:attribute name="requestId" type="s:unsignedLong" use="required" />
-      </s:complexType>
-      <s:complexType name="addSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s3:smoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="updateSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="smoker" type="s3:smoker" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="terminateSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="deleteSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="audienceMemberID" type="s:unsignedLong" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:complexType name="activateSmokerAction">
-        <s:complexContent mixed="false">
-          <s:extension base="s2:abstractAction">
-            <s:attribute name="audienceMemberId" type="s:unsignedLong" use="required" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://testurl/Smoker">
-      <s:import namespace="http://testurl/AudienceMember" />
-      <s:complexType name="smoker">
-        <s:complexContent mixed="false">
-          <s:extension base="s4:ivrAudienceMember">
-            <s:attribute name="startDate" type="s:date" use="required" />
-            <s:attribute name="phase" type="s3:phase" use="required" />
-            <s:attribute name="day" type="s:positiveInteger" />
-            <s:attribute name="track" type="s3:track" use="required" />
-            <s:attribute name="status" type="s3:status" use="required" />
-            <s:attribute name="baseTime" type="s:string" />
-            <s:attribute name="sunWakeOffset" type="s:string" />
-            <s:attribute name="monWakeOffset" type="s:string" />
-            <s:attribute name="tueWakeOffset" type="s:string" />
-            <s:attribute name="wedWakeOffset" type="s:string" />
-            <s:attribute name="thuWakeOffset" type="s:string" />
-            <s:attribute name="friWakeOffset" type="s:string" />
-            <s:attribute name="satWakeOffset" type="s:string" />
-            <s:attribute name="sunSleepOffset" type="s:string" />
-            <s:attribute name="monSleepOffset" type="s:string" />
-            <s:attribute name="tueSleepOffset" type="s:string" />
-            <s:attribute name="wedSleepOffset" type="s:string" />
-            <s:attribute name="thuSleepOffset" type="s:string" />
-            <s:attribute name="friSleepOffset" type="s:string" />
-            <s:attribute name="satSleepOffset" type="s:string" />
-            <s:attribute name="sunLogOnWindowOffset" type="s:string" />
-            <s:attribute name="monLogOnWindowOffset" type="s:string" />
-            <s:attribute name="tueLogOnWindowOffset" type="s:string" />
-            <s:attribute name="wedLogOnWindowOffset" type="s:string" />
-            <s:attribute name="thuLogOnWindowOffset" type="s:string" />
-            <s:attribute name="friLogOnWindowOffset" type="s:string" />
-            <s:attribute name="satLogOnWindowOffset" type="s:string" />
-            <s:attribute name="sunLogOffWindowOffset" type="s:string" />
-            <s:attribute name="monLogOffWindowOffset" type="s:string" />
-            <s:attribute name="tueLogOffWindowOffset" type="s:string" />
-            <s:attribute name="wedLogOffWindowOffset" type="s:string" />
-            <s:attribute name="thuLogOffWindowOffset" type="s:string" />
-            <s:attribute name="friLogOffWindowOffset" type="s:string" />
-            <s:attribute name="satLogOffWindowOffset" type="s:string" />
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
-      <s:simpleType name="phase">
-        <s:restriction base="s:string">
-          <s:enumeration value="Prep" />
-          <s:enumeration value="Quit" />
-          <s:enumeration value="Followup" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="track">
-        <s:restriction base="s:string">
-          <s:enumeration value="NRT" />
-          <s:enumeration value="NonNRT" />
-        </s:restriction>
-      </s:simpleType>
-      <s:simpleType name="status">
-        <s:restriction base="s:string">
-          <s:enumeration value="Pre-Start" />
-          <s:enumeration value="Completed" />
-          <s:enumeration value="Terminated" />
-          <s:enumeration value="Paused" />
-          <s:enumeration value="Active" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://testurl/AudienceMember">
-      <s:import namespace="http://testurl/Smoker" />
-      <s:complexType name="ivrAudienceMember">
-        <s:attribute name="id" type="s:unsignedLong" use="required" />
-        <s:attribute name="mobileNumber" type="s:string" />
-        <s:attribute name="firstName" type="s:string" />
-        <s:attribute name="lastName" type="s:string" />
-      </s:complexType>
-    </s:schema>
-  </types>
-  <message name="PostActionsSoapIn">
-    <part name="ivrActions" element="s0:ivrActions" />
-  </message>
-  <message name="PostActionsSoapOut">
-    <part name="PostActionsResult" element="s0:ivrActionResults" />
-  </message>
-  <message name="PostEventsSoapIn">
-    <part name="ivrEvents" element="s0:ivrEvents" />
-  </message>
-  <message name="PostEventsSoapOut">
-    <part name="PostEventsResult" element="s0:ivrEventResults" />
-  </message>
-  <portType name="IVRServicePortSoap">
-    <operation name="PostActions">
-      <input message="tns:PostActionsSoapIn" />
-      <output message="tns:PostActionsSoapOut" />
-    </operation>
-    <operation name="PostEvents">
-      <input message="tns:PostEventsSoapIn" />
-      <output message="tns:PostEventsSoapOut" />
-    </operation>
-  </portType>
-  <binding name="IVRServicePortSoap" type="tns:IVRServicePortSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="PostActions">
-      <soap:operation soapAction="http://testurl/Service:postActionsIn" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="PostEvents">
-      <soap:operation soapAction="http://testurl/Service:postEventsIn" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <binding name="IVRServicePortSoap12" type="tns:IVRServicePortSoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="PostActions">
-      <soap12:operation soapAction="http://testurl/Service:postActionsIn" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="PostEvents">
-      <soap12:operation soapAction="http://testurl/Service:postEventsIn" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <service name="IVRServicePort">
-    <port name="IVRServicePortSoap" binding="tns:IVRServicePortSoap">
-      <soap:address location="test://" />
-    </port>
-    <port name="IVRServicePortSoap12" binding="tns:IVRServicePortSoap12">
-      <soap12:address location="test://" />
-    </port>
-  </service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt
deleted file mode 100755
index 9c33d891ca..0000000000
--- a/ext/soap/tests/bugs/bug35273.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Bug #35273 Error in mapping soap - java types 
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version) {
-  	echo $request;
-  	exit;
-	}
-}
-
-ini_set("soap.wsdl_cache_enabled", 0);
-$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0));
-$ahoj = $client->echoPerson(array("name"=>"Name","surname"=>"Surname"));
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://service" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="urn:service.EchoService" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoPerson><p xsi:type="ns2:Person"><name xsi:type="SOAP-ENC:string">Name</name><surname xsi:type="SOAP-ENC:string">Surname</surname></p></ns1:echoPerson></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
deleted file mode 100755
index c88d969f29..0000000000
--- a/ext/soap/tests/bugs/bug36226.phpt
+++ /dev/null
@@ -1,139 +0,0 @@
---TEST--
-Bug #36226 SOAP Inconsistent handling when passing potential arrays.
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled",0);
-$timestamp = "2005-11-08T11:22:07+03:00";
-$wsdl = dirname(__FILE__)."/bug35142.wsdl";
-
-function PostEvents($x) {
-	var_dump($x);
-	exit();
-  return $x;
-}
-
-class TestSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('PostEvents');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-		echo "$request\n";
-    $this->server->handle($request);
-    return $response;
-  }
-
-}
-
-$soapClient = new TestSoapClient($wsdl, 
-	array('trace' => 1, 'exceptions' => 0,
-		'classmap' => array('logOnEvent' => 'LogOnEvent',
-			'logOffEvent' => 'LogOffEvent',
-			'events' => 'IVREvents'),
-		'features' => SOAP_SINGLE_ELEMENT_ARRAYS));
-
-$logOnEvent = new LogOnEvent(34567, $timestamp);
-$logOffEvents[] = new LogOffEvent(34567, $timestamp, "Smoked");
-$logOffEvents[] = new LogOffEvent(34568, $timestamp, "SmokeFree");
-$ivrEvents = new IVREvents("1.0", 101, 12345, 'IVR', $logOnEvent, $logOffEvents);
-
-$result = $soapClient->PostEvents($ivrEvents);
-
-class LogOffEvent {
-  public $audienceMemberId;
-  public $timestamp;
-  public $smokeStatus;
-  public $callInitiator;
-
-  function __construct($audienceMemberId, $timestamp, $smokeStatus) {
-    $this->audienceMemberId = $audienceMemberId;
-    $this->timestamp = $timestamp;
-    $this->smokeStatus = $smokeStatus;
-    $this->callInitiator = "IVR";
-  }
-}
-
-class LogOnEvent {
-  public $audienceMemberId;
-  public $timestamp;
-
-  function __construct($audienceMemberId, $timestamp) {
-    $this->audienceMemberId = $audienceMemberId;
-    $this->timestamp = $timestamp;
-  }
-}
-
-class IVREvents {
-  public $version;
-  public $activityId;
-  public $messageId;
-  public $source;
-  public $logOnEvent;
-  public $logOffEvent;
-
-  function __construct($version, $activityId, $messageId, $source, $logOnEvent=NULL, $logOffEvent=NULL) {
-    $this->version = $version;
-    $this->activityId = $activityId;
-    $this->messageId = $messageId;
-    $this->source = $source;
-    $this->logOnEvent = $logOnEvent;
-    $this->logOffEvent = $logOffEvent;
-  }
-}
-?>
---EXPECTF--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testurl/Message"><SOAP-ENV:Body><ns1:ivrEvents version="1.0" activityId="101" messageId="12345" source="IVR"><ns1:logOffEvent audienceMemberId="34567" timestamp="2005-11-08T11:22:07+03:00" smokeStatus="Smoked" callInitiator="IVR"/><ns1:logOffEvent audienceMemberId="34568" timestamp="2005-11-08T11:22:07+03:00" smokeStatus="SmokeFree" callInitiator="IVR"/><ns1:logOnEvent audienceMemberId="34567" timestamp="2005-11-08T11:22:07+03:00"/></ns1:ivrEvents></SOAP-ENV:Body></SOAP-ENV:Envelope>
-
-object(IVREvents)#%d (6) {
-  ["version"]=>
-  string(3) "1.0"
-  ["activityId"]=>
-  int(101)
-  ["messageId"]=>
-  int(12345)
-  ["source"]=>
-  string(3) "IVR"
-  ["logOnEvent"]=>
-  array(1) {
-    [0]=>
-    object(LogOnEvent)#10 (2) {
-      ["audienceMemberId"]=>
-      int(34567)
-      ["timestamp"]=>
-      string(25) "2005-11-08T11:22:07+03:00"
-    }
-  }
-  ["logOffEvent"]=>
-  array(2) {
-    [0]=>
-    object(LogOffEvent)#%d (4) {
-      ["audienceMemberId"]=>
-      int(34567)
-      ["timestamp"]=>
-      string(25) "2005-11-08T11:22:07+03:00"
-      ["smokeStatus"]=>
-      string(6) "Smoked"
-      ["callInitiator"]=>
-      string(3) "IVR"
-    }
-    [1]=>
-    object(LogOffEvent)#%d (4) {
-      ["audienceMemberId"]=>
-      int(34568)
-      ["timestamp"]=>
-      string(25) "2005-11-08T11:22:07+03:00"
-      ["smokeStatus"]=>
-      string(9) "SmokeFree"
-      ["callInitiator"]=>
-      string(3) "IVR"
-    }
-  }
-}
diff --git a/ext/soap/tests/bugs/bug36575.phpt b/ext/soap/tests/bugs/bug36575.phpt
deleted file mode 100755
index 9bf5415220..0000000000
--- a/ext/soap/tests/bugs/bug36575.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-Bug #36575 (Incorrect complex type instantiation with hierarchies)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-abstract class CT_A1 {
-	public $var1;
-}
-
-class CT_A2 extends CT_A1 {
-	public $var2;
-}
-
-class CT_A3 extends CT_A2 {
-	public $var3;
-}
-
-// returns A2 in WSDL
-function test( $a1 ) {
-	$a3 = new CT_A3();
-	$a3->var1 = $a1->var1;
-	$a3->var2 = "var two";
-	$a3->var3 = "var three";
-	return $a3;
-}
-
-$classMap = array("A1" => "CT_A1", "A2" => "CT_A2", "A3" => "CT_A3");
-
-$client = new SoapClient(dirname(__FILE__)."/bug36575.wsdl", array("trace" => 1, "exceptions" => 0, "classmap" => $classMap));
-$a2 = new CT_A2();
-$a2->var1 = "one";
-$a2->var2 = "two";
-$client->test($a2);
-
-$soapRequest = $client->__getLastRequest();
-
-echo $soapRequest;
-
-$server = new SoapServer(dirname(__FILE__)."/bug36575.wsdl", array("classmap" => $classMap));
-$server->addFunction("test");
-$server->handle($soapRequest);
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="urn:test.soap#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="urn:test.soap.types#" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><a1 xsi:type="ns2:A2"><var1 xsi:type="xsd:string">one</var1><var2 xsi:type="xsd:string">two</var2></a1></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="urn:test.soap#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="urn:test.soap.types#" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:testResponse><result xsi:type="ns2:A3"><var1 xsi:type="xsd:string">one</var1><var2 xsi:type="xsd:string">var two</var2><var3 xsi:type="xsd:string">var three</var3></result></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/bugs/bug36575.wsdl b/ext/soap/tests/bugs/bug36575.wsdl
deleted file mode 100755
index 0f1899bcd5..0000000000
--- a/ext/soap/tests/bugs/bug36575.wsdl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions name="shoppingcart"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="urn:test.soap#" targetNamespace="urn:test.soap#"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:types="urn:test.soap.types#">
-	<!-- all datatypes will be imported to namespace types: -->
-	<types>
-		<xs:schema
-			xmlns:xs="http://www.w3.org/2001/XMLSchema"
-			xmlns:soap = "http://schemas.xmlsoap.org/wsdl/soap/"
-			xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-			xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-			xmlns:tns="urn:test.soap.types#"
-			targetNamespace="urn:test.soap.types#">
-
-			<xs:complexType name="A1">
-				<xs:all>
-					<xs:element name="var1" type="xs:string" nillable="true"/>
-				</xs:all>
-			</xs:complexType>
-
-			<xs:complexType name="A2">
-				<xs:complexContent>
-					<xs:extension base="tns:A1">
-						<xs:all>
-							<xs:element name="var2" type="xs:string" nillable="true"/>
-						</xs:all>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-
-			 <xs:complexType name="A3">
-				<xs:complexContent>
-					<xs:extension base="tns:A2">
-						<xs:all>
-							<xs:element name="var3" type="xs:string" nillable="true"/>
-						</xs:all>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-		</xs:schema>
-	</types>
-
-	<message name="test-request">
-		<part name="a1" type="types:A1"/>
-	</message>
-	<message name="test-response">
-		<part name="result" type="types:A2"/>
-	</message>
-
-	<portType name="catalog-porttype">
-		<operation name="test" parameterOrder="a1">
-			<input name="test-request" message="tns:test-request"/>
-			<output name="test-response" message="tns:test-response"/>
-		</operation>
-	</portType>
-
-	<!-- @type doesn't like tns: -->
-	<binding name="catalog-binding" type="tns:catalog-porttype">
-		<soap:binding style="rpc"
-			transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<operation name="test">
-			<soap:operation soapAction="urn:test.soap#test"/>
-			<input>
-				<soap:body use="encoded" namespace="urn:test.soap#"
-				encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="urn:test.soap#"
-				encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-
-	<service name="catalog">
-		<!-- @binding doesn't like to be tns: -->
-		<port name="catalog-port" binding="tns:catalog-binding">
-			<soap:address location="xxxxxxxx"/>
-		</port>
-	</service>
-
-</definitions>
diff --git a/ext/soap/tests/bugs/bug36614.phpt b/ext/soap/tests/bugs/bug36614.phpt
deleted file mode 100755
index ba6734812d..0000000000
--- a/ext/soap/tests/bugs/bug36614.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Bug #36614 (Segfault when using Soap)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-$lo_soap = new SoapClient(dirname(__FILE__)."/bug36614.wsdl");
-echo "ok\n";
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/bugs/bug36614.wsdl b/ext/soap/tests/bugs/bug36614.wsdl
deleted file mode 100755
index ecf1b1b2fe..0000000000
--- a/ext/soap/tests/bugs/bug36614.wsdl
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<definitions name="SonicMobile Web-Services" 
-   targetNamespace="http://soap.sonicmobile.com/sonicmobile.wsdl"
-   xmlns="http://schemas.xmlsoap.org/wsdl/" 
-   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-   xmlns:sonic="http://soap.sonicmobile.com/sonicmobile.wsdl"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <types>
-        <xsd:schema xmlns="http://www.w3.org/2000/10/XMLSchema">
-            <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-            <complexType name="TransportCount">
-                <all>
-                    <element name="transport" type="string" />
-                    <element name="count" type="integer" />
-                    <element name="rate" type="integer" />
-                    <element name="last_message" type="integer" />
-                </all>
-            </complexType>                    
-            <complexType name="ArrayOfTransportCount">
-                <complexContent>
-                    <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" arrayType="TransportCount[]" />
-                    </restriction>
-                </complexContent>
-            </complexType>
-        </xsd:schema>
-    </types>
-    
-   <message name="userSendMessageRequest">
-     <part name="sourceUser" type="xsd:int"/>
-     <part name="password" type="xsd:string"/>
-     <part name="destinationUser" type="xsd:int"/>
-     <part name="content" type="xsd:string"/>
-     <part name="sendRepliesTo" type="xsd:string"/>
-     <part name="reference" type="xsd:string"/>
-   </message>
-
-   <message name="sendMessageRequest">
-     <part name="application" type="xsd:string"/>
-     <part name="password" type="xsd:string"/>
-     <part name="destination" type="xsd:string"/>
-     <part name="content" type="xsd:string"/>
-     <part name="reference" type="xsd:string"/>
-     <part name="requestSource" type="xsd:string"/>
-     <part name="customer" type="xsd:string"/>
-     <part name="class" type="xsd:string"/>
-   </message>
-
-   <message name="MessageResponse">
-     <part name="messageid" type="xsd:int"/>
-     <part name="response" type="xsd:string"/>
-   </message>
-
-   <message name="messageCountRequest">
-	   <part name="password" type="xsd:string"/>
-   </message>
-
-   <message name="messageCountResponse">
-	   <part name="transports" type="tns:ArrayOfTransportCount"/>
-   </message>
-   
-   <message name="serverStatusRequest">
-        <part name="password" type="xsd:string"/>
-    </message>
-    <message name="serverStatusResponse">
-        <part name="status_string" type="xsd:string"/>
-    </message>
- 
-    <message name="flushGatewayRequest">
-        <part name="password" type="xsd:string"/>
-    </message>
-    <message name="flushGatewayResponse">
-        <part name="status_string" type="xsd:string"/>
-    </message>
-    
-   <portType name="SonicMobilePortType">
-     <operation name="userSendMessage">         
-       <input  message="sonic:userSendMessageRequest"/>
-       <output message="sonic:MessageResponse"/>
-     </operation>
-
-     <operation name="sendMessage">
-       <input  message="sonic:sendMessageRequest"/>
-       <output message="sonic:MessageResponse"/>
-     </operation>
-
-     <operation name="messageCount">
-	     <input message="sonic:messageCountRequest"/>
-	     <output message="sonic:messageCountResponse"/>
-     </operation>
-     
-     <operation name="serverStatus">
-         <input message="sonic:serverStatusRequest"/>
-         <output message="sonic:serverStatusResponse"/>
-     </operation>
-     
-     <operation name="flushGateway">
-         <input message="sonic:flushGatewayRequest"/>
-         <output message="sonic:flushGatewayResponse"/>
-     </operation>
-   </portType>
-
-   <binding name="SonicMobileBinding" type="sonic:SonicMobilePortType">
-     <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-
-     <operation name="userSendMessage">
-       <soap:operation soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#userSendMessage"/>
-
-       <input>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP" 
-           use="encoded" />
-       </input>
-       
-       <output>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP"
-           use="encoded" />
-       </output>
-     </operation>
-
-     <operation name="sendMessage">
-       <soap:operation soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#sendMessage"/>
-
-       <input>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP" 
-           use="encoded" />
-       </input>
-       
-       <output>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP"
-           use="encoded" />
-       </output>
-     </operation>
- 
-     <operation name="messageCount">
-       <soap:operation soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#messageCount"/>
-
-       <input>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP" 
-           use="encoded" />
-       </input>
-       
-       <output>
-         <soap:body 
-           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-           namespace="http://soap.sonicmobile.com/SonicMobile/SOAP"
-           use="encoded" />
-       </output>
-     </operation>
-     
-     <operation name="serverStatus">
-         <soap:operation soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#serverStatus"/>
-         
-         <input>
-             <soap:body 
-                        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                        namespace="http://soap.sonicmobile.com/SonicMobile/SOAP" 
-                        use="encoded" />
-         </input>
-         
-         <output>
-             <soap:body 
-                        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                        namespace="http://soap.sonicmobile.com/SonicMobile/SOAP"
-                        use="encoded" />
-         </output>
-     </operation>
-     
-     <operation name="flushGateway">
-         <soap:operation soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#flushGateway"/>
-         
-         <input>
-             <soap:body 
-                        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                        namespace="http://soap.sonicmobile.com/SonicMobile/SOAP" 
-                        use="encoded" />
-         </input>
-        <output>
-             <soap:body 
-                        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                        namespace="http://soap.sonicmobile.com/SonicMobile/SOAP"
-                        use="encoded" />
-         </output>
-     </operation>
-     
-   </binding>
-
-   <service name="SonicMobile">
-     <port name="SonicMobilePort" binding="sonic:SonicMobileBinding">
-       <soap:address location="http://soap.sonicmobile.com/"/>
-     </port>
-   </service>
-
-</definitions>
diff --git a/ext/soap/tests/bugs/bug36629.phpt b/ext/soap/tests/bugs/bug36629.phpt
deleted file mode 100755
index 08b74a5fca..0000000000
--- a/ext/soap/tests/bugs/bug36629.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Bug #36629 (SoapServer::handle() exits on SOAP faults)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test1() {
-  throw new SoapFault("Server", "test1");
-}
-function test2() {
-  return new SoapFault("Server", "test2");
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction(array("test1","test2"));
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test1 xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test2 xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>test1</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>test2</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/bugs/bug36908.phpt b/ext/soap/tests/bugs/bug36908.phpt
deleted file mode 100755
index cd0ea8b2e5..0000000000
--- a/ext/soap/tests/bugs/bug36908.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Bug #36908 (wsdl default value overrides value in soap request)
---SKIPIF--
-<?php 
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
---INI--
-soap.wsdl_cache_enabled=0
---FILE--
-<?php
-class PublisherService {
-  function add($publisher) {
-    return $publisher->region_id;
-  }
-}
-$input =
-'<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope
-xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <soapenv:Body>
-    <ns1:add xmlns:ns1="urn:PublisherService" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-      <publisher href="#id0"/>
-    </ns1:add>
-    <multiRef xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:ns3="http://soap.dev/soap/types" id="id0" soapenc:root="0"
-soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-xsi:type="ns3:publisher">
-      <region_id href="#id5"/>
-    </multiRef>
-    <multiRef xmlns:ns5="http://soap.dev/soap/types"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" id="id5"
-soapenc:root="0"
-soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-xsi:type="xsd:long">9</multiRef>
-  </soapenv:Body>
-</soapenv:Envelope>';
-ini_set('soap.wsdl_cache_enabled', false);
-$server = new SoapServer(dirname(__FILE__)."/bug36908.wsdl");
-$server->setClass("PublisherService");
-$server->handle($input);
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="urn:PublisherService" 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:addResponse><out xsi:type="xsd:string">9</out></ns1:addResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug36908.wsdl b/ext/soap/tests/bugs/bug36908.wsdl
deleted file mode 100755
index f3be3f6304..0000000000
--- a/ext/soap/tests/bugs/bug36908.wsdl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<wsdl:definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-xmlns:api="http://soap.dev/soap/PublisherService"
-xmlns:types="http://soap.dev/soap/types"
-targetNamespace="http://soap.dev/soap/PublisherService">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-xmlns:types="http://soap.dev/soap/types"
-targetNamespace="http://soap.dev/soap/types">
-      <xsd:complexType name="publisher">
-        <xsd:all>
-          <xsd:element name="region_id" type="xsd:long" default="52"/>
-        </xsd:all>
-      </xsd:complexType>
-    </xsd:schema> 
-  </wsdl:types>
-  <wsdl:message name="addInput">
-    <wsdl:part name="publisher" type="types:publisher"/>
-  </wsdl:message>
-  <wsdl:message name="addOutput">
-    <wsdl:part name="out" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:portType name="PublisherServicePortType">
-    <wsdl:operation name="add">
-      <wsdl:input message="api:addInput"/>
-      <wsdl:output message="api:addOutput"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="PublisherServiceBinding" type="api:PublisherServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="add">
-      <soap:operation soapAction="urn:PublisherService#add" style="rpc"/>
-      <wsdl:input>
-        <soap:body use="encoded" namespace="urn:PublisherService" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="encoded" namespace="urn:PublisherService" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="PublisherService">
-    <wsdl:port name="PublisherServicePort" binding="api:PublisherServiceBinding">
-      <soap:address location="http://soap.dev/soap//publisher_test.php"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt
deleted file mode 100755
index 471b5e49ad..0000000000
--- a/ext/soap/tests/bugs/bug37083.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-Bug #37083 (Frequent crashs in SOAP extension with new WSDL caching code in multithread WS)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---INI--
-soap.wsdl_cache_enabled=3
---FILE--
-<?php
-class TestSoapClient extends SoapClient {
-	function __doRequest($request, $location, $action, $version) {
-		return <<<EOF
-<?xml version="1.0" encoding="utf-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<soapenv:Body>
-<ns1:searchResponse soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns1="urn:java:de.pangaea.metadataportal.search.SearchService">
-<searchReturn href="#id0"/>
-</ns1:searchResponse>
-<multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns2:SearchResponse" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="urn:java:de.pangaea.metadataportal.search.SearchService"><offset xsi:type="xsd:int">0</offset><queryTime xsi:type="xsd:long">34</queryTime><results soapenc:arrayType="ns2:SearchResponseItem[10]" xsi:type="soapenc:Array"><results href="#id1"/><results href="#id2"/><results href="#id3"/><results href="#id4"/><results href="#id5"/><results href="#id6"/><results href="#id7"/><results href="#id8"/><results href="#id9"/><results href="#id10"/></results><totalCount xsi:type="xsd:int">3501</totalCount></multiRef>
-<multiRef id="id9" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns3:SearchResponseItem" xmlns:ns3="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id11"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:5900168</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml1</xml></multiRef>
-<multiRef id="id7" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns4:SearchResponseItem" xmlns:ns4="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id12"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:5900039</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml2</xml></multiRef>
-<multiRef id="id6" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns5:SearchResponseItem" xmlns:ns5="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id13"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:5900040</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml3</xml></multiRef>
-<multiRef id="id10" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns6:SearchResponseItem" xmlns:ns6="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id14"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:41534</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml4</xml></multiRef>
-<multiRef id="id8" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns7:SearchResponseItem" xmlns:ns7="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id15"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:5900038</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml5</xml></multiRef>
-<multiRef id="id4" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns8:SearchResponseItem" xmlns:ns8="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id16"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:2900229</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml6</xml></multiRef>
-<multiRef id="id5" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns9:SearchResponseItem" xmlns:ns9="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id17"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:2900228</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml7</xml></multiRef>
-<multiRef id="id3" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns10:SearchResponseItem" xmlns:ns10="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id18"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:2900230</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml8</xml></multiRef>
-<multiRef id="id2" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns11:SearchResponseItem" xmlns:ns11="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id19"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:2900235</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml9</xml></multiRef>
-<multiRef id="id1" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns12:SearchResponseItem" xmlns:ns12="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><fields href="#id20"/><identifier xsi:type="xsd:string">oai:dlmd.ifremer.fr:5900196</identifier><score xsi:type="xsd:float">0.13684115</score><xml xsi:type="xsd:string">xml10</xml></multiRef>
-<multiRef id="id15" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns13:Map" xmlns:ns13="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-12-01T04:58:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">105.539</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">112.283</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-30.024</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-34.788</value></value></item></multiRef>
-<multiRef id="id20" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns14:Map" xmlns:ns14="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-06-07T17:41:44.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">129.882</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">133.635</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">39.529</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">36.419</value></value></item></multiRef>
-<multiRef id="id18" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns15:Map" xmlns:ns15="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-03-10T01:40:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">63.121</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">80.92</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">0.158</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-3.675</value></value></item></multiRef>
-<multiRef id="id14" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns16:Map" xmlns:ns16="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2003-01-12T05:15:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-42.88</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-20.85</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">61.41</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">43.2</value></value></item></multiRef>
-<multiRef id="id13" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns17:Map" xmlns:ns17="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-12-01T16:50:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">108.962</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">114.713</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-35.262</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-42.756</value></value></item></multiRef>
-<multiRef id="id17" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns18:Map" xmlns:ns18="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2003-10-10T11:52:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">68.14</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">95.987</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">3.97</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-1.242</value></value></item></multiRef>
-<multiRef id="id16" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns19:Map" xmlns:ns19="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-01-10T10:35:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">67.71</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">77.743</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">3.546</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-1.965</value></value></item></multiRef>
-<multiRef id="id19" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns20:Map" xmlns:ns20="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-04-09T23:00:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">59.116</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">69.206</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-2.274</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-4.093</value></value></item></multiRef>
-<multiRef id="id11" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns21:Map" xmlns:ns21="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2002-11-09T23:10:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">156.013</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">160.042</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">5.648</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">4.773</value></value></item></multiRef>
-<multiRef id="id12" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns22:Map" xmlns:ns22="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-11-01T16:58:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">108.11</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">113.383</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-31.666</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-35.075</value></value></item></multiRef>
-</soapenv:Body></soapenv:Envelope>
-EOF;
-	}
-}
-for ($i = 0; $i < 10; $i++) {
-	$ws=new TestSoapClient(dirname(__FILE__).'/bug37083.wsdl',
-                   array('encoding'=>'ISO-8859-1',
-                         'cache_wsdl'=>WSDL_CACHE_BOTH));
-	$search=new stdClass();
-	$search->queryString='argo';
-	$search->ranges[]=$r=new stdClass();
-	$r->field='maxDateTime';
-	$r->min='2003-04-01';
-	$search->index='all';
-	$res=$ws->search($search,0,10);
-}
-echo "ok\n";
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/bugs/bug37083.wsdl b/ext/soap/tests/bugs/bug37083.wsdl
deleted file mode 100755
index 2a3b379802..0000000000
--- a/ext/soap/tests/bugs/bug37083.wsdl
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:intf="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
-  <schema targetNamespace="urn:java:de.pangaea.metadataportal.search.SearchService" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://xml.apache.org/xml-soap"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="SearchRequestRange">
-    <sequence>
-     <element name="field" nillable="true" type="xsd:string"/>
-     <element name="max" nillable="true" type="xsd:anyType"/>
-     <element name="min" nillable="true" type="xsd:anyType"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfSearchRequestRange">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="impl:SearchRequestRange[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="SearchRequest">
-    <sequence>
-     <element name="index" nillable="true" type="xsd:string"/>
-     <element name="queryString" nillable="true" type="xsd:string"/>
-     <element name="ranges" nillable="true" type="impl:ArrayOfSearchRequestRange"/>
-    </sequence>
-   </complexType>
-   <complexType name="SearchResponseItem">
-    <sequence>
-     <element name="fields" nillable="true" type="apachesoap:Map"/>
-     <element name="identifier" nillable="true" type="xsd:string"/>
-     <element name="score" type="xsd:float"/>
-     <element name="xml" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfSearchResponseItem">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="impl:SearchResponseItem[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="SearchResponse">
-    <sequence>
-     <element name="offset" type="xsd:int"/>
-     <element name="queryTime" type="xsd:long"/>
-     <element name="results" nillable="true" type="impl:ArrayOfSearchResponseItem"/>
-     <element name="totalCount" type="xsd:int"/>
-    </sequence>
-   </complexType>
-  </schema>
-  <schema targetNamespace="http://xml.apache.org/xml-soap" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="urn:java:de.pangaea.metadataportal.search.SearchService"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="mapItem">
-    <sequence>
-     <element name="key" nillable="true" type="xsd:anyType"/>
-     <element name="value" nillable="true" type="xsd:anyType"/>
-    </sequence>
-   </complexType>
-   <complexType name="Map">
-    <sequence>
-     <element maxOccurs="unbounded" minOccurs="0" name="item" type="apachesoap:mapItem"/>
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-   <wsdl:message name="searchRequest">
-      <wsdl:part name="in0" type="impl:SearchRequest"/>
-      <wsdl:part name="in1" type="xsd:int"/>
-      <wsdl:part name="in2" type="xsd:int"/>
-   </wsdl:message>
-   <wsdl:message name="searchResponse">
-      <wsdl:part name="searchReturn" type="impl:SearchResponse"/>
-   </wsdl:message>
-   <wsdl:portType name="SearchServiceAxisImpl">
-      <wsdl:operation name="search" parameterOrder="in0 in1 in2">
-         <wsdl:input message="impl:searchRequest" name="searchRequest"/>
-         <wsdl:output message="impl:searchResponse" name="searchResponse"/>
-      </wsdl:operation>
-   </wsdl:portType>
-   <wsdl:binding name="SearchSoapBinding" type="impl:SearchServiceAxisImpl">
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <wsdl:operation name="search">
-         <wsdlsoap:operation soapAction=""/>
-         <wsdl:input name="searchRequest">
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:java:de.pangaea.metadataportal.search.SearchService" use="encoded"/>
-         </wsdl:input>
-         <wsdl:output name="searchResponse">
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:java:de.pangaea.metadataportal.search.SearchService" use="encoded"/>
-         </wsdl:output>
-      </wsdl:operation>
-   </wsdl:binding>
-   <wsdl:service name="SearchServiceAxisImplService">
-      <wsdl:port binding="impl:SearchSoapBinding" name="Search">
-         <wsdlsoap:address location="test://"/>
-      </wsdl:port>
-   </wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/bugs/bug37278.phpt b/ext/soap/tests/bugs/bug37278.phpt
deleted file mode 100755
index f3fd7c17b4..0000000000
--- a/ext/soap/tests/bugs/bug37278.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Bug #37278 (SOAP not respecting uri in __soapCall)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$options = array(
-  "location" => "test://",
-  "uri"      => "http://bricolage.sourceforge.net/Bric/SOAP/Auth",
-  "trace"    => 1);
-
-$client = new SoapClient(null, $options);
-
-$newNS = "http://bricolage.sourceforge.net/Bric/SOAP/Story";
-
-try {
-  $client->__soapCall("list_ids", array(), array("uri" => $newNS));
-} catch (Exception $e) {
-  print $client->__getLastRequest();
-}
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://bricolage.sourceforge.net/Bric/SOAP/Story" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:list_ids/></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt
deleted file mode 100755
index 082aa3079a..0000000000
--- a/ext/soap/tests/bugs/bug38004.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-Bug #38004 (Parameters in SoapServer are decoded twice)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Test($param) {
-	global $g;
-	$g = $param->strA."\n".$param->strB."\n";
-	return $g;
-}
-
-class TestSoapClient extends SoapClient {
-  function __construct($wsdl) {
-    parent::__construct($wsdl);
-    $this->server = new SoapServer($wsdl);
-    $this->server->addFunction('Test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new TestSoapClient(dirname(__FILE__).'/bug38004.wsdl');
-$strA = 'test &amp; test';
-$strB = 'test & test';
-$res = $client->Test(array('strA'=>$strA, 'strB'=>$strB));
-print_r($res);
-print_r($g);
-?>
---EXPECT--
-test &amp; test
-test & test
-test &amp; test
-test & test
diff --git a/ext/soap/tests/bugs/bug38004.wsdl b/ext/soap/tests/bugs/bug38004.wsdl
deleted file mode 100755
index c288135966..0000000000
--- a/ext/soap/tests/bugs/bug38004.wsdl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-		xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-		xmlns:s="http://www.w3.org/2001/XMLSchema"
-		xmlns:s0="http://test.pl"
-		targetNamespace="http://test.pl"
-		xmlns="http://schemas.xmlsoap.org/wsdl/"
->
-	<types>
-		<s:schema elementFormDefault="qualified" targetNamespace="http://test.pl">
-			<s:complexType name="Test">
-				<s:attribute use="required" name="strA" type="s:string"/>
-				<s:attribute use="required" name="strB" type="s:string"/>
-			</s:complexType>
-			<s:element type="s0:Test" name="Test"/>
-			<s:element type="s:string" name="Ret"/>
-		</s:schema>
-	</types>
-
-	<message name="TestSoapIn">
-		<part name="parameters" element="s0:Test"/>
-	</message>
-	<message name="TestSoapOut">
-		<part name="parameters" element="s0:Ret"/>
-	</message>
-	<portType name="TestSoap">
-		<operation name="Test">
-			<input message="s0:TestSoapIn"/>
-			<output message="s0:TestSoapOut"/>
-		</operation>
-	</portType>
-	<binding name="TestSoap" type="s0:TestSoap">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-style="document"/>
-		<operation name="Test">
-			<soap:operation soapAction="http:/Test/Test" style="document"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Test">
-		<port name="TestSoapPort" binding="s0:TestSoap">
-			<soap:address location="http://localhost:8080/~dmitry/bug38004/server.php"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt
deleted file mode 100755
index d15beccce5..0000000000
--- a/ext/soap/tests/bugs/bug38005.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Bug #38005 (SoapFault faultstring doesn't follow encoding rules)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Test($param) {
-	return new SoapFault('Test', 'This is our fault: �');
-}
-
-class TestSoapClient extends SoapClient {
-  function __construct($wsdl, $opt) {
-    parent::__construct($wsdl, $opt);
-    $this->server = new SoapServer($wsdl, $opt);
-    $this->server->addFunction('Test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new TestSoapClient(NULL, array(
-    'encoding' => 'ISO-8859-1',
-	'uri' => "test://",
-	'location' => "test://",
-	'soap_version'=>SOAP_1_2,
-	'trace'=>1, 
-	'exceptions'=>0));
-$res = $client->Test();
-echo($res->faultstring."\n");
-echo($client->__getLastResponse());
-?>
---EXPECT--
-This is our fault: �
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>Test</env:Value></env:Code><env:Reason><env:Text>This is our fault: Ä</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt
deleted file mode 100755
index 07e7e1e0bd..0000000000
--- a/ext/soap/tests/bugs/bug38055.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-Bug #38055 (Wrong interpretation of boolean parameters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Test($param) {
-	global $g1, $g2;
-	$g1 = $param->boolA;
-	$g2	= $param->boolB;
-	return 1;
-}
-
-class TestSoapClient extends SoapClient {
-  function __construct($wsdl) {
-    parent::__construct($wsdl);
-    $this->server = new SoapServer($wsdl);
-    $this->server->addFunction('Test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new TestSoapClient(dirname(__FILE__).'/bug38055.wsdl');
-$boolA = 1;
-$boolB = '1';
-$res = $client->Test(array('boolA'=>$boolA, 'boolB'=>$boolB));
-var_dump($g1);
-var_dump($g2);
-?>
---EXPECT--
-bool(true)
-bool(true)
diff --git a/ext/soap/tests/bugs/bug38055.wsdl b/ext/soap/tests/bugs/bug38055.wsdl
deleted file mode 100755
index f8935477f1..0000000000
--- a/ext/soap/tests/bugs/bug38055.wsdl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-		xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-		xmlns:s="http://www.w3.org/2001/XMLSchema"
-		xmlns:s0="http://test.pl"
-		targetNamespace="http://test.pl"
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<s:schema elementFormDefault="qualified" targetNamespace="http://test.pl">
-			<s:complexType name="Test">
-				<s:attribute use="required" name="boolA" type="s:boolean"/>
-				<s:attribute use="required" name="boolB" type="s:boolean"/>
-			</s:complexType>
-			<s:element type="s0:Test" name="Test"/>
-			<s:element type="s:int" name="Ret"/>
-		</s:schema>
-	</types>
-
-	<message name="TestSoapIn">
-		<part name="parameters" element="s0:Test"/>
-	</message>
-	<message name="TestSoapOut">
-		<part name="parameters" element="s0:Ret"/>
-	</message>
-	<portType name="TestSoap">
-		<operation name="Test">
-			<input message="s0:TestSoapIn"/>
-			<output message="s0:TestSoapOut"/>
-		</operation>
-	</portType>
-	<binding name="TestSoap" type="s0:TestSoap">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-		<operation name="Test">
-			<soap:operation soapAction="http:/Test/Test" style="document"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Test">
-		<port name="TestSoapPort" binding="s0:TestSoap">
-			<soap:address location="http://localhost/server.php"/>
-		</port>
-	</service>
-</definitions>
-\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt
deleted file mode 100755
index 9c0cbb4fba..0000000000
--- a/ext/soap/tests/bugs/bug38067.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-Bug #38067 (Parameters are not decoded from utf-8 when using encoding option)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Test($param) {
-	global $g;
-	$g = $param->str;
-	return $g;
-}
-
-class TestSoapClient extends SoapClient {
-  function __construct($wsdl, $opt) {
-    parent::__construct($wsdl, $opt);
-    $this->server = new SoapServer($wsdl, $opt);
-    $this->server->addFunction('Test');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new TestSoapClient(dirname(__FILE__).'/bug38067.wsdl',
-	array('encoding' => 'ISO-8859-1'));
-$str = 'test: �';
-$res = $client->Test(array('str'=>$str));
-echo $str."\n";
-echo $res."\n";
-echo $g."\n";
-?>
---EXPECT--
-test: �
-test: �
-test: �
diff --git a/ext/soap/tests/bugs/bug38067.wsdl b/ext/soap/tests/bugs/bug38067.wsdl
deleted file mode 100755
index beb9fc2141..0000000000
--- a/ext/soap/tests/bugs/bug38067.wsdl
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-		xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-		xmlns:s="http://www.w3.org/2001/XMLSchema"
-		xmlns:s0="http://test.pl"
-		targetNamespace="http://test.pl"
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<s:schema elementFormDefault="qualified" targetNamespace="http://test.pl">
-			<s:complexType name="Test">
-				<s:attribute use="required" name="str" type="s:string"/>
-			</s:complexType>
-			<s:element type="s0:Test" name="Test"/>
-			<s:element type="s:string" name="Ret"/>
-		</s:schema>
-	</types>
-
-	<message name="TestSoapIn">
-		<part name="parameters" element="s0:Test"/>
-	</message>
-	<message name="TestSoapOut">
-		<part name="parameters" element="s0:Ret"/>
-	</message>
-	<portType name="TestSoap">
-		<operation name="Test">
-			<input message="s0:TestSoapIn"/>
-			<output message="s0:TestSoapOut"/>
-		</operation>
-	</portType>
-	<binding name="TestSoap" type="s0:TestSoap">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-		<operation name="Test">
-			<soap:operation soapAction="http:/Test/Test" style="document"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Test">
-		<port name="TestSoapPort" binding="s0:TestSoap">
-			<soap:address location="http://localhost/server.php"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/bugs/skipif.inc b/ext/soap/tests/bugs/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/bugs/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/bugs/xml.xsd b/ext/soap/tests/bugs/xml.xsd
deleted file mode 100644
index abb844ac12..0000000000
--- a/ext/soap/tests/bugs/xml.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/ext/soap/tests/bugs/xml2.xsd b/ext/soap/tests/bugs/xml2.xsd
deleted file mode 100755
index a8e2185f1d..0000000000
--- a/ext/soap/tests/bugs/xml2.xsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    id   (as an attribute name): denotes an attribute whose value
-         should be interpreted as if declared to be of type ID.
-         The xml:id specification is not yet a W3C Recommendation,
-         but this attribute is included here to facilitate experimentation
-         with the mechanisms it proposes.  Note that it is _not_ included
-         in the specialAttrs attribute group.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2005/08/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself, or with the XML namespace itself.  In other words, if the XML
-   Schema or XML namespaces change, the version of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2005/08/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values is probably never
-         going to be a realistic possibility.  See
-         RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-         at http://www.iana.org/assignments/lang-tag-apps.htm for
-         further information.
-
-         The union allows for the 'un-declaration' of xml:lang with
-         the empty string.</xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xml-id/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/ext/soap/tests/classmap.wsdl b/ext/soap/tests/classmap.wsdl
deleted file mode 100644
index 7fcf596244..0000000000
--- a/ext/soap/tests/classmap.wsdl
+++ /dev/null
@@ -1,60 +0,0 @@
-<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/classmap001.phpt b/ext/soap/tests/classmap001.phpt
deleted file mode 100644
index 1908ddd1ec..0000000000
--- a/ext/soap/tests/classmap001.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-SOAP Classmap 1: SoapServer support for classmap
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
- <dotest>
-  <book xsi:type=\"ns1:book\">
-    <a xsi:type=\"xsd:string\">Blaat</a>
-    <b xsi:type=\"xsd:string\">aap</b>
-</book>
-</dotest>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-class test{
-	function dotest(book $book){
-		$classname=get_class($book);
-		return "Classname: ".$classname;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-$options=Array(
-		'actor' =>'http://schema.nothing.com',
-		'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2')
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotestResponse><res xsi:type="xsd:string">Classname: book</res></ns1:dotestResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt
deleted file mode 100644
index e6f5af9913..0000000000
--- a/ext/soap/tests/classmap002.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-SOAP Classmap 2: SoapClient support for classmap
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-		return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotest2Response><res xsi:type="ns1:book">
-  <a xsi:type="xsd:string">Blaat</a>
-  <b xsi:type="xsd:string">aap</b>
-</res>
-</ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-$options=Array(
-		'actor' =>'http://schema.nothing.com',
-		'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2')
-		);
-
-$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options);
-$ret = $client->dotest2("???");
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECT--
-object(book)#2 (2) {
-  ["a"]=>
-  string(5) "Blaat"
-  ["b"]=>
-  string(3) "aap"
-}
-ok
diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt
deleted file mode 100755
index ac87a1682e..0000000000
--- a/ext/soap/tests/classmap003.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-SOAP Classmap 3: encoding of inherited objects
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-ini_set("soap.wsdl_cache_enabled",0);
-
-class A {
-  public $x;
-  function __construct($a){
-    $this->x = $a;
-  }
-}
-
-class B extends A {
-  public $y; 
-  function __construct($a){
-    parent::__construct($a);
-    $this->y = $a + 1;
-  }
-}
-
-function f(){
-  return new B(5);
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction("f");
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-}
-
-$client = new LocalSoapClient(dirname(__FILE__)."/classmap003.wsdl",
-    array('classmap'=>array('A'=>'A','B'=>'B')));
-print_r($client->f());
-?>
---EXPECT--
-B Object
-(
-    [y] => 6
-    [x] => 5
-)
diff --git a/ext/soap/tests/classmap003.wsdl b/ext/soap/tests/classmap003.wsdl
deleted file mode 100755
index 494c41864e..0000000000
--- a/ext/soap/tests/classmap003.wsdl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- WSDL file generated by Zend Studio. -->
-
-<definitions name="ab" targetNamespace="urn:ab" xmlns:typens="urn:ab" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:ab">
-			<xsd:complexType name="A">
-				<xsd:sequence>
-					<xsd:element name="x" type="xsd:anyType"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="B">
-				<xsd:complexContent>
-                    <xsd:extension base="typens:A">
-                        <xsd:sequence>
-					       <xsd:element name="y" type="xsd:anyType"/>
-                        </xsd:sequence>
-                    </xsd:extension>
-                </xsd:complexContent>
-			</xsd:complexType>
-		</xsd:schema>
-	</types>
-	<message name="f"/>
-	<message name="fResponse">
-		<part name="fReturn" type="typens:A"/>
-	</message>
-	<portType name="abServerPortType">
-		<operation name="f">
-			<input message="typens:f"/>
-			<output message="typens:fResponse"/>
-		</operation>
-	</portType>
-	<binding name="abServerBinding" type="typens:abServerPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="f">
-			<soap:operation soapAction="urn:abServerAction"/>
-			<input>
-				<soap:body namespace="urn:ab" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body namespace="urn:ab" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="abService">
-		<port name="abServerPort" binding="typens:abServerBinding">
-			<soap:address location="http://localhost/abServer.php"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt
deleted file mode 100644
index f88cdddbf0..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 001 (php/direct): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array("Hello World!"), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><param0 xsi:type="xsd:string">Hello World!</param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">Hello World!</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt
deleted file mode 100644
index a25eea52c3..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 001 (soap/direct): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(new SoapParam(new SoapVar("Hello World!",XSD_STRING),"inputString")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">Hello World!</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">Hello World!</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt
deleted file mode 100644
index ea9dc86a18..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World!");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">Hello World!</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">Hello World!</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt
deleted file mode 100644
index a5c62425df..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 002 (php/direct): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(""), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><param0 xsi:type="xsd:string"></param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string"></outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt
deleted file mode 100644
index 3a256241a1..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 002 (soap/direct): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(new SoapParam(new SoapVar("",XSD_STRING),"inputString")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string"></inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string"></outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt
deleted file mode 100644
index 4761df605b..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 002 (php/wsdl): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string"></inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string"></outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
deleted file mode 100644
index 8aadcbb6f7..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 003 (php/direct): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(NULL), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><param0 xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
deleted file mode 100644
index e215ec1b07..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 003 (soap/direct): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(new SoapParam(new SoapVar(NULL,XSD_STRING),"inputString")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><inputString xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
deleted file mode 100644
index cf6544b755..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 003 (php/wsdl): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(NULL);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><inputString xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt
deleted file mode 100644
index cb56ce6719..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round2 base 004 (php/direct): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(">,<,&,\",',\\,\n"), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><param0 xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt
deleted file mode 100644
index 20c899e7eb..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round2 base 004 (soap/direct): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(new SoapParam(new SoapVar(">,<,&,\",',\\,\n",XSD_STRING),"inputString")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt
deleted file mode 100644
index 69b3afd955..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round2 base 004 (php/wsdl): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(">,<,&,\",',\\,\n");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">&gt;,&lt;,&amp;,",',\,
-</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
deleted file mode 100644
index d8f91d328e..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(utf8_encode('ỗÈéóÒ₧⅜ỗỸ')), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><param0 xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
deleted file mode 100644
index 116e14faac..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString", array(new SoapParam(new SoapVar(utf8_encode('ỗÈéóÒ₧⅜ỗỸ'),XSD_STRING),"inputString")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
deleted file mode 100644
index 64f03df7b5..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(utf8_encode('ỗÈéóÒ₧⅜ỗỸ'));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoString><inputString xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStringResponse><outputString xsi:type="xsd:string">á»ÃÃ©Ã³Ãâ§âá»á»¸</outputString></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt
deleted file mode 100644
index a85d3c481a..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 006 (php/direct): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array(array('good','bad')), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 SOAP-ENC:arrayType="xsd:string[2]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></param0></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[2]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt
deleted file mode 100644
index 8ea498a5c6..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP Interop Round2 base 006 (soap/direct): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(array(
-    new SoapVar('good', XSD_STRING),
-    new SoapVar('bad', XSD_STRING)
-  ), SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd"), "inputStringArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:string[2]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></inputStringArray></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[2]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt
deleted file mode 100644
index 18aa020765..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 006 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array('good','bad'));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:string[2]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></inputStringArray></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[2]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item><item xsi:type="xsd:string">bad</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt
deleted file mode 100644
index bfa5e1c725..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 007 (php/direct): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array(array('good')), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 SOAP-ENC:arrayType="xsd:string[1]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">good</item></param0></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[1]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt
deleted file mode 100644
index 6d46588a37..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round2 base 007 (soap/direct): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(array(
-    new SoapVar('good', XSD_STRING)
-  ), SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd"), "inputStringArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:string[1]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item></inputStringArray></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[1]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt
deleted file mode 100644
index cdc791dc7a..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 007 (php/wsdl): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array('good'));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:string[1]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item></inputStringArray></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[1]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">good</item></outputStringArray></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt
deleted file mode 100644
index 21125586b1..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 008 (php/direct): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array(array()), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 SOAP-ENC:arrayType="xsd:ur-type[0]" xsi:type="SOAP-ENC:Array"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[0]" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt
deleted file mode 100644
index 2bae84505f..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round2 base 008 (soap/direct): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(array(
-  ), SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd"), "inputStringArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:ur-type[0]" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[0]" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt
deleted file mode 100644
index 1750aabc4a..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 008 (php/wsdl): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array());
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray SOAP-ENC:arrayType="xsd:string[0]" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray SOAP-ENC:arrayType="xsd:string[0]" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt
deleted file mode 100644
index bee2f79634..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 009 (php/direct): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array(NULL), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 xsi:nil="true"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray xsi:nil="true" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt
deleted file mode 100644
index 071d54dc54..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round2 base 009 (soap/direct): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(NULL, SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd"), "inputStringArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray xsi:nil="true" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray xsi:nil="true" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt
deleted file mode 100644
index 9c2c130b81..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 009 (php/wsdl): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(NULL);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><inputStringArray xsi:nil="true" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><outputStringArray xsi:nil="true" xsi:type="ns2:ArrayOfstring"/></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt
deleted file mode 100644
index 9c2aa0ff4c..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 010 (php/direct): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoInteger", array(34345), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoInteger><param0 xsi:type="xsd:int">34345</param0></ns1:echoInteger></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoIntegerResponse><outputInteger xsi:type="xsd:int">34345</outputInteger></ns1:echoIntegerResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt
deleted file mode 100644
index 1f012cae9f..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 010 (soap/direct): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoInteger", array(new SoapParam(new soapVar(34345, XSD_INT), "inputInteger")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoInteger><inputInteger xsi:type="xsd:int">34345</inputInteger></ns1:echoInteger></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoIntegerResponse><outputInteger xsi:type="xsd:int">34345</outputInteger></ns1:echoIntegerResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt
deleted file mode 100644
index b32d94f364..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 010 (php/wsdl): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoInteger(34345);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoInteger><inputInteger xsi:type="xsd:int">34345</inputInteger></ns1:echoInteger></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoIntegerResponse><outputInteger xsi:type="xsd:int">34345</outputInteger></ns1:echoIntegerResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt
deleted file mode 100644
index 739ded994d..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 011 (php/direct): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoIntegerArray", array(array(1,234324324,2)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArray><param0 SOAP-ENC:arrayType="xsd:int[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></param0></ns1:echoIntegerArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArrayResponse><outputIntegerArray SOAP-ENC:arrayType="xsd:int[3]" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></outputIntegerArray></ns1:echoIntegerArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt
deleted file mode 100644
index d7699e2ea6..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 base 011 (soap/direct): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(array(
-    new SoapVar(1,XSD_INT),
-    new SoapVar(234324324,XSD_INT),
-    new SoapVar(2,XSD_INT)
-  ), SOAP_ENC_ARRAY, "ArrayOfint","http://soapinterop.org/xsd"), "inputIntegerArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoIntegerArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArray><inputIntegerArray SOAP-ENC:arrayType="xsd:int[3]" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></inputIntegerArray></ns1:echoIntegerArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArrayResponse><outputIntegerArray SOAP-ENC:arrayType="xsd:int[3]" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></outputIntegerArray></ns1:echoIntegerArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt
deleted file mode 100644
index 3229e54fdd..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 011 (php/wsdl): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoIntegerArray(array(1,234324324,2));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArray><inputIntegerArray SOAP-ENC:arrayType="xsd:int[3]" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></inputIntegerArray></ns1:echoIntegerArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntegerArrayResponse><outputIntegerArray SOAP-ENC:arrayType="xsd:int[3]" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">1</item><item xsi:type="xsd:int">234324324</item><item xsi:type="xsd:int">2</item></outputIntegerArray></ns1:echoIntegerArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt
deleted file mode 100644
index 2da25b261c..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 012 (php/direct): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoFloat", array(342.23), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloat><param0 xsi:type="xsd:float">342.23</param0></ns1:echoFloat></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloatResponse><outputFloat xsi:type="xsd:float">342.23</outputFloat></ns1:echoFloatResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt
deleted file mode 100644
index bd62edd27a..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 012 (soap/direct): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoFloat", array(new SoapParam(new SoapVar(342.23,XSD_FLOAT),"inputFloat")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloat><inputFloat xsi:type="xsd:float">342.23</inputFloat></ns1:echoFloat></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloatResponse><outputFloat xsi:type="xsd:float">342.23</outputFloat></ns1:echoFloatResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt
deleted file mode 100644
index 05aad06c18..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 012 (php/wsdl): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoFloat(342.23);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloat><inputFloat xsi:type="xsd:float">342.23</inputFloat></ns1:echoFloat></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoFloatResponse><outputFloat xsi:type="xsd:float">342.23</outputFloat></ns1:echoFloatResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt
deleted file mode 100644
index 133f88b15e..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 013 (php/direct): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoFloatArray", array(array(1.3223,34.2,325.325)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArray><param0 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></param0></ns1:echoFloatArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArrayResponse><outputFloatArray SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></outputFloatArray></ns1:echoFloatArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt
deleted file mode 100644
index 5ce96d803f..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 base 013 (soap/direct): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param =  new SoapParam(new SoapVar(array(
-    new SoapVar(1.3223, XSD_FLOAT),
-    new SoapVar(34.2, XSD_FLOAT),
-    new SoapVar(325.325, XSD_FLOAT)
-  ), SOAP_ENC_ARRAY, "ArrayOffloat","http://soapinterop.org/xsd"), "inputFloatArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoFloatArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArray><inputFloatArray SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></inputFloatArray></ns1:echoFloatArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArrayResponse><outputFloatArray SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></outputFloatArray></ns1:echoFloatArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt
deleted file mode 100644
index 07b7cc86a2..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 013 (php/wsdl): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoFloatArray(array(1.3223,34.2,325.325));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArray><inputFloatArray SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></inputFloatArray></ns1:echoFloatArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoFloatArrayResponse><outputFloatArray SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">1.3223</item><item xsi:type="xsd:float">34.2</item><item xsi:type="xsd:float">325.325</item></outputFloatArray></ns1:echoFloatArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt
deleted file mode 100644
index 567dde5fbf..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round2 base 014 (php/direct): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStruct", array(new SOAPStruct('arg',34,325.325)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStruct><param0 xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></param0></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><outputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></outputStruct></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt
deleted file mode 100644
index a47f70769f..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 base 014 (soap/direct): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = new SoapParam(new SoapVar(array(
-		new SoapVar('arg', XSD_STRING, null, null, 'varString'),
-		new SoapVar('34',  XSD_INT, null, null, 'varInt'),
-		new SoapVar('325.325',  XSD_FLOAT, null, null, 'varFloat')
-  ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), "inputStruct");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStruct", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStruct><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></inputStruct></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><outputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></outputStruct></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt
deleted file mode 100644
index be49c5c577..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round2 base 014 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct(new SOAPStruct('arg',34,325.325));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStruct><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></inputStruct></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><outputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></outputStruct></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
deleted file mode 100644
index 0d779dc063..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round2 base 015 (php/direct): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStructArray", array(array($struct,$struct)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArray><param0 SOAP-ENC:arrayType="SOAP-ENC:Struct[2]" xsi:type="SOAP-ENC:Array"><item xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></param0></ns1:echoStructArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArrayResponse><outputStructArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></outputStructArray></ns1:echoStructArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
deleted file mode 100644
index 887210548b..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP Interop Round2 base 015 (soap/direct): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-
-$struct = new SoapVar(array(
-		new SoapVar('arg', XSD_STRING, null, null, 'varString'),
-		new SoapVar('34',  XSD_INT, null, null, 'varInt'),
-		new SoapVar('325.325',  XSD_FLOAT, null, null, 'varFloat')
-  ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd");
-
-$param =   new SoapParam(new SoapVar(array(
-    $struct,
-    $struct
-  ),SOAP_ENC_ARRAY,"ArrayOfSOAPStruct","http://soapinterop.org/xsd"), "inputStructArray");
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStructArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArray><inputStructArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></inputStructArray></ns1:echoStructArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArrayResponse><outputStructArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></outputStructArray></ns1:echoStructArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
deleted file mode 100644
index 83c369dab3..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round2 base 015 (php/wsdl): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStructArray(array($struct,$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArray><inputStructArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></inputStructArray></ns1:echoStructArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArrayResponse><outputStructArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></outputStructArray></ns1:echoStructArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt
deleted file mode 100644
index 0c3a028f1e..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 016 (php/direct): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoid", array(), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt
deleted file mode 100644
index 24cd42b0de..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 016 (soap/direct): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoid", array(), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt
deleted file mode 100644
index 856610d45d..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 016 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVoid();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt
deleted file mode 100644
index 5f6b3c3143..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 017 (php/direct): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBase64", array('Nebraska'), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64><param0 xsi:type="xsd:string">Nebraska</param0></ns1:echoBase64></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64Response><outputBase64 xsi:type="xsd:base64Binary">TmVicmFza2E=</outputBase64></ns1:echoBase64Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt
deleted file mode 100644
index 3e3c6e1272..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 017 (soap/direct): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBase64", array(new SoapParam(new SoapVar('Nebraska',XSD_BASE64BINARY),"inputBase64")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64><inputBase64 xsi:type="xsd:base64Binary">TmVicmFza2E=</inputBase64></ns1:echoBase64></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64Response><outputBase64 xsi:type="xsd:base64Binary">TmVicmFza2E=</outputBase64></ns1:echoBase64Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt
deleted file mode 100644
index 7471c371d9..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 017 (php/wsdl): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBase64('Nebraska');
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64><inputBase64 xsi:type="xsd:base64Binary">TmVicmFza2E=</inputBase64></ns1:echoBase64></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBase64Response><outputBase64 xsi:type="xsd:base64Binary">TmVicmFza2E=</outputBase64></ns1:echoBase64Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt
deleted file mode 100644
index 3738148c19..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 018 (php/direct): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoHexBinary", array('soapx4'), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinary><param0 xsi:type="xsd:string">soapx4</param0></ns1:echoHexBinary></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinaryResponse><outputHexBinary xsi:type="xsd:hexBinary">736F61707834</outputHexBinary></ns1:echoHexBinaryResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt
deleted file mode 100644
index a531069388..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 018 (soap/direct): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoHexBinary", array(new SoapParam(new SoapVar('soapx4',XSD_HEXBINARY),"inputHexBinary")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinary><inputHexBinary xsi:type="xsd:hexBinary">736F61707834</inputHexBinary></ns1:echoHexBinary></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinaryResponse><outputHexBinary xsi:type="xsd:hexBinary">736F61707834</outputHexBinary></ns1:echoHexBinaryResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt
deleted file mode 100644
index a118311df4..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 018 (php/wsdl): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoHexBinary('soapx4');
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinary><inputHexBinary xsi:type="xsd:hexBinary">736F61707834</inputHexBinary></ns1:echoHexBinary></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoHexBinaryResponse><outputHexBinary xsi:type="xsd:hexBinary">736F61707834</outputHexBinary></ns1:echoHexBinaryResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt
deleted file mode 100644
index a767301d67..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 019 (php/direct): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoDecimal", array('12345.67890'), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimal><param0 xsi:type="xsd:string">12345.67890</param0></ns1:echoDecimal></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimalResponse><outputDecimal xsi:type="xsd:decimal">12345.67890</outputDecimal></ns1:echoDecimalResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt
deleted file mode 100644
index 56bea8b4e8..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 019 (soap/direct): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoDecimal", array(new SoapParam(new SoapVar('12345.67890',XSD_DECIMAL), "inputDecimal")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimal><inputDecimal xsi:type="xsd:decimal">12345.67890</inputDecimal></ns1:echoDecimal></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimalResponse><outputDecimal xsi:type="xsd:decimal">12345.67890</outputDecimal></ns1:echoDecimalResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt
deleted file mode 100644
index 3f561557b3..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 019 (php/wsdl): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDecimal('12345.67890');
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimal><inputDecimal xsi:type="xsd:decimal">12345.67890</inputDecimal></ns1:echoDecimal></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDecimalResponse><outputDecimal xsi:type="xsd:decimal">12345.67890</outputDecimal></ns1:echoDecimalResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt
deleted file mode 100644
index 4afe922e85..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 020 (php/direct): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoDate", array('2001-05-24T17:31:41Z'), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDate><param0 xsi:type="xsd:string">2001-05-24T17:31:41Z</param0></ns1:echoDate></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDateResponse><outputDate xsi:type="xsd:dateTime">2001-05-24T17:31:41Z</outputDate></ns1:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt
deleted file mode 100644
index 6ced7482ad..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 020 (soap/direct): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoDate", array(new SoapParam(new SoapVar('2001-05-24T17:31:41Z', XSD_DATETIME), "inputDate")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDate><inputDate xsi:type="xsd:dateTime">2001-05-24T17:31:41Z</inputDate></ns1:echoDate></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDateResponse><outputDate xsi:type="xsd:dateTime">2001-05-24T17:31:41Z</outputDate></ns1:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt
deleted file mode 100644
index 47d3a9d783..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 020 (php/wsdl): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDate('2001-05-24T17:31:41Z');
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDate><inputDate xsi:type="xsd:dateTime">2001-05-24T17:31:41Z</inputDate></ns1:echoDate></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoDateResponse><outputDate xsi:type="xsd:dateTime">2001-05-24T17:31:41Z</outputDate></ns1:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt
deleted file mode 100644
index 69edf346d9..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 021 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(true), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><param0 xsi:type="xsd:boolean">true</param0></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt
deleted file mode 100644
index 8f2a66fc50..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 021 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(new SoapParam(new SoapVar(true, XSD_BOOLEAN), "inputBoolean")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">true</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt
deleted file mode 100644
index 1e4cb4ee25..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 021 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBoolean(true);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">true</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt
deleted file mode 100644
index 07322b9876..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 022 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(false), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><param0 xsi:type="xsd:boolean">false</param0></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt
deleted file mode 100644
index 9f4309cc31..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 022 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(new SoapParam(new SoapVar(false, XSD_BOOLEAN), "inputBoolean")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">false</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt
deleted file mode 100644
index 5add7e5e83..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 022 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBoolean(false);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">false</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt
deleted file mode 100644
index 65dcad2733..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 023 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(1), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><param0 xsi:type="xsd:int">1</param0></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt
deleted file mode 100644
index 8985f38f4a..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 023 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(new SoapParam(new SoapVar(1, XSD_BOOLEAN), "inputBoolean")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">true</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt
deleted file mode 100644
index ca4eff0fcb..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 023 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBoolean(1);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">true</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">true</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt
deleted file mode 100644
index f55f095019..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 024 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(0), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><param0 xsi:type="xsd:int">0</param0></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt
deleted file mode 100644
index f10e7629ab..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 024 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoBoolean", array(new SoapParam(new SoapVar(0, XSD_BOOLEAN), "inputBoolean")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">false</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt
deleted file mode 100644
index 96187fbb03..0000000000
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 base 024 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBoolean(0);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_base.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBoolean><inputBoolean xsi:type="xsd:boolean">false</inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoBooleanResponse><outputBoolean xsi:type="xsd:boolean">false</outputBoolean></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/Base/round2_base.inc b/ext/soap/tests/interop/Round2/Base/round2_base.inc
deleted file mode 100644
index b197f5bddd..0000000000
--- a/ext/soap/tests/interop/Round2/Base/round2_base.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-class SOAP_Interop_Base {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-    function echoStringArray($inputStringArray)
-    {
-      return $inputStringArray;
-    }
-
-
-    function echoInteger($inputInteger)
-    {
-      return $inputInteger;
-    }
-
-    function echoIntegerArray($inputIntegerArray)
-    {
-      return $inputIntegerArray;
-    }
-
-    function echoFloat($inputFloat)
-    {
-      return $inputFloat;
-    }
-
-    function echoFloatArray($inputFloatArray)
-    {
-      return $inputFloatArray;
-    }
-
-    function echoStruct($inputStruct)
-    {
-      return $inputStruct;
-    }
-
-    function echoStructArray($inputStructArray)
-    {
-      return $inputStructArray;
-    }
-
-    function echoVoid()
-    {
-      return NULL;
-    }
-
-    function echoBase64($b_encoded)
-    {
-      return $b_encoded;
-    }
-
-    function echoDate($timeInstant)
-    {
-      return $timeInstant;
-    }
-
-    function echoHexBinary($hb)
-    {
-      return $hb;
-    }
-
-    function echoDecimal($dec)
-    {
-      return $dec;
-    }
-
-    function echoBoolean($boolean)
-    {
-      return $boolean;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round2_base.wsdl");
-$server->setClass("SOAP_Interop_Base");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round2/Base/round2_base.wsdl b/ext/soap/tests/interop/Round2/Base/round2_base.wsdl
deleted file mode 100644
index c7c70319dd..0000000000
--- a/ext/soap/tests/interop/Round2/Base/round2_base.wsdl
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="InteropTest"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-    xmlns:tns="http://soapinterop.org/"
-    xmlns:s="http://soapinterop.org/xsd"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://soapinterop.org/">
-
-  <types>
-  <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/xsd">
-   <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-   <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" />
-   <xsd:complexType name="ArrayOfstring">
-    <xsd:complexContent>
-     <xsd:restriction base="SOAP-ENC:Array">
-      <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[]"/>
-     </xsd:restriction>
-    </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="ArrayOfint">
-    <xsd:complexContent>
-     <xsd:restriction base="SOAP-ENC:Array">
-      <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-     </xsd:restriction>
-    </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="ArrayOffloat">
-    <xsd:complexContent>
-     <xsd:restriction base="SOAP-ENC:Array">
-      <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="float[]"/>
-     </xsd:restriction>
-    </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="SOAPStruct">
-    <xsd:all>
-     <xsd:element name="varString" type="string"/>
-     <xsd:element name="varInt" type="int"/>
-     <xsd:element name="varFloat" type="float"/>
-    </xsd:all>
-   </xsd:complexType>
-   <xsd:complexType name="ArrayOfSOAPStruct">
-    <xsd:complexContent>
-     <xsd:restriction base="SOAP-ENC:Array">
-      <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="s:SOAPStruct[]"/>
-     </xsd:restriction>
-    </xsd:complexContent>
-   </xsd:complexType>
-  </schema>
-  </types>
-
-  <message name="echoStringRequest">
-    <part name="inputString" type="xsd:string" />
-  </message>
-  <message name="echoStringResponse">
-    <part name="outputString" type="xsd:string" />
-  </message>
-  <message name="echoStringArrayRequest">
-    <part name="inputStringArray" type="s:ArrayOfstring" />
-  </message>
-  <message name="echoStringArrayResponse">
-    <part name="outputStringArray" type="s:ArrayOfstring" />
-  </message>
-  <message name="echoIntegerRequest">
-    <part name="inputInteger" type="xsd:int" />
-  </message>
-  <message name="echoIntegerResponse">
-    <part name="outputInteger" type="xsd:int" />
-  </message>
-  <message name="echoIntegerArrayRequest">
-    <part name="inputIntegerArray" type="s:ArrayOfint" />
-  </message>
-  <message name="echoIntegerArrayResponse">
-    <part name="outputIntegerArray" type="s:ArrayOfint" />
-  </message>
-  <message name="echoFloatRequest">
-    <part name="inputFloat" type="xsd:float" />
-  </message>
-  <message name="echoFloatResponse">
-    <part name="outputFloat" type="xsd:float" />
-  </message>
-  <message name="echoFloatArrayRequest">
-    <part name="inputFloatArray" type="s:ArrayOffloat" />
-  </message>
-  <message name="echoFloatArrayResponse">
-    <part name="outputFloatArray" type="s:ArrayOffloat" />
-  </message>
-  <message name="echoStructRequest">
-    <part name="inputStruct" type="s:SOAPStruct" />
-  </message>
-  <message name="echoStructResponse">
-    <part name="outputStruct" type="s:SOAPStruct" />
-  </message>
-  <message name="echoStructArrayRequest">
-    <part name="inputStructArray" type="s:ArrayOfSOAPStruct" />
-  </message>
-  <message name="echoStructArrayResponse">
-    <part name="outputStructArray" type="s:ArrayOfSOAPStruct" />
-  </message>
-  <message name="echoVoidRequest">
-  </message>
-  <message name="echoVoidResponse">
-  </message>
-  <message name="echoBase64Request">
-    <part name="inputBase64" type="xsd:base64Binary" />
-  </message>
-  <message name="echoBase64Response">
-    <part name="outputBase64" type="xsd:base64Binary" />
-  </message>
-  <message name="echoDateRequest">
-    <part name="inputDate" type="xsd:dateTime" />
-  </message>
-  <message name="echoDateResponse">
-    <part name="outputDate" type="xsd:dateTime" />
-  </message>
-  <message name="echoHexBinaryRequest">
-    <part name="inputHexBinary" type="xsd:hexBinary" />
-  </message>
-  <message name="echoHexBinaryResponse">
-    <part name="outputHexBinary" type="xsd:hexBinary" />
-  </message>
-  <message name="echoDecimalRequest">
-    <part name="inputDecimal" type="xsd:decimal" />
-  </message>
-  <message name="echoDecimalResponse">
-    <part name="outputDecimal" type="xsd:decimal" />
-  </message>
-  <message name="echoBooleanRequest">
-    <part name="inputBoolean" type="xsd:boolean" />
-  </message>
-  <message name="echoBooleanResponse">
-    <part name="outputBoolean" type="xsd:boolean" />
-  </message>
-
-  <portType name="InteropTestPortType">
-    <operation name="echoString">
-      <input message="tns:echoStringRequest"/>
-      <output message="tns:echoStringResponse"/>
-    </operation>
-    <operation name="echoStringArray">
-      <input message="tns:echoStringArrayRequest"/>
-      <output message="tns:echoStringArrayResponse"/>
-    </operation>
-    <operation name="echoInteger">
-      <input message="tns:echoIntegerRequest"/>
-      <output message="tns:echoIntegerResponse"/>
-    </operation>
-    <operation name="echoIntegerArray">
-      <input message="tns:echoIntegerArrayRequest"/>
-      <output message="tns:echoIntegerArrayResponse"/>
-    </operation>
-    <operation name="echoFloat">
-      <input message="tns:echoFloatRequest"/>
-      <output message="tns:echoFloatResponse"/>
-    </operation>
-    <operation name="echoFloatArray">
-      <input message="tns:echoFloatArrayRequest"/>
-      <output message="tns:echoFloatArrayResponse"/>
-    </operation>
-    <operation name="echoStruct">
-      <input message="tns:echoStructRequest"/>
-      <output message="tns:echoStructResponse"/>
-    </operation>
-    <operation name="echoStructArray">
-      <input message="tns:echoStructArrayRequest"/>
-      <output message="tns:echoStructArrayResponse"/>
-    </operation>
-    <operation name="echoVoid">
-      <input message="tns:echoVoidRequest"/>
-      <output message="tns:echoVoidResponse"/>
-    </operation>
-    <operation name="echoBase64">
-      <input message="tns:echoBase64Request"/>
-      <output message="tns:echoBase64Response"/>
-    </operation>
-    <operation name="echoDate">
-      <input message="tns:echoDateRequest"/>
-      <output message="tns:echoDateResponse"/>
-    </operation>
-    <operation name="echoHexBinary">
-      <input message="tns:echoHexBinaryRequest"/>
-      <output message="tns:echoHexBinaryResponse"/>
-    </operation>
-    <operation name="echoDecimal">
-      <input message="tns:echoDecimalRequest"/>
-      <output message="tns:echoDecimalResponse"/>
-    </operation>
-    <operation name="echoBoolean">
-      <input message="tns:echoBooleanRequest"/>
-      <output message="tns:echoBooleanResponse"/>
-    </operation>
-  </portType>
-
-  <binding name="InteropTestBinding" type="tns:InteropTestPortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="echoString">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoStringArray">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoInteger">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoIntegerArray">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoFloat">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoFloatArray">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoStruct">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoStructArray">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoVoid">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoBase64">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoDate">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoHexBinary">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoDecimal">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="echoBoolean">
-      <soap:operation soapAction="http://" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-  </binding>
-
-  <service name="InteropTest">
-    <port name="InteropTestPort" binding="tns:InteropTestBinding">
-			<soap:address location="round2_base.inc"/>
-    </port>
-  </service>
-
-</definitions>
diff --git a/ext/soap/tests/interop/Round2/Base/skipif.inc b/ext/soap/tests/interop/Round2/Base/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round2/Base/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt
deleted file mode 100644
index d2b6fc7f1e..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 001 (php/direct): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStructAsSimpleTypes", array((object)array('varString'=>"arg",'varInt'=>34,'varFloat'=>34.345)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStructAsSimpleTypes><param0 xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></param0></ns1:echoStructAsSimpleTypes></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStructAsSimpleTypesResponse><outputString xsi:type="xsd:string">arg</outputString><outputInteger xsi:type="xsd:int">34</outputInteger><outputFloat xsi:type="xsd:float">34.345</outputFloat></ns1:echoStructAsSimpleTypesResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt
deleted file mode 100644
index ea32aba35e..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 001 (soap/direct): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = new SoapParam(new SoapVar(array(
-    new SoapVar("arg", XSD_STRING, null, null, "varString"),
-    new SoapVar(34, XSD_INT, null, null, "varInt"),
-    new SoapVar(34.345, XSD_FLOAT, null, null, "varFloat")
-  ), SOAP_ENC_OBJECT, "SOAPStruct", "http://soapinterop.org/xsd"), "inputStruct");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStructAsSimpleTypes", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructAsSimpleTypes><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></inputStruct></ns1:echoStructAsSimpleTypes></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStructAsSimpleTypesResponse><outputString xsi:type="xsd:string">arg</outputString><outputInteger xsi:type="xsd:int">34</outputInteger><outputFloat xsi:type="xsd:float">34.345</outputFloat></ns1:echoStructAsSimpleTypesResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt
deleted file mode 100644
index 5c2b93eee2..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 001 (php/wsdl): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStructAsSimpleTypes((object)array('varString'=>"arg",'varInt'=>34,'varFloat'=>34.345));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructAsSimpleTypes><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></inputStruct></ns1:echoStructAsSimpleTypes></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoStructAsSimpleTypesResponse><outputString xsi:type="xsd:string">arg</outputString><outputInteger xsi:type="xsd:int">34</outputInteger><outputFloat xsi:type="xsd:float">34.345</outputFloat></ns1:echoStructAsSimpleTypesResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt
deleted file mode 100644
index 9899f55332..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 002 (php/direct): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoSimpleTypesAsStruct", array("arg",34,34.345), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoSimpleTypesAsStruct><param0 xsi:type="xsd:string">arg</param0><param1 xsi:type="xsd:int">34</param1><param2 xsi:type="xsd:float">34.345</param2></ns1:echoSimpleTypesAsStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoSimpleTypesAsStructResponse><return xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></return></ns1:echoSimpleTypesAsStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt
deleted file mode 100644
index 1d7d1db049..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 002 (soap/direct): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoSimpleTypesAsStruct", array(
-  new SoapParam(new SoapVar("arg",XSD_STRING), "inputString"),
-  new SoapParam(new SoapVar(34,XSD_INT), "inputInteger"),
-  new SoapParam(new SoapVar(34.345,XSD_FLOAT), "inputFloat")), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoSimpleTypesAsStruct><inputString xsi:type="xsd:string">arg</inputString><inputInteger xsi:type="xsd:int">34</inputInteger><inputFloat xsi:type="xsd:float">34.345</inputFloat></ns1:echoSimpleTypesAsStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoSimpleTypesAsStructResponse><return xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></return></ns1:echoSimpleTypesAsStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt
deleted file mode 100644
index b1515bcad6..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 002 (php/wsdl): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoSimpleTypesAsStruct("arg",34,34.345);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoSimpleTypesAsStruct><inputString xsi:type="xsd:string">arg</inputString><inputInteger xsi:type="xsd:int">34</inputInteger><inputFloat xsi:type="xsd:float">34.345</inputFloat></ns1:echoSimpleTypesAsStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoSimpleTypesAsStructResponse><return xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">34.345</varFloat></return></ns1:echoSimpleTypesAsStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt
deleted file mode 100644
index 417ae10a41..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 003 (php/direct): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = array(
-    array('row0col0', 'row0col1', 'row0col2'),
-    array('row1col0', 'row1col1', 'row1col2'));
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echo2DStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArray><param0 SOAP-ENC:arrayType="SOAP-ENC:Array[2]" xsi:type="SOAP-ENC:Array"><item SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item></item><item SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></item></param0></ns1:echo2DStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArrayResponse><return SOAP-ENC:arrayType="xsd:string[2,3]" xsi:type="ns2:ArrayOfString2D"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></return></ns1:echo2DStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt
deleted file mode 100644
index 59f213414c..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 003 (soap/direct): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = new SoapParam(new SoapVar(array(
-    new SoapVar(array(
-      new SoapVar('row0col0', XSD_STRING),
-      new SoapVar('row0col1', XSD_STRING),
-      new SoapVar('row0col2', XSD_STRING)
-    ), SOAP_ENC_ARRAY),
-    new SoapVar(array(
-      new SoapVar('row1col0', XSD_STRING),
-      new SoapVar('row1col1', XSD_STRING),
-      new SoapVar('row1col2', XSD_STRING)
-    ), SOAP_ENC_ARRAY)
-  ), SOAP_ENC_ARRAY, "ArrayOfString2D", "http://soapinterop.org/xsd"),"input2DStringArray");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echo2DStringArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArray><input2DStringArray SOAP-ENC:arrayType="SOAP-ENC:Array[2]" xsi:type="ns2:ArrayOfString2D"><item SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item></item><item SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></item></input2DStringArray></ns1:echo2DStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArrayResponse><return SOAP-ENC:arrayType="xsd:string[2,3]" xsi:type="ns2:ArrayOfString2D"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></return></ns1:echo2DStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt
deleted file mode 100644
index a3e9357b7e..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 003 (php/wsdl): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = array(
-    array('row0col0', 'row0col1', 'row0col2'),
-    array('row1col0', 'row1col1', 'row1col2'));
-$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echo2DStringArray($param);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArray><input2DStringArray SOAP-ENC:arrayType="xsd:string[2,3]" xsi:type="ns2:ArrayOfString2D"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></input2DStringArray></ns1:echo2DStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echo2DStringArrayResponse><return SOAP-ENC:arrayType="xsd:string[2,3]" xsi:type="ns2:ArrayOfString2D"><item xsi:type="xsd:string">row0col0</item><item xsi:type="xsd:string">row0col1</item><item xsi:type="xsd:string">row0col2</item><item xsi:type="xsd:string">row1col0</item><item xsi:type="xsd:string">row1col1</item><item xsi:type="xsd:string">row1col2</item></return></ns1:echo2DStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt
deleted file mode 100644
index 2a2ce246ca..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 004 (php/direct): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = (object)array(
-  'varString' => "arg",
-  'varInt' => 34,
-  'varFloat' => 123.45,
-  'varStruct' => (object)array(
-    'varString' => "arg2",
-    'varInt' => 342,
-    'varFloat' => 123.452,
-  ));
-
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoNestedStruct", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoNestedStruct><param0 xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></param0></ns1:echoNestedStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedStructResponse><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></return></ns1:echoNestedStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt
deleted file mode 100644
index e868809db7..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 004 (soap/direct): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = new SoapParam(new SoapVar(array(
-    new SoapVar("arg", XSD_STRING, null, null, "varString"),
-    new SoapVar(34, XSD_INT, null, null, "varInt"),
-    new SoapVar(123.45, XSD_FLOAT, null, null, "varFloat"),
-    new SoapVar(array(
-	    new SoapVar("arg2", XSD_STRING, null, null, "varString"),
-      new SoapVar(342, XSD_INT, null, null, "varInt"),
-      new SoapVar(123.452, XSD_FLOAT, null, null, "varFloat")
-    ), SOAP_ENC_OBJECT, "SOAPStruct", "http://soapinterop.org/xsd", 'varStruct')
-  ), SOAP_ENC_OBJECT, "SOAPStructStruct", "http://soapinterop.org/xsd"), "inputStruct");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoNestedStruct", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedStruct><inputStruct xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></inputStruct></ns1:echoNestedStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedStructResponse><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></return></ns1:echoNestedStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt
deleted file mode 100644
index 69dbdd7c21..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 004 (php/wsdl): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = (object)array(
-  'varString' => "arg",
-  'varInt' => 34,
-  'varFloat' => 123.45,
-  'varStruct' => (object)array(
-    'varString' => "arg2",
-    'varInt' => 342,
-    'varFloat' => 123.452,
-  ));
-
-$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoNestedStruct($param);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedStruct><inputStruct xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></inputStruct></ns1:echoNestedStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedStructResponse><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">123.45</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg2</varString><varInt xsi:type="xsd:int">342</varInt><varFloat xsi:type="xsd:float">123.452</varFloat></varStruct></return></ns1:echoNestedStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt
deleted file mode 100644
index 08e2e7bccd..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 005 (php/direct): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = (object)array(
-  'varString'=>'arg',
-  'varInt'=>34,
-  'varFloat'=>325.325,
-  'varArray' => array('red','blue','green'));
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoNestedArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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:echoNestedArray><param0 xsi:type="SOAP-ENC:Struct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></param0></ns1:echoNestedArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedArrayResponse><return xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></return></ns1:echoNestedArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt
deleted file mode 100644
index 331a619efe..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 005 (soap/direct): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = new SoapParam(new SoapVar(array(
-    new SoapVar("arg", XSD_STRING, null, null, "varString"),
-    new SoapVar(34, XSD_INT, null, null, "varInt"),
-    new SoapVar(325.325, XSD_FLOAT, null, null, "varFloat"),
-    new SoapVar(array(
-	    new SoapVar("red", XSD_STRING),
-	    new SoapVar("blue", XSD_STRING),
-	    new SoapVar("green", XSD_STRING),
-    ), SOAP_ENC_ARRAY, "ArrayOfString", "http://soapinterop.org/xsd", 'varArray')
-  ), SOAP_ENC_OBJECT, "SOAPArrayStruct", "http://soapinterop.org/xsd"), "inputStruct");
-$client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoNestedArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedArray><inputStruct xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfString"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></inputStruct></ns1:echoNestedArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedArrayResponse><return xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></return></ns1:echoNestedArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt
deleted file mode 100644
index 9b7661c22a..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP Interop Round2 groupB 005 (php/wsdl): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$param = (object)array(
-  'varString'=>'arg',
-  'varInt'=>34,
-  'varFloat'=>325.325,
-  'varArray' => array('red','blue','green'));
-$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoNestedArray($param);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round2_groupB.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedArray><inputStruct xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></inputStruct></ns1:echoNestedArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" 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/" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoNestedArrayResponse><return xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat><varArray SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></return></ns1:echoNestedArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc b/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc
deleted file mode 100644
index ef00e3bfd0..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-class SOAP_Interop_GroupB {
-
-    function echoStructAsSimpleTypes ($struct)
-    {
-      return array('outputString'  => $struct->varString,
-                   'outputInteger' => $struct->varInt,
-                   'outputFloat'   => $struct->varFloat);
-    }
-
-    function echoSimpleTypesAsStruct($string, $int, $float)
-    {
-      return (object)array("varString" => $string,
-      										 "varInt"    => $int,
-      										 "varFloat"  => $float);
-    }
-
-    function echoNestedStruct($struct)
-    {
-     return $struct;
-    }
-
-    function echo2DStringArray($ary)
-    {
-      return $ary;
-    }
-
-    function echoNestedArray($ary)
-    {
-      return $ary;
-    }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round2_groupB.wsdl");
-$server->setClass("SOAP_Interop_GroupB");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.wsdl b/ext/soap/tests/interop/Round2/GroupB/round2_groupB.wsdl
deleted file mode 100644
index 8fc2a1b119..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.wsdl
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="InteropTest"
-  targetNamespace="http://soapinterop.org/"
-  xmlns="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:tns="http://soapinterop.org/"
-  xmlns:s="http://soapinterop.org/xsd"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema"
-		  targetNamespace="http://soapinterop.org/xsd">
-
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-
-			<complexType name="ArrayOfstring">
-				<complexContent>
-					<restriction base="SOAP-ENC:Array">
- 						<attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ArrayOfint">
-				<complexContent>
-					<restriction base="SOAP-ENC:Array">
-						<attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ArrayOffloat">
-				<complexContent>
-					<restriction base="SOAP-ENC:Array">
-						<attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="float[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ArrayOfSOAPStruct">
-				<complexContent>
-					<restriction base="SOAP-ENC:Array">
-						<attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="s:SOAPStruct[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="SOAPStruct">
-				<all>
-					<element name="varString" type="string" nillable="true"/>
-					<element name="varInt" type="int" nillable="true"/>
-					<element name="varFloat" type="float" nillable="true"/>
-				</all>
-			</complexType>
-			<complexType name="SOAPStructStruct">
-				<all>
-					<element name="varString" type="string" nillable="true"/>
-					<element name="varInt" type="int" nillable="true"/>
-					<element name="varFloat" type="float" nillable="true"/>
-					<element name="varStruct" type="s:SOAPStruct"/>
-				</all>
-			</complexType>
-			<complexType name="SOAPArrayStruct">
-				<all>
-					<element name="varString" type="string" nillable="true"/>
-					<element name="varInt" type="int" nillable="true"/>
-					<element name="varFloat" type="float" nillable="true"/>
-					<element name="varArray" type="s:ArrayOfstring"/>
-				</all>
-			</complexType>
-   		<complexType name="ArrayOfString2D">
-     		<complexContent>
-					<restriction base="SOAP-ENC:Array">
-	     			<attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[,]"/>
-					</restriction>
-     		</complexContent>
-   		</complexType>
-		</schema>
-	</types>
-
-	<message name="echoStructAsSimpleTypesRequest">
-		<part name="inputStruct" type="s:SOAPStruct"/>
-	</message>
-	<message name="echoStructAsSimpleTypesResponse">
-		<part name="outputString" type="xsd:string"/>
-		<part name="outputInteger" type="xsd:int"/>
-		<part name="outputFloat" type="xsd:float"/>
-	</message>
-	<message name="echoSimpleTypesAsStructRequest">
-		<part name="inputString" type="xsd:string"/>
-		<part name="inputInteger" type="xsd:int"/>
-		<part name="inputFloat" type="xsd:float"/>
-	</message>
-	<message name="echoSimpleTypesAsStructResponse">
-		<part name="return" type="s:SOAPStruct"/>
-	</message>
-	<message name="echo2DStringArrayRequest">
-		<part name="input2DStringArray" type="s:ArrayOfString2D"/>
-	</message>
-	<message name="echo2DStringArrayResponse">
-		<part name="return" type="s:ArrayOfString2D"/>
-	</message>
-	<message name="echoNestedStructRequest">
-		<part name="inputStruct" type="s:SOAPStructStruct"/>
-	</message>
-	<message name="echoNestedStructResponse">
-		<part name="return" type="s:SOAPStructStruct"/>
-	</message>
-		<message name="echoNestedArrayRequest">
-		<part name="inputStruct" type="s:SOAPArrayStruct"/>
-	</message>
-	<message name="echoNestedArrayResponse">
-		<part name="return" type="s:SOAPArrayStruct"/>
-	</message>
-
-	<portType name="InteropTestPortTypeB">
-		<operation name="echoStructAsSimpleTypes" parameterOrder="inputStruct outputString outputInteger outputFloat">
-			<input message="tns:echoStructAsSimpleTypesRequest" name="echoStructAsSimpleTypes"/>
-			<output message="tns:echoStructAsSimpleTypesResponse" name="echoStructAsSimpleTypesResponse"/>
-		</operation>
-		<operation name="echoSimpleTypesAsStruct" parameterOrder="inputString inputInteger inputFloat">
-			<input message="tns:echoSimpleTypesAsStructRequest" name="echoSimpleTypesAsStruct"/>
-			<output message="tns:echoSimpleTypesAsStructResponse" name="echoSimpleTypesAsStructResponse"/>
-		</operation>
-		<operation name="echo2DStringArray" parameterOrder="input2DStringArray">
-			<input message="tns:echo2DStringArrayRequest" name="echo2DStringArray"/>
-			<output message="tns:echo2DStringArrayResponse" name="echo2DStringArrayResponse"/>
-		</operation>
-		<operation name="echoNestedStruct" parameterOrder="inputStruct">
-			<input message="tns:echoNestedStructRequest" name="echoNestedStruct"/>
-			<output message="tns:echoNestedStructResponse" name="echoNestedStructResponse"/>
-		</operation>
-		<operation name="echoNestedArray" parameterOrder="inputStruct">
-			<input message="tns:echoNestedArrayRequest" name="echoNestedArray"/>
-			<output message="tns:echoNestedArrayResponse" name="echoNestedArrayResponse"/>
-		</operation>
-	</portType>
-
-	<binding name="InteropTestSoapBindingB" type="tns:InteropTestPortTypeB">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoStructAsSimpleTypes">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-		<operation name="echoSimpleTypesAsStruct">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-		<operation name="echo2DStringArray">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-		<operation name="echoNestedStruct">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-		<operation name="echoNestedArray">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-
-	<service name="interopLabB">
-  		<port name="interopTestPortB" binding="tns:InteropTestSoapBindingB">
-    			<soap:address location="round2_groupB.inc"/>
-  		</port>
-	</service>
-
-</definitions>
diff --git a/ext/soap/tests/interop/Round2/GroupB/skipif.inc b/ext/soap/tests/interop/Round2/GroupB/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round2/GroupB/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupD/imported/import1B.wsdl b/ext/soap/tests/interop/Round3/GroupD/imported/import1B.wsdl
deleted file mode 100644
index 26ab6dbdd1..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/imported/import1B.wsdl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/definitions/" 
-		xmlns:wsdlns="http://soapinterop.org/definitions/" 
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types/>
-	<message name="echoStringRequest">
-		<part name="x" type="xsd:string"/>
-	</message>
-	<message name="echoStringResponse">
-		<part name="Result" type="xsd:string"/>
-	</message>
-	<portType name="SoapInteropImport1PortType">
-		<operation name="echoString" parameterOrder="x">
-			<input message="wsdlns:echoStringRequest"/>
-			<output message="wsdlns:echoStringResponse"/>
-		</operation>
-	</portType>	
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/imported/import2B.wsdl b/ext/soap/tests/interop/Round3/GroupD/imported/import2B.wsdl
deleted file mode 100644
index 8a397bc0bb..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/imported/import2B.wsdl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/definitions/" 
-		xmlns:wsdlns="http://soapinterop.org/definitions/" 
-		xmlns:typens="http://soapinterop.org/xsd" 
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<import location="import2B.xsd" namespace="http://soapinterop.org/xsd" />
-	<message name='Server.echoStruct'>
-    		<part name='inputStruct' type='typens:SOAPStruct'/>
-  	</message>
-  	<message name='Server.echoStructResponse'>
-    		<part name='Result' type='typens:SOAPStruct'/>
-  	</message>
-
-	<portType name="SoapInteropImport2PortType">
-		<operation name='echoStruct' parameterOrder='inputStruct'>
-    			  <input message='wsdlns:Server.echoStruct' />
-      			  <output message='wsdlns:Server.echoStructResponse' />
-		</operation>
-	</portType>	
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/imported/import2B.xsd b/ext/soap/tests/interop/Round3/GroupD/imported/import2B.xsd
deleted file mode 100644
index b35eded4f0..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/imported/import2B.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<schema targetNamespace='http://soapinterop.org/xsd'
-      xmlns='http://www.w3.org/2001/XMLSchema'      
-      elementFormDefault='unqualified'>
-      <complexType name="SOAPStruct">
-        <all>
-          <element name="varString" type="string" />
-          <element name="varInt" type="int" /> 
-          <element name="varFloat" type="float" /> 
-        </all>
-      </complexType>
-</schema>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt
deleted file mode 100644
index 4b37558d1c..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Compound1 001 (php/wsdl): echoPerson
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Person {
-    function Person($a=NULL, $i=NULL, $n=NULL, $m=NULL) {
-        $this->Age = $a;
-        $this->ID = $i;
-        $this->Name = $n;
-        $this->Male = $m;
-    }
-}
-$person = new Person(32,12345,'Shane',TRUE);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoPerson($person);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_compound1.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:x_Person Name="Shane" Male="true"><ns1:Age>32</ns1:Age><ns1:ID>12345</ns1:ID></ns1:x_Person></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:result_Person Name="Shane" Male="true"><ns1:Age>32</ns1:Age><ns1:ID>12345</ns1:ID></ns1:result_Person></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt
deleted file mode 100644
index ab9a44ad7d..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Compound1 002 (php/wsdl): echoDocument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDocument("Test Document Here");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_compound1.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:x_Document>Test Document Here</ns1:x_Document></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:result_Document>Test Document Here</ns1:result_Document></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt
deleted file mode 100644
index d8ccc8286c..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Compound1 003 (php/wsdl): echoDocument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDocument((object)array("_"=>"Test Document Here","ID"=>1));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_compound1.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:x_Document ID="1">Test Document Here</ns1:x_Document></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:result_Document ID="1">Test Document Here</ns1:result_Document></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
deleted file mode 100644
index 9aa448ce9e..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Compound2 001 (php/wsdl): echoEmployee
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Person {
-    function Person($a=NULL, $i=NULL, $n=NULL, $m=NULL) {
-        $this->Age = $a;
-        $this->ID = $i;
-        $this->Name = $n;
-        $this->Male = $m;
-    }
-}
-class Employee {
-    function Employee($person=NULL,$id=NULL,$salary=NULL) {
-        $this->person = $person;
-        $this->ID = $id;
-        $this->salary = $salary;
-    }
-}
-$person = new Person(32,12345,'Shane',TRUE);
-$employee = new Employee($person,12345,1000000.00);
-
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound2.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoEmployee($employee);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_compound2.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/person" xmlns:ns2="http://soapinterop.org/employee"><SOAP-ENV:Body><ns2:x_Employee><ns2:person><ns1:Name>Shane</ns1:Name><ns1:Male>true</ns1:Male></ns2:person><ns2:salary>1000000</ns2:salary><ns2:ID>12345</ns2:ID></ns2:x_Employee></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/person" xmlns:ns2="http://soapinterop.org/employee"><SOAP-ENV:Body><ns2:result_Employee><ns2:person><ns1:Name>Shane</ns1:Name><ns1:Male>true</ns1:Male></ns2:person><ns2:salary>1000000</ns2:salary><ns2:ID>12345</ns2:ID></ns2:result_Employee></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt
deleted file mode 100644
index ed9fb50e74..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt
deleted file mode 100644
index ec005444b7..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringArrayParam><ns1:string>one</ns1:string><ns1:string>two</ns1:string><ns1:string>three</ns1:string></ns1:echoStringArrayParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringArrayReturn><ns1:string>one</ns1:string><ns1:string>two</ns1:string><ns1:string>three</ns1:string></ns1:echoStringArrayReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt
deleted file mode 100644
index 36b26ceb3c..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStructParam><ns1:varFloat>325.325</ns1:varFloat><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString></ns1:echoStructParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStructReturn><ns1:varFloat>325.325</ns1:varFloat><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString></ns1:echoStructReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt
deleted file mode 100644
index ecd6bf01ea..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVoid();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body/></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body/></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt
deleted file mode 100644
index fa5269ad7a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit Parameters 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(array("param0"=>"Hello World"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclitparams.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoString><ns1:param0>Hello World</ns1:param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringResponse><ns1:return>Hello World</ns1:return></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt
deleted file mode 100644
index be1b51b4d7..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit Parameters 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array("param0"=>array("one","two","three")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclitparams.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringArray><ns1:param0><ns1:string>one</ns1:string><ns1:string>two</ns1:string><ns1:string>three</ns1:string></ns1:param0></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringArrayResponse><ns1:return><ns1:string>one</ns1:string><ns1:string>two</ns1:string><ns1:string>three</ns1:string></ns1:return></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt
deleted file mode 100644
index da94cedde0..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit Parameters 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct(array("param0"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclitparams.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStruct><ns1:param0><ns1:varFloat>325.325</ns1:varFloat><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString></ns1:param0></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStructResponse><ns1:return><ns1:varFloat>325.325</ns1:varFloat><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString></ns1:return></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt
deleted file mode 100644
index fcad37659a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Doc Lit Parameters 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVoid();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_doclitparams.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt
deleted file mode 100644
index 1f74fe6a4f..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD EmptySA 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_emptysa.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_emptysa.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" 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:echoString><a xsi:type="xsd:string">Hello World</a></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" 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:echoStringResponse><Result xsi:type="xsd:string">Hello World</Result></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt
deleted file mode 100644
index 8c760cc928..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Import1 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import1.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_import1.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/echoString/" 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:echoString><x xsi:type="xsd:string">Hello World</x></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/echoStringResponse/" 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:echoStringResponse><Result xsi:type="xsd:string">Hello World</Result></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt
deleted file mode 100644
index 236dd049d8..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Import2 001 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import2.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_import2.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStruct><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></inputStruct></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><Result xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></Result></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt
deleted file mode 100644
index 17650e7783..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Import3 001 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_import3.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStruct><inputStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></inputStruct></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><Result xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></Result></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
deleted file mode 100644
index f6b67f2ba7..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD Import3 002 (php/wsdl): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStructArray(array($struct,$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_import3.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns3="http://soapinterop.org/xsd2" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArray><inputArray SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns3:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></inputArray></ns1:echoStructArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop/" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns3="http://soapinterop.org/xsd2" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructArrayResponse><Result SOAP-ENC:arrayType="ns2:SOAPStruct[2]" xsi:type="ns3:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></item></Result></ns1:echoStructArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt
deleted file mode 100644
index 3bc4b4e068..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD RPC Encoded 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" 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:echoString><param0 xsi:type="xsd:string">Hello World</param0></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" 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:echoStringResponse><return xsi:type="xsd:string">Hello World</return></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt
deleted file mode 100644
index e5ca54908d..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD RPC Encoded 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringArray(array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></param0></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArrayResponse><return SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></return></ns1:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt
deleted file mode 100644
index 4f36a7ec48..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD RPC Encoded 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStruct($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStruct><param0 xsi:type="ns2:SOAPStruct"><varFloat xsi:type="xsd:float">325.325</varFloat><varInt xsi:type="xsd:int">34</varInt><varString xsi:type="xsd:string">arg</varString></param0></ns1:echoStruct></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStructResponse><return xsi:type="ns2:SOAPStruct"><varFloat xsi:type="xsd:float">325.325</varFloat><varInt xsi:type="xsd:int">34</varInt><varString xsi:type="xsd:string">arg</varString></return></ns1:echoStructResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt
deleted file mode 100644
index 32dd9d9ba0..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupD RPC Encoded 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVoid();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupD_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.inc
deleted file mode 100644
index 0525b0b51a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-    function echoPerson($person)
-    {
-        return $person;
-    }
-
-    function echoDocument($doc)
-    {
-        return $doc;
-    }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_compound1.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.wsdl
deleted file mode 100644
index 6a8f85182e..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound1.wsdl
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInteropCompound" 
-		targetNamespace="http://soapinterop.org/" 
-		xmlns:wsdlns="http://soapinterop.org/" 
-		xmlns:typens="http://soapinterop.org/xsd"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<schema targetNamespace="http://soapinterop.org/xsd" 
-		xmlns="http://www.w3.org/2001/XMLSchema" 
-		elementFormDefault="qualified"
-		>	
-			<complexType name="Person">
-				<sequence>
-					<element minOccurs="1" maxOccurs="1" name="Age" type="double"/>
-					<element minOccurs="1" maxOccurs="1" name="ID" type="xsd:float"/>					
-				</sequence>
-				<attribute name="Name" type="string"/>
-				<attribute name="Male" type="boolean"/>
-			</complexType>
-			<element name="x_Person" type="typens:Person"/>	
-			<element name="result_Person" type="typens:Person"/>
-			
-			<complexType name="Document">
-			<simpleContent>
-			 <extension base="string">
-			   <xsd:attribute name ="ID" type="string"/>
-			 </extension>
-			</simpleContent>
-			</complexType>	
-			<element name="x_Document" type="typens:Document"/>	
-			<element name="result_Document" type="typens:Document"/>	
-		</schema>
-	</types>
-	<message name="echoPerson">
-		<part name="x" element="typens:x_Person"/>
-	</message>
-	<message name="echoPersonResponse">
-		<part name="Result" element="typens:result_Person"/>
-	</message>
-	<message name="echoDocument">
-		<part name="x" element="typens:x_Document"/>
-	</message>
-	<message name="echoDocumentResponse">
-		<part name="Result" element="typens:result_Document"/>
-	</message>
-	<portType name="SoapInteropCompound1PortType">
-		<operation name="echoPerson" parameterOrder="x">
-			<input message="wsdlns:echoPerson"/>
-			<output message="wsdlns:echoPersonResponse"/>
-		</operation>
-		<operation name="echoDocument" parameterOrder="x">
-			<input message="wsdlns:echoDocument"/>
-			<output message="wsdlns:echoDocumentResponse"/>
-		</operation>
-	</portType>
-	<binding name="SoapInteropCompound1Binding" type="wsdlns:SoapInteropCompound1PortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoPerson">
-			<soap:operation soapAction="http://soapinterop/echoPerson"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="echoDocument">
-			<soap:operation soapAction="http://soapinterop/echoDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-
-	</binding>
-	<service name="Compound1">
-		<port name="SoapInteropCompound1Port" binding="wsdlns:SoapInteropCompound1Binding">
-			<soap:address location="round3_groupD_compound1.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.inc
deleted file mode 100644
index 81b96cdbff..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-    function echoEmployee($employee)
-    {
-        return $employee;
-    }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_compound2.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.wsdl
deleted file mode 100644
index e8b63e0157..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_compound2.wsdl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInteropCompound" targetNamespace="http://soapinterop.org/" 
-		xmlns:wsdlns="http://soapinterop.org/" 
-		xmlns:emp="http://soapinterop.org/employee" 
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<schema targetNamespace="http://soapinterop.org/person" 
-			xmlns="http://www.w3.org/2001/XMLSchema" 
-			elementFormDefault="qualified">
-					
-			<complexType name="Person">
-				<sequence>
-					<element minOccurs="1" maxOccurs="1" name="Name" type="string"/>
-					<element minOccurs="1" maxOccurs="1" name="Male" type="boolean"/>					
-				</sequence>
-			</complexType>
-		</schema>
-		<schema targetNamespace = "http://soapinterop.org/employee" 
-			xmlns:prs = "http://soapinterop.org/person"			 
-			xmlns="http://www.w3.org/2001/XMLSchema" 
-			elementFormDefault="qualified">
-                        <import namespace="http://soapinterop.org/person" /> 
-			<complexType name="Employee">
-				<sequence>
-					<element minOccurs="1" maxOccurs="1" name="person" type="prs:Person"/>
-					<element minOccurs="1" maxOccurs="1" name="salary" type="double"/>					
-					<element minOccurs="1" maxOccurs="1" name="ID" type="int"/>
-				</sequence>
-			</complexType>
-			<element name="x_Employee" type="emp:Employee"/>	
-			<element name="result_Employee" type="emp:Employee"/>
-		</schema>
-	</types>
-	<message name="echoEmployee">
-		<part name="x" element="emp:x_Employee"/>
-	</message>
-	<message name="echoEmployeeResponse">
-		<part name="result" element="emp:result_Employee"/>
-	</message>
-	<portType name="SoapInteropCompound2PortType">
-		<operation name="echoEmployee" parameterOrder="x">
-			<input message="wsdlns:echoEmployee"/>
-			<output message="wsdlns:echoEmployeeResponse"/>
-		</operation>
-	</portType>
-	<binding name="SoapInteropCompound2Binding" type="wsdlns:SoapInteropCompound2PortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoEmployee">
-			<soap:operation soapAction="#echoEmployee"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>		
-	</binding>
-	<service name="Compound2">
-		<port name="SoapInteropCompound2Port" binding="wsdlns:SoapInteropCompound2Binding">
-			<soap:address location="round3_groupD_compound2.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc
deleted file mode 100644
index 8ca0338f5f..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-    function echoStringArray($inputStringArray)
-    {
-      return $inputStringArray;
-    }
-
-    function echoStruct($inputStruct)
-    {
-      return $inputStruct;
-    }
-
-    function echoVoid()
-    {
-      return NULL;
-    }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclit.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.wsdl
deleted file mode 100644
index 4febca8994..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.wsdl
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-            elementFormDefault="qualified">
-            <complexType name="ArrayOfstring_literal">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
-                </sequence>
-            </complexType>
-	    <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>
-            <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
-                
-            <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
-               
-            <element name="echoStructParam" type="xsd1:SOAPStruct"/>
-                   
-            <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
-        </schema>
-    </types>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-    <message name="echoStringArray">
-        <part element="xsd1:echoStringArrayParam" name="a"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part element="xsd1:echoStringArrayReturn" name="result"/>
-    </message>
-    <message name="echoStruct">
-        <part element="xsd1:echoStructParam" name="a"/>
-    </message>
-    <message name="echoStructResponse">
-        <part element="xsd1:echoStructReturn" name="result"/>
-    </message>
-    <message name="echoVoid"/>
-    <message name="echoVoidResponse"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStringArray">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStruct">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoVoid">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoVoid">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestDocLitService">
-        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-            <soap:address 
-                location="round3_groupD_doclit.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc
deleted file mode 100644
index 2042cfc179..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoString($inputString)
-    {    	
-      return array("return"=>$inputString->param0);
-    }
-
-    function echoStringArray($inputStringArray)
-    {
-      return array("return"=>$inputStringArray->param0);
-    }
-
-    function echoStruct($inputStruct)
-    {
-      return array("return"=>$inputStruct->param0);
-    }
-
-    function echoVoid()
-    {
-      return NULL;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.wsdl
deleted file mode 100644
index 9ecf1e170b..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.wsdl
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" elementFormDefault="qualified">
-	     <complexType name="ArrayOfstring_literal">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
-                </sequence>
-            </complexType>
-	    <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>            
-
-            <element name="echoString">
-                <complexType>
-                    <sequence>
-                        <element name="param0" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoStringResponse">
-                <complexType>
-                    <sequence>
-                        <element name="return" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoStringArray">
-                <complexType>
-                    <sequence>
-                        <element name="param0" type="xsd1:ArrayOfstring_literal"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoStringArrayResponse">
-                <complexType>
-                    <sequence>
-                        <element name="return" type="xsd1:ArrayOfstring_literal"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoStruct">
-                <complexType>
-                    <sequence>
-                        <element name="param0" type="xsd1:SOAPStruct"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoStructResponse">
-                <complexType>
-                    <sequence>
-                        <element name="return" type="xsd1:SOAPStruct"/>
-                    </sequence>
-                </complexType>
-            </element>           
-            <element name="echoVoid">
-                <complexType/>
-            </element>
-            <element name="echoVoidResponse">
-                <complexType/>
-            </element>
-        </schema>
-    </types>
-    <message name="echoString">
-        <part element="xsd1:echoString" name="parameters"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringResponse" name="parameters"/>
-    </message>
-    <message name="echoStringArray">
-        <part element="xsd1:echoStringArray" name="parameters"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part element="xsd1:echoStringArrayResponse" name="parameters"/>
-    </message>
-    <message name="echoStruct">
-        <part element="xsd1:echoStruct" name="parameters"/>
-    </message>
-    <message name="echoStructResponse">
-        <part element="xsd1:echoStructResponse" name="parameters"/>
-    </message>
-    <message name="echoVoid">
-        <part element="xsd1:echoVoid" name="parameters"/>
-    </message>
-    <message name="echoVoidResponse">
-        <part element="xsd1:echoVoidResponse" name="parameters"/>
-    </message>
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStringArray">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStruct">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoVoid">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoVoid">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestDocLitService">
-        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-            <soap:address 
-                location="round3_groupD_doclitparams.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc
deleted file mode 100644
index b239c45438..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_emptysa.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.wsdl
deleted file mode 100644
index 09a09a4cd0..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.wsdl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop/" 
-		xmlns:wsdlns="http://soapinterop/" 
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types/>
-	<message name="echoStringRequest">
-		<part name="a" type="xsd:string"/>
-	</message>
-	<message name="echoStringResponse">
-		<part name="Result" type="xsd:string"/>
-	</message>
-	<portType name="SoapInteropEmptySAPortType">
-		<operation name="echoString" parameterOrder="a">
-			<input message="wsdlns:echoStringRequest"/>
-			<output message="wsdlns:echoStringResponse"/>
-		</operation>
-	</portType>
-	<binding name="SoapInteropEmptySABinding" type="wsdlns:SoapInteropEmptySAPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoString">
-			<soap:operation soapAction=""/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="EmptySA">
-		<port name="SoapInteropEmptySAPort" binding="wsdlns:SoapInteropEmptySABinding">
-			<soap:address location="round3_groupD_emptysa.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc
deleted file mode 100644
index 2e56d1897a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_import1.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.wsdl
deleted file mode 100644
index d92883000e..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.wsdl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/" 
-		xmlns:wsdlns1="http://soapinterop.org/definitions/" 
-		xmlns:wsdlns="http://soapinterop.org/"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<import location="imported/import1B.wsdl" namespace="http://soapinterop.org/definitions/" /> 
-
-	<binding name="SoapInteropImport1Binding" type="wsdlns1:SoapInteropImport1PortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoString">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/echoString/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/echoStringResponse/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Import1">
-		<port name="SoapInteropImport1Port" binding="wsdlns:SoapInteropImport1Binding">
-			<soap:address location="round3_groupD_import1.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc
deleted file mode 100644
index a0893c6b7c..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoStruct($inputStruct)
-    {
-      return $inputStruct;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_import2.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.wsdl
deleted file mode 100644
index fc0f8ae7fa..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.wsdl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/main/" 
-		xmlns:wsdlns1="http://soapinterop.org/definitions/"  
-		xmlns:wsdlns="http://soapinterop.org/main/"  
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 		
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<import location="imported/import2B.wsdl" namespace="http://soapinterop.org/definitions/" /> 
-
-	<binding name="SoapInteropImport2Binding" type="wsdlns1:SoapInteropImport2PortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoStruct">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Import2">
-		<port name="SoapInteropImport2Port" binding="wsdlns:SoapInteropImport2Binding">
-			<soap:address location="round3_groupD_import2.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl
deleted file mode 100644
index fc0f8ae7fa..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/main/" 
-		xmlns:wsdlns1="http://soapinterop.org/definitions/"  
-		xmlns:wsdlns="http://soapinterop.org/main/"  
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 		
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<import location="imported/import2B.wsdl" namespace="http://soapinterop.org/definitions/" /> 
-
-	<binding name="SoapInteropImport2Binding" type="wsdlns1:SoapInteropImport2PortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoStruct">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Import2">
-		<port name="SoapInteropImport2Port" binding="wsdlns:SoapInteropImport2Binding">
-			<soap:address location="round3_groupD_import2.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc
deleted file mode 100644
index 398f97ecf3..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoStruct($inputStruct)
-    {
-      return $inputStruct;
-    }
-
-    function echoStructArray($inputStructArray)
-    {
-      return $inputStructArray;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_import3.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.wsdl
deleted file mode 100644
index 3dd264208b..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.wsdl
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/main2/" 
-		xmlns:wsdlns="http://soapinterop.org/main2/"  
-		xmlns:impns="http://soapinterop.org/definitions/"  
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 		
-		xmlns:typens2="http://soapinterop.org/xsd2" 		
-		xmlns:typens="http://soapinterop.org/xsd"
-		xmlns="http://schemas.xmlsoap.org/wsdl/">
-	
-	<import namespace = "http://soapinterop.org/xsd" location = "round3_groupD_import2.wsdl"/>
-	<import namespace = "http://soapinterop.org/definitions/" location = "round3_groupD_import2.wsdl"/>
-	
-	<types>
-	<schema targetNamespace='http://soapinterop.org/xsd2'
-	      xmlns='http://www.w3.org/2001/XMLSchema'  
-	      xmlns:SOAP-ENC='http://schemas.xmlsoap.org/soap/encoding/'      
-	      xmlns:wsdl = "http://schemas.xmlsoap.org/wsdl/"		    
-	      elementFormDefault='unqualified'>
-	      <import namespace = "http://schemas.xmlsoap.org/soap/encoding/"/>
-	      <import namespace = "http://soapinterop.org/xsd"/>	
-	      <complexType  name ='ArrayOfSOAPStruct'>
-	        <complexContent>
-        	  <restriction base='SOAP-ENC:Array'>
-            		<attribute ref='SOAP-ENC:arrayType' wsdl:arrayType='typens:SOAPStruct[]'/>
-	          </restriction>
-        	</complexContent>
-	      </complexType>
-	</schema>
-	</types>
-
-	<message name='Server.echoStructArray'>
-    		<part name='inputArray' type='typens2:ArrayOfSOAPStruct'/>
-  	</message>
-  	<message name='Server.echoStructArrayResponse'>
-    		<part name='Result' type='typens2:ArrayOfSOAPStruct'/>
-  	</message>
-
-	<portType name="SoapInteropImport3PortType">
-		<operation name='echoStruct' parameterOrder='inputStruct'>
-    			  <input message='impns:Server.echoStruct' />
-      			  <output message='impns:Server.echoStructResponse' />
-		</operation>
-		<operation name='echoStructArray' parameterOrder='inputArray'>
-    			  <input message='wsdlns:Server.echoStructArray' />
-      			  <output message='wsdlns:Server.echoStructArrayResponse' />
-		</operation>
-	</portType>	
-
-	<binding name="SoapInteropImport3Binding" type="wsdlns:SoapInteropImport3PortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="echoStruct">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-		<operation name="echoStructArray">
-			<soap:operation soapAction="http://soapinterop.org/"/>
-			<input>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="Import3">
-		<port name="SoapInteropImport3Port" binding="wsdlns:SoapInteropImport3Binding">
-			<soap:address location="round3_groupD_import3.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc
deleted file mode 100644
index 645ab3a61c..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-class SOAP_Interop_GroupD {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-    function echoStringArray($inputStringArray)
-    {
-      return $inputStringArray;
-    }
-
-    function echoStruct($inputStruct)
-    {
-      return $inputStruct;
-    }
-
-    function echoVoid()
-    {
-      return NULL;
-    }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl");
-$server->setClass("SOAP_Interop_GroupD");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.wsdl
deleted file mode 100644
index 5e24411a37..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.wsdl
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestRpcEncService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestRpcEnc" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestRpcEnc" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd" 
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" elementFormDefault="qualified">
-            <import namespace = "http://schemas.xmlsoap.org/soap/encoding/"/>          
-            <complexType name="ArrayOfstring">
-                <complexContent>
-                    <restriction base="SOAP-ENC:Array">
-                        <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="xsd:string[]"/>
-                    </restriction>
-                </complexContent>
-            </complexType>
-            <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>           
-        </schema>
-    </types>
-
-    <message name="echoString">
-        <part name="param0" type="xsd:string"/>
-    </message>
-    <message name="echoStringResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="echoStringArray">
-        <part name="param0" type="xsd1:ArrayOfstring"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part name="return" type="xsd1:ArrayOfstring"/>
-    </message>
-    <message name="echoStruct">
-        <part name="param0" type="xsd1:SOAPStruct"/>
-    </message>
-    <message name="echoStructResponse">
-        <part name="return" type="xsd1:SOAPStruct"/>
-    </message>
-    <message name="echoVoid"/>
-    <message name="echoVoidResponse"/>
-    <portType name="WSDLInteropTestRpcEncPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestRpcEncPortBinding" 
-        type="tns:WSDLInteropTestRpcEncPortType">
-        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="echoString">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="echoStringArray">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="echoStruct">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </output>
-        </operation>        
-        <operation name="echoVoid">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="echoVoid">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestRpcEncService">
-        <port binding="tns:WSDLInteropTestRpcEncPortBinding" 
-            name="WSDLInteropTestRpcEncPort">
-            <soap:address 
-                location="round3_groupD_rpcenc.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupD/skipif.inc b/ext/soap/tests/interop/Round3/GroupD/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round3/GroupD/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt
deleted file mode 100644
index 9061da6a39..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 001 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = new SOAPList('arg1',1,NULL);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:nil="true" xsi:type="ns2:List"/></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:nil="true" xsi:type="ns2:List"/></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#5 (3) {
-  ["varInt"]=>
-  int(1)
-  ["varString"]=>
-  string(4) "arg1"
-  ["child"]=>
-  NULL
-}
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt
deleted file mode 100644
index 2b566679c0..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 002 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = new SOAPList('arg1',1, new SOAPList('arg2',2,NULL));
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#6 (3) {
-  ["varInt"]=>
-  int(1)
-  ["varString"]=>
-  string(4) "arg1"
-  ["child"]=>
-  object(stdClass)#7 (3) {
-    ["varInt"]=>
-    int(2)
-    ["varString"]=>
-    string(4) "arg2"
-    ["child"]=>
-    NULL
-  }
-}
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt
deleted file mode 100644
index cf2a9dae1b..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 003 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL)));
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
-  ["varInt"]=>
-  int(1)
-  ["varString"]=>
-  string(4) "arg1"
-  ["child"]=>
-  object(stdClass)#8 (3) {
-    ["varInt"]=>
-    int(2)
-    ["varString"]=>
-    string(4) "arg2"
-    ["child"]=>
-    object(stdClass)#9 (3) {
-      ["varInt"]=>
-      int(3)
-      ["varString"]=>
-      string(4) "arg3"
-      ["child"]=>
-      NULL
-    }
-  }
-}
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt
deleted file mode 100644
index 17dc4a3a91..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 004 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = NULL;
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:nil="true" xsi:type="ns2:List"/></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:nil="true" xsi:type="ns2:List"/></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-NULL
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
deleted file mode 100644
index e66bbb7a21..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 005 (php/wsdl): echoLinkedList (cyclic)
---SKIPIF--
-<?php require_once('skipif.inc'); die('skip cyclic stuctures are not supported yet'); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL)));
-$struct->child->child->child = $struct;
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" 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:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" 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:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
-  ["varInt"]=>
-  int(1)
-  ["varString"]=>
-  string(4) "arg1"
-  ["child"]=>
-  object(stdClass)#8 (3) {
-    ["varInt"]=>
-    int(2)
-    ["varString"]=>
-    string(4) "arg2"
-    ["child"]=>
-    object(stdClass)#9 (3) {
-      ["varInt"]=>
-      int(3)
-      ["varString"]=>
-      string(4) "arg3"
-      ["child"]=>
-      NULL
-    }
-  }
-}
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
deleted file mode 100644
index 49584874d7..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupE List 006 (php/wsdl): echoLinkedList (cyclic)
---SKIPIF--
-<?php require_once('skipif.inc'); die("skip cyclic stuctures are not supported yet"); ?>
---FILE--
-<?php
-class SOAPList {
-    function SOAPList($s, $i, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->child = $c;
-    }
-}
-$struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL)));
-$struct->child->child->child = $struct->child;
-$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoLinkedList($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupE_list.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" 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:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" 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:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
-  ["varInt"]=>
-  int(1)
-  ["varString"]=>
-  string(4) "arg1"
-  ["child"]=>
-  object(stdClass)#8 (3) {
-    ["varInt"]=>
-    int(2)
-    ["varString"]=>
-    string(4) "arg2"
-    ["child"]=>
-    object(stdClass)#9 (3) {
-      ["varInt"]=>
-      int(3)
-      ["varString"]=>
-      string(4) "arg3"
-      ["child"]=>
-      NULL
-    }
-  }
-}
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc
deleted file mode 100644
index 83454c0774..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-class SOAP_Interop_GroupE {
-
-    function echoLinkedList($inputList)
-    {
-      global $d;
-      $d = $inputList;
-      return $inputList;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupE_list.wsdl");
-$server->setClass("SOAP_Interop_GroupE");
-$server->handle();
-var_dump($d);
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.wsdl b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.wsdl
deleted file mode 100644
index 49e6a8c4c3..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.wsdl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestList" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestList" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestList" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd" 
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-           
-            <complexType name="List">
-                <all>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-		    <element name="child" type = "xsd1:List"/>
-                </all>
-            </complexType>           
-        </schema>
-    </types>
-
-    <message name="echoLinkedList">
-        <part name="param0" type="xsd1:List"/>
-    </message>
-    <message name="echoLinkedListResponse">
-        <part name="return" type="xsd1:List"/>
-    </message>
-    <portType name="WSDLInteropTestListPortType">
-        <operation name="echoLinkedList">
-            <input message="tns:echoLinkedList"/>
-            <output message="tns:echoLinkedListResponse"/>
-        </operation>        
-    </portType>
-    <binding name="WSDLInteropTestListBinding" 
-        type="tns:WSDLInteropTestListPortType">
-        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoLinkedList">
-            <soap:operation soapAction="" style="rpc"/>
-            <input>
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </input>
-            <output>
-                <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
-                    namespace="http://soapinterop.org/WSDLInteropTestRpcEnc" use="encoded"/>
-            </output>
-        </operation>
-      
-    </binding>
-    <service name="WSDLInteropTestListService">
-        <port binding="tns:WSDLInteropTestListBinding" 
-            name="WSDLInteropTestListPort">
-            <soap:address 
-                location="round3_groupE_list.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupE/skipif.inc b/ext/soap/tests/interop/Round3/GroupE/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round3/GroupE/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt
deleted file mode 100644
index ecfb3a19a3..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Extensibility 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_ext.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupF_ext.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt
deleted file mode 100644
index 05abe3b86a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Extensibility Required 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_extreq.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-//$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-//include("round3_groupF_extreq.inc");
-echo "ok\n";
-?>
---EXPECTF--
-Fatal error: SOAP-ERROR: Parsing WSDL: Unknown required WSDL extension 'http://soapinterop.org/ext' in %sr3_groupF_extreq_001w.php on line %d
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt
deleted file mode 100644
index 958bdda738..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Headers 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupF_headers.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt
deleted file mode 100644
index b60957b20e..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Headers 002 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/xsd","Header1", array("int"=>34,"string"=>"arg"));
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString",array("Hello World"),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupF_headers.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Header><ns1:Header1><ns1:string>arg</ns1:string><ns1:int>34</ns1:int></ns1:Header1></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt
deleted file mode 100644
index 1426c07e8a..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Headers 003 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/xsd","Header2", array("int"=>34,"string"=>"arg"));
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString",array("Hello World"),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupF_headers.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Header><ns1:Header2><ns1:int>34</ns1:int><ns1:string>arg</ns1:string></ns1:Header2></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt
deleted file mode 100644
index db99a7fd13..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP Interop Round3 GroupF Headers 004 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = array(
-  new SoapHeader("http://soapinterop.org/xsd","Header1", array("int"=>34,"string"=>"arg1")),
-  new SoapHeader("http://soapinterop.org/xsd","Header2", array("int"=>43,"string"=>"arg2"))
-);
-$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoString",array("Hello World"),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round3_groupF_headers.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Header><ns1:Header1><ns1:string>arg1</ns1:string><ns1:int>34</ns1:int></ns1:Header1><ns1:Header2><ns1:int>43</ns1:int><ns1:string>arg2</ns1:string></ns1:Header2></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoStringParam>Hello World</ns1:echoStringParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd"><SOAP-ENV:Body><ns1:echoStringReturn>Hello World</ns1:echoStringReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc
deleted file mode 100644
index 44bc83bdce..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class SOAP_Interop_GroupF {
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl");
-$server->setClass("SOAP_Interop_GroupF");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.wsdl b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.wsdl
deleted file mode 100644
index 74ec018051..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.wsdl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ext="http://soapinterop.org/ext">
-    	<ext:types/> 
-
-	<types>
-	<ext:schema targetNamespace="http://soapinterop.org/xsd"/>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">           
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>            
-        </schema>
-    </types>
-    <ext:message name="echoString"/>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-
-    <ext:portType name="WSDLInteropTestDocLitPortType"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-    </portType>
-    <ext:binding name="WSDLInteropTestDocLitPortBinding"/>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-	<ext:binding style ="chunked"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-	    <ext:operation style ="chunked"/>
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-		<ext:body use ="direct"/>
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-		<ext:body use ="direct"/>
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <ext:service name="WSDLInteropTestDocLitService"/>
-    <service name="WSDLInteropTestDocLitService">
-        <ext:port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort"/>
-	<port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-	    <ext:address location=""/>
-            <soap:address 
-                location="round3_groupF_ext.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_extreq.wsdl b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_extreq.wsdl
deleted file mode 100644
index 8dfd65ec98..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_extreq.wsdl
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ext="http://soapinterop.org/ext">
-    	<ext:types/> 
-
-	<types>
-	<ext:schema targetNamespace="http://soapinterop.org/xsd"/>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">           
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>            
-        </schema>
-    </types>
-    <ext:message name="echoString"/>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-
-    <ext:portType name="WSDLInteropTestDocLitPortType"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-    </portType>
-    <ext:binding name="WSDLInteropTestDocLitPortBinding"/>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-	<ext:binding style ="chunked" wsdl:required="true"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-	    <ext:operation style ="chunked"/>
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-		<ext:body use ="direct"/>
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-		<ext:body use ="direct"/>
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <ext:service name="WSDLInteropTestDocLitService"/>
-    <service name="WSDLInteropTestDocLitService">
-        <ext:port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort"/>
-	<port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-	    <ext:address location=""/>
-            <soap:address 
-                location="round3_groupF_extreq.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc
deleted file mode 100644
index ee65811197..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class SOAP_Interop_GroupF {
-
-    function Header1($input)
-    {
-    }
-
-    function Header2($input)
-    {
-    }
-
-    function echoString($inputString)
-    {
-      return $inputString;
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl");
-$server->setClass("SOAP_Interop_GroupF");
-$server->handle();
-?>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.wsdl b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.wsdl
deleted file mode 100644
index d03fc32e39..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.wsdl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-	     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-             xmlns:s="http://www.w3.org/2001/XMLSchema" 
-             xmlns:tns="http://soapinterop.org/"
-	     xmlns:types="http://soapinterop.org/xsd" 
-             targetNamespace="http://soapinterop.org/" 
-	     xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/xsd">
-      <s:element name="echoStringParam" type="s:string"/>
-         
-      <s:element name="echoStringReturn" type="s:string"/>
-
-      <s:element name="Header1" type="types:Header1" />
-      <s:complexType name="Header1">
-        <s:sequence>
-          <s:element name="string" type="s:string" />
-          <s:element name="int" type="s:int" />
-        </s:sequence>
-	<s:anyAttribute />
-      </s:complexType>
-      <s:element name="Header2" type="types:Header2" />
-      <s:complexType name="Header2">
-        <s:sequence>
-          <s:element name="int" type="s:int" />
-          <s:element name="string" type="s:string" />
-        </s:sequence>
-	<s:anyAttribute />
-      </s:complexType>
-    </s:schema>
-  </types>
-  <message name="echoString">
-        <part element="types:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="types:echoStringReturn" name="result"/>
-    </message>
-  <message name="Header1">
-    <part name="Header1" element="types:Header1" />
-  </message>
-  <message name="Header2">
-    <part name="Header2" element="types:Header2" />
-  </message>
-  <portType name="RetHeaderPortType">
-    <operation name="echoString">
-      <input message="tns:echoString" />
-      <output message="tns:echoStringResponse" />
-    </operation>
-  </portType>
-  <binding name = "RetHeaderBinding" type="tns:RetHeaderPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://soapinterop.org/" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header message="tns:Header1" part="Header1" use="literal"/>
-        <soap:header message="tns:Header2" part="Header2" use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <service name="RetHeaderService">
-    <port name="RetHeaderPort" binding="tns:RetHeaderBinding">
-      <soap:address location="round3_groupF_headers.inc"/>
-		</port>
-	</service>
-</definitions>
diff --git a/ext/soap/tests/interop/Round3/GroupF/skipif.inc b/ext/soap/tests/interop/Round3/GroupF/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round3/GroupF/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.inc b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.inc
deleted file mode 100644
index c2a27186d7..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-class SOAP_Interop_GroupG {
-
-  function EchoBase64AsAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsBase64($in) {
-    return $in;
-  }
-
-  function EchoAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachments($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsString($in) {
-    return $in;
-  }
-
-  function EchoUnrefAttachments($in) {
-    return $in;
-  }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupG_dimedoc.wsdl");
-$server->setClass("SOAP_Interop_GroupG");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.wsdl
deleted file mode 100644
index f82216e6fe..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimedoc.wsdl
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions name="SOAPBuilders" xmlns="http://soapinterop.org/attachments/wsdl" xmlns:types="http://soapinterop.org/attachments/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:dime="http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/" xmlns:content="http://schemas.xmlsoap.org/ws/2002/04/content-type/" xmlns:ref="http://schemas.xmlsoap.org/ws/2002/04/reference/" targetNamespace="http://soapinterop.org/attachments/wsdl">
-	<wsdl:types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/attachments/xsd" elementFormDefault="qualified" attributeFormDefault="qualified">
-			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/reference/"/>
-			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/content-type/"/>
-			<complexType name="ReferencedBinary">
-				<simpleContent>
-					<restriction base="xsd:base64Binary">
-						<annotation>
-							<appinfo>
-								<content:mediaType value="application/octetstream"/>
-							</appinfo>
-						</annotation>
-						<attribute ref="ref:location" use="optional"/>
-					</restriction>
-				</simpleContent>
-			</complexType>
-			<complexType name="ReferencedText">
-				<simpleContent>
-					<restriction base="xsd:base64Binary">
-						<annotation>
-							<appinfo>
-								<content:mediaType value="text/plain"/>
-							</appinfo>
-						</annotation>
-						<attribute ref="ref:location" use="optional"/>
-					</restriction>
-				</simpleContent>
-			</complexType>
-			<element name="EchoAttachment" type="types:EchoAttachment"/>
-			<element name="EchoAttachmentResponse" type="types:EchoAttachmentResponse"/>
-			<complexType name="EchoAttachment">
-				<sequence>
-					<element name="In" type="types:ReferencedBinary"/>
-				</sequence>
-			</complexType>
-			<complexType name="EchoAttachmentResponse">
-				<sequence>
-					<element name="Out" type="types:ReferencedBinary"/>
-				</sequence>
-			</complexType>
-			<element name="EchoAttachments" type="types:Attachments"/>
-			<element name="EchoAttachmentsResponse" type="types:Attachments"/>
-			<complexType name="Attachments">
-				<sequence>
-					<element name="Item" minOccurs="0" maxOccurs="unbounded" type="types:ReferencedBinary"/>
-				</sequence>
-			</complexType>
-			<element name="EchoAttachmentAsBase64" type="types:EchoAttachment"/>
-			<element name="EchoAttachmentAsBase64Response" type="types:base64Out"/>
-			<element name="EchoBase64AsAttachment" type="types:base64In"/>
-			<element name="EchoBase64AsAttachmentResponse" type="types:EchoAttachmentResponse"/>
-			<complexType name="base64In">
-				<sequence>
-					<element name="In" type="xsd:base64Binary"/>
-				</sequence>
-			</complexType>
-			<complexType name="base64Out">
-				<sequence>
-					<element name="Out" type="xsd:base64Binary"/>
-				</sequence>
-			</complexType>
-			<element name="EchoUnrefAttachments" type="types:emptyType"/>
-			<element name="EchoUnrefAttachmentsResponse" type="types:emptyType"/>
-			<complexType name="emptyType">
-				<sequence/>
-			</complexType>
-			<element name="EchoAttachmentAsString" type="types:EchoAttachmentAsString"/>
-			<element name="EchoAttachmentAsStringResponse" type="types:EchoAttachmentAsStringResponse"/>
-			<complexType name="EchoAttachmentAsString">
-				<sequence>
-					<element name="In" type="types:ReferencedText"/>
-				</sequence>
-			</complexType>
-			<complexType name="EchoAttachmentAsStringResponse">
-				<sequence>
-					<element name="Out" type="xsd:string"/>
-				</sequence>
-			</complexType>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="EchoAttachmentIn">
-		<wsdl:part name="In" element="types:EchoAttachment"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentOut">
-		<wsdl:part name="Out" element="types:EchoAttachmentResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsIn">
-		<wsdl:part name="In" element="types:EchoAttachments"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsOut">
-		<wsdl:part name="Out" element="types:EchoAttachmentsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64In">
-		<wsdl:part name="In" element="types:EchoAttachmentAsBase64"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64Out">
-		<wsdl:part name="Out" element="types:EchoAttachmentAsBase64Response"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentIn">
-		<wsdl:part name="In" element="types:EchoBase64AsAttachment"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentOut">
-		<wsdl:part name="Out" element="types:EchoBase64AsAttachmentResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoUnrefAttachmentsIn">
-		<wsdl:part name="In" element="types:EchoUnrefAttachments"/>
-	</wsdl:message>
-	<wsdl:message name="EchoUnrefAttachmentsOut">
-		<wsdl:part name="Out" element="types:EchoUnrefAttachmentsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsStringIn">
-		<wsdl:part name="In" element="types:EchoAttachmentAsString"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsStringOut">
-		<wsdl:part name="Out" element="types:EchoAttachmentAsStringResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="AttachmentsPortType">
-		<wsdl:operation name="EchoAttachment">
-			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
-			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
-			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
-			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
-			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoUnrefAttachments">
-			<wsdl:input name="EchoUnrefAttachmentsInput" message="EchoUnrefAttachmentsIn"/>
-			<wsdl:output name="EchoUnrefAttachmentsOutput" message="EchoUnrefAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsString">
-			<wsdl:input name="EchoAttachmentAsStringInput" message="EchoAttachmentAsStringIn"/>
-			<wsdl:output name="EchoAttachmentAsStringOutput" message="EchoAttachmentAsStringOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="EchoAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentsInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentsOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsBase64Input">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsBase64Output">
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoBase64AsAttachmentInput">
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoBase64AsAttachmentOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoUnrefAttachments">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoUnrefAttachmentsInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoUnrefAttachmentsOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsString">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsStringInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsStringOutput">
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-  <wsdl:service name="Round4DIMEDOC">
-    <wsdl:port name="Round4DIMEDOCTestSoap" binding="AttachmentsBinding">
-      <soap:address location="test://" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.inc b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.inc
deleted file mode 100644
index 2f3c00aa1c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-class SOAP_Interop_GroupG {
-
-  function EchoBase64AsAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsBase64($in) {
-    return $in;
-  }
-
-  function EchoAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachments($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsString($in) {
-    return $in;
-  }
-
-  function EchoUnrefAttachments($in) {
-    return $in;
-  }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupG_dimerpc.wsdl");
-$server->setClass("SOAP_Interop_GroupG");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.wsdl
deleted file mode 100644
index d837da0c62..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_dimerpc.wsdl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions name="SOAPBuilders" xmlns="http://soapinterop.org/attachments/wsdl" xmlns:types="http://soapinterop.org/attachments/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:dime="http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/" xmlns:content="http://schemas.xmlsoap.org/ws/2002/04/content-type/" targetNamespace="http://soapinterop.org/attachments/wsdl">
-	<wsdl:types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/attachments/xsd">
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/" location="http://schemas.xmlsoap.org/soap/encoding/" />
-			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/content-type/"/>
-			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/reference/"/>
-			<complexType name="ReferencedBinary">
-				<simpleContent>
-					<restriction base="soap-enc:base64Binary">
-						<annotation>
-							<appinfo>
-								<content:mediaType value="application/octetstream"/>
-							</appinfo>
-						</annotation>
-						<attributeGroup ref="soap-enc:commonAttributes"/>
-					</restriction>
-				</simpleContent>
-			</complexType>
-			<complexType name="ArrayOfBinary">
-				<complexContent>
-					<restriction base="soap-enc:Array">
-						<attribute ref="soap-enc:arrayType" wsdl:arrayType="types:ReferencedBinary[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ReferencedText">
-				<simpleContent>
-					<restriction base="soap-enc:base64Binary">
-						<annotation>
-							<appinfo>
-								<content:mediaType value="text/plain"/>
-							</appinfo>
-						</annotation>
-						<attributeGroup ref="soap-enc:commonAttributes"/>
-					</restriction>
-				</simpleContent>
-			</complexType>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="EchoAttachmentIn">
-		<wsdl:part name="In" type="types:ReferencedBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentOut">
-		<wsdl:part name="Out" type="types:ReferencedBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsIn">
-		<wsdl:part name="In" type="types:ArrayOfBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsOut">
-		<wsdl:part name="Out" type="types:ArrayOfBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64In">
-		<wsdl:part name="In" type="types:ReferencedBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64Out">
-		<wsdl:part name="Out" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentIn">
-		<wsdl:part name="In" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentOut">
-		<wsdl:part name="Out" type="types:ReferencedBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoUnrefAttachmentsIn" />
-	<wsdl:message name="EchoUnrefAttachmentsOut" />
-	<wsdl:message name="EchoAttachmentAsStringIn">
-		<wsdl:part name="In" type="types:ReferencedText"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsStringOut">
-		<wsdl:part name="Out" type="xsd:string"/>
-	</wsdl:message>
-	
-	<wsdl:portType name="AttachmentsPortType">
-		<wsdl:operation name="EchoAttachment">
-			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
-			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
-			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
-			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
-			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoUnrefAttachments">
-			<wsdl:input name="EchoUnrefAttachmentsInput" message="EchoUnrefAttachmentsIn"/>
-			<wsdl:output name="EchoUnrefAttachmentsOutput" message="EchoUnrefAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsString">
-			<wsdl:input  name="EchoAttachmentAsStringInput"  message="EchoAttachmentAsStringIn"/>
-			<wsdl:output name="EchoAttachmentAsStringOutput" message="EchoAttachmentAsStringOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="EchoAttachment">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentsInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentsOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsBase64Input">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsBase64Output">
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoBase64AsAttachmentInput">
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoBase64AsAttachmentOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoUnrefAttachments">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoUnrefAttachmentsInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoUnrefAttachmentsOutput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsString">
-			<soap:operation style="rpc" soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsStringInput">
-				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsStringOutput">
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-  <wsdl:service name="Round4DIMERPC">
-    <wsdl:port name="Round4DIMERPCTestSoap" binding="AttachmentsBinding">
-      <soap:address location="test://" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.inc b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.inc
deleted file mode 100644
index 8ed272ed1d..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-class SOAP_Interop_GroupG {
-
-  function EchoBase64AsAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsBase64($in) {
-    return $in;
-  }
-
-  function EchoAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachments($in) {
-    return $in;
-  }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupG_dimedoc.wsdl");
-$server->setClass("SOAP_Interop_GroupG");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl
deleted file mode 100644
index c67172e8c6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions name="SOAPBuilders" 
-    xmlns="http://soapinterop.org/attachments/wsdl" 
-    xmlns:types="http://soapinterop.org/attachments/xsd" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-    xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" 
-    targetNamespace="http://soapinterop.org/attachments/wsdl">
-	<wsdl:types>
-		<schema 
-			xmlns="http://www.w3.org/2001/XMLSchema" 
-			targetNamespace="http://soapinterop.org/attachments/xsd" 
-			elementFormDefault="qualified"
-			attributeFormDefault="qualified">
-		
-		<complexType name="binary">
-			<simpleContent>
-				<extension base="xsd:base64Binary">
-					<attribute name="href" type="xsd:anyURI"/>
-				</extension>
-			</simpleContent>
-		</complexType >
-		
-		<element name="EchoAttachment" type="types:EchoAttachment"/>
-		<element name="EchoAttachmentResponse" type="types:EchoAttachmentResponse"/>
-		<complexType name="EchoAttachment">
-			<sequence>
-				<element name="In" type="types:binary"/>
-			</sequence>
-		</complexType>
-		<complexType name="EchoAttachmentResponse">
-			<sequence>
-				<element name="Out" type="types:binary"/>
-			</sequence>
-		</complexType>
-		
-		<element name="EchoAttachments" type="types:Attachments"/>
-		<element name="EchoAttachmentsResponse" type="types:Attachments"/>
-		<complexType name="Attachments">
-			<sequence>
-				<element name="Item" minOccurs="0" maxOccurs="unbounded" type="types:binary">
-				</element>
-			</sequence>
-		</complexType>
-		
-		<element name="EchoAttachmentAsBase64" type="types:EchoAttachment"/>
-		<element name="EchoAttachmentAsBase64Response" type="types:EchoAttachmentResponse"/>
-		
-		<element name="EchoBase64AsAttachment" type="types:EchoAttachment"/>
-		<element name="EchoBase64AsAttachmentResponse" type="types:EchoAttachmentResponse"/>
-		</schema>
-	</wsdl:types>
-	
-	<wsdl:message name="EchoAttachmentIn">
-		<wsdl:part name="In" element="types:EchoAttachment"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentOut">
-		<wsdl:part name="Out" element="types:EchoAttachmentResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsIn">
-		<wsdl:part name="In" element="types:EchoAttachments"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsOut">
-		<wsdl:part name="Out" element="types:EchoAttachmentsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64In">
-		<wsdl:part name="In" element="types:EchoAttachmentAsBase64"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64Out">
-		<wsdl:part name="Out" element="types:EchoAttachmentAsBase64Response"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentIn">
-		<wsdl:part name="In" element="types:EchoBase64AsAttachment"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentOut">
-		<wsdl:part name="Out" element="types:EchoBase64AsAttachmentResponse"/>
-	</wsdl:message>
-	
-	<wsdl:portType name="AttachmentsPortType">
-		<wsdl:operation name="EchoAttachment">
-			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
-			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
-			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
-			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
-			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="EchoAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentInput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal" />
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentsInput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentsOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsBase64Input">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsBase64Output">
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoBase64AsAttachmentInput">
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="EchoBase64AsAttachmentOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="literal"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-  <wsdl:service name="Round4MIMEDOC">
-    <wsdl:port name="Round4MIMEDOCTestSoap" binding="AttachmentsBinding">
-      <soap:address location="test://" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>	
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.inc b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.inc
deleted file mode 100644
index 8ed272ed1d..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-class SOAP_Interop_GroupG {
-
-  function EchoBase64AsAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachmentAsBase64($in) {
-    return $in;
-  }
-
-  function EchoAttachment($in) {
-    return $in;
-  }
-
-  function EchoAttachments($in) {
-    return $in;
-  }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupG_dimedoc.wsdl");
-$server->setClass("SOAP_Interop_GroupG");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl
deleted file mode 100644
index 30a56d12f6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions name="SOAPBuilders" 
-    xmlns="http://soapinterop.org/attachments/wsdl" 
-    xmlns:types="http://soapinterop.org/attachments/xsd" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-    xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" 
-    targetNamespace="http://soapinterop.org/attachments/wsdl">
-	<wsdl:types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/attachments/xsd">
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-			<complexType name="ArrayOfBinary">
-				<complexContent>
-					<restriction base="soap-enc:Array">
-						<attribute ref="soap-enc:arrayType" wsdl:arrayType="soap-enc:base64Binary[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="EchoAttachmentIn">
-		<wsdl:part name="In" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentOut">
-		<wsdl:part name="Out" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsIn">
-		<wsdl:part name="In" type="types:ArrayOfBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentsOut">
-		<wsdl:part name="Out" type="types:ArrayOfBinary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64In">
-		<wsdl:part name="In" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoAttachmentAsBase64Out">
-		<wsdl:part name="Out" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentIn">
-		<wsdl:part name="In" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:message name="EchoBase64AsAttachmentOut">
-		<wsdl:part name="Out" type="xsd:base64Binary"/>
-	</wsdl:message>
-	<wsdl:portType name="AttachmentsPortType">
-		<wsdl:operation name="EchoAttachment">
-			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
-			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
-			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
-			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
-			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="EchoAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentInput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachments">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentsInput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentsOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoAttachmentAsBase64">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoAttachmentAsBase64Input">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="In" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-			<wsdl:output name="EchoAttachmentAsBase64Output">
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="EchoBase64AsAttachment">
-			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
-			<wsdl:input name="EchoBase64AsAttachmentInput">
-				<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</wsdl:input>
-			<wsdl:output name="EchoBase64AsAttachmentOutput">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-					</mime:part>
-					<mime:part>
-						<mime:content part="Out" type="application/octetstream"/>
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-  <wsdl:service name="Round4MIMERPC">
-    <wsdl:port name="Round4MIMERPCTestSoap" binding="AttachmentsBinding">
-      <soap:address location="test://" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/ext/soap/tests/interop/Round4/GroupG/skipif.inc b/ext/soap/tests/interop/Round4/GroupG/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupG/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt
deleted file mode 100644
index 24f421277c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 001 (php/wsdl): echoSOAPStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoSOAPStructFault($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns2:echoSOAPStructFaultRequest><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns2:echoSOAPStructFaultRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoSOAPStructFault'.</faultstring><detail><ns2:SOAPStructFaultPart><ns1:soapStruct><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns1:soapStruct></ns2:SOAPStructFaultPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt
deleted file mode 100644
index acfcd15126..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 002 (php/wsdl): echoBaseStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$struct = new BaseStruct(new SOAPStruct("a1",11,12.345),11);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBaseStructFault($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns2:echoBaseStructFaultRequest><ns1:structMessage><ns1:varString>a1</ns1:varString><ns1:varInt>11</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns1:structMessage><ns1:shortMessage>11</ns1:shortMessage></ns2:echoBaseStructFaultRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoBaseStructFault'.</faultstring><detail><ns2:BaseStructPart><ns1:structMessage><ns1:varString>a1</ns1:varString><ns1:varInt>11</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns1:structMessage><ns1:shortMessage>11</ns1:shortMessage></ns2:BaseStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt
deleted file mode 100644
index 4def17b3e4..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 003 (php/wsdl): echoExtendedStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-$struct = new ExtendedStruct(new SOAPStruct("a1",11,12.345),12,"arg",-3,5);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoExtendedStructFault($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns2:echoExtendedStructFaultRequest><ns1:structMessage><ns1:varString>a1</ns1:varString><ns1:varInt>11</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns1:structMessage><ns1:shortMessage>12</ns1:shortMessage><ns1:stringMessage>arg</ns1:stringMessage><ns1:intMessage>-3</ns1:intMessage><ns1:anotherIntMessage>5</ns1:anotherIntMessage></ns2:echoExtendedStructFaultRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoExtendedStructFault'.</faultstring><detail><ns2:ExtendedStructPart><ns1:structMessage><ns1:varString>a1</ns1:varString><ns1:varInt>11</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns1:structMessage><ns1:shortMessage>12</ns1:shortMessage><ns1:stringMessage>arg</ns1:stringMessage><ns1:intMessage>-3</ns1:intMessage><ns1:anotherIntMessage>5</ns1:anotherIntMessage></ns2:ExtendedStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt
deleted file mode 100644
index 3ff805d0ae..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg1',34,325.325);
-$s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 1,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>1</ns1:whichFault><ns1:param1><ns2:varString>arg1</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>arg2</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns2:structMessage><ns2:shortMessage>12</ns2:shortMessage></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:SOAPStructFaultPart><ns1:soapStruct><ns1:varString>arg1</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns1:soapStruct></ns2:SOAPStructFaultPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt
deleted file mode 100644
index 024918dd3b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg1',34,325.325);
-$s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 2,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>2</ns1:whichFault><ns1:param1><ns2:varString>arg1</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>arg2</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns2:structMessage><ns2:shortMessage>12</ns2:shortMessage></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:BaseStructPart><ns1:structMessage><ns1:varString>arg2</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns1:structMessage><ns1:shortMessage>12</ns1:shortMessage></ns2:BaseStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt
deleted file mode 100644
index de0f337a52..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg1',34,325.325);
-$s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 3,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>3</ns1:whichFault><ns1:param1><ns2:varString>arg1</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>arg2</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>325.325</ns2:varFloat></ns2:structMessage><ns2:shortMessage>12</ns2:shortMessage></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:SOAPStructFaultPart><ns1:soapStruct><ns1:varString>arg1</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns1:soapStruct></ns2:SOAPStructFaultPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt
deleted file mode 100644
index 98487ec022..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 007 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1);
-$s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 1,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2,
-                                   "param3"     => $s3));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>1</ns1:whichFault><ns1:param1><ns2:structMessage><ns2:varString>s1</ns2:varString><ns2:varInt>1</ns2:varInt><ns2:varFloat>1.1</ns2:varFloat></ns2:structMessage><ns2:shortMessage>1</ns2:shortMessage></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>s2</ns2:varString><ns2:varInt>2</ns2:varInt><ns2:varFloat>2.2</ns2:varFloat></ns2:structMessage><ns2:shortMessage>2</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage></ns1:param2><ns1:param3><ns2:structMessage><ns2:varString>s3</ns2:varString><ns2:varInt>3</ns2:varInt><ns2:varFloat>3.3</ns2:varFloat></ns2:structMessage><ns2:shortMessage>3</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage><ns2:booleanMessage>true</ns2:booleanMessage></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:BaseStructPart><ns1:structMessage><ns1:varString>s1</ns1:varString><ns1:varInt>1</ns1:varInt><ns1:varFloat>1.1</ns1:varFloat></ns1:structMessage><ns1:shortMessage>1</ns1:shortMessage></ns2:BaseStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt
deleted file mode 100644
index d1e15b27a3..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 008 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1);
-$s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 2,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2,
-                                   "param3"     => $s3));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>2</ns1:whichFault><ns1:param1><ns2:structMessage><ns2:varString>s1</ns2:varString><ns2:varInt>1</ns2:varInt><ns2:varFloat>1.1</ns2:varFloat></ns2:structMessage><ns2:shortMessage>1</ns2:shortMessage></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>s2</ns2:varString><ns2:varInt>2</ns2:varInt><ns2:varFloat>2.2</ns2:varFloat></ns2:structMessage><ns2:shortMessage>2</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage></ns1:param2><ns1:param3><ns2:structMessage><ns2:varString>s3</ns2:varString><ns2:varInt>3</ns2:varInt><ns2:varFloat>3.3</ns2:varFloat></ns2:structMessage><ns2:shortMessage>3</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage><ns2:booleanMessage>true</ns2:booleanMessage></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:ExtendedStructPart><ns1:structMessage><ns1:varString>s2</ns1:varString><ns1:varInt>2</ns1:varInt><ns1:varFloat>2.2</ns1:varFloat></ns1:structMessage><ns1:shortMessage>2</ns1:shortMessage><ns1:stringMessage>arg</ns1:stringMessage><ns1:intMessage>-3</ns1:intMessage><ns1:anotherIntMessage>5</ns1:anotherIntMessage></ns2:ExtendedStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt
deleted file mode 100644
index 1fc6dd141e..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 009 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1);
-$s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 3,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2,
-                                   "param3"     => $s3));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>3</ns1:whichFault><ns1:param1><ns2:structMessage><ns2:varString>s1</ns2:varString><ns2:varInt>1</ns2:varInt><ns2:varFloat>1.1</ns2:varFloat></ns2:structMessage><ns2:shortMessage>1</ns2:shortMessage></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>s2</ns2:varString><ns2:varInt>2</ns2:varInt><ns2:varFloat>2.2</ns2:varFloat></ns2:structMessage><ns2:shortMessage>2</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage></ns1:param2><ns1:param3><ns2:structMessage><ns2:varString>s3</ns2:varString><ns2:varInt>3</ns2:varInt><ns2:varFloat>3.3</ns2:varFloat></ns2:structMessage><ns2:shortMessage>3</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage><ns2:booleanMessage>true</ns2:booleanMessage></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:MoreExtendedStructPart><ns1:structMessage><ns1:varString>s3</ns1:varString><ns1:varInt>3</ns1:varInt><ns1:varFloat>3.3</ns1:varFloat></ns1:structMessage><ns1:shortMessage>3</ns1:shortMessage><ns1:stringMessage>arg</ns1:stringMessage><ns1:intMessage>-3</ns1:intMessage><ns1:anotherIntMessage>5</ns1:anotherIntMessage><ns1:booleanMessage>true</ns1:booleanMessage></ns2:MoreExtendedStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt
deleted file mode 100644
index 2f00d037bb..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex Doc Lit 010 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->structMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1);
-$s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 4,
-                                   "param1"     => $s1,
-                                   "param2"     => $s2,
-                                   "param3"     => $s3));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>4</ns1:whichFault><ns1:param1><ns2:structMessage><ns2:varString>s1</ns2:varString><ns2:varInt>1</ns2:varInt><ns2:varFloat>1.1</ns2:varFloat></ns2:structMessage><ns2:shortMessage>1</ns2:shortMessage></ns1:param1><ns1:param2><ns2:structMessage><ns2:varString>s2</ns2:varString><ns2:varInt>2</ns2:varInt><ns2:varFloat>2.2</ns2:varFloat></ns2:structMessage><ns2:shortMessage>2</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage></ns1:param2><ns1:param3><ns2:structMessage><ns2:varString>s3</ns2:varString><ns2:varInt>3</ns2:varInt><ns2:varFloat>3.3</ns2:varFloat></ns2:structMessage><ns2:shortMessage>3</ns2:shortMessage><ns2:stringMessage>arg</ns2:stringMessage><ns2:intMessage>-3</ns2:intMessage><ns2:anotherIntMessage>5</ns2:anotherIntMessage><ns2:booleanMessage>true</ns2:booleanMessage></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:BaseStructPart><ns1:structMessage><ns1:varString>s1</ns1:varString><ns1:varInt>1</ns1:varInt><ns1:varFloat>1.1</ns1:varFloat></ns1:structMessage><ns1:shortMessage>1</ns1:shortMessage></ns2:BaseStructPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt
deleted file mode 100644
index c02f722331..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 001 (php/wsdl): echoSOAPStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPStruct('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoSOAPStructFault(array("soapStruct"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoSOAPStructFault><param xsi:type="ns2:SOAPStructFault"><soapStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></soapStruct></param></ns1:echoSOAPStructFault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoSOAPStructFault'.</faultstring><detail><ns2:part1 xsi:type="ns1:SOAPStructFault"><soapStruct xsi:type="ns1:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></soapStruct></ns2:part1></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt
deleted file mode 100644
index ab200670df..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 002 (php/wsdl): echoBaseStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$struct = new BaseStruct(12.345,12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBaseStructFault($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoBaseStructFault><param xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></param></ns1:echoBaseStructFault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoBaseStructFault'.</faultstring><detail><ns2:part2 xsi:type="ns1:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></ns2:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt
deleted file mode 100644
index 27f6a794a0..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 003 (php/wsdl): echoExtendedStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-$struct = new ExtendedStruct(12.345,12,"arg",-3,5);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoExtendedStructFault($struct);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoExtendedStructFault><param xsi:type="ns2:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></param></ns1:echoExtendedStructFault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoExtendedStructFault'.</faultstring><detail><ns2:part3 xsi:type="ns1:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></ns2:part3></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt
deleted file mode 100644
index 57c72bf652..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg',34,325.325);
-$s2 = new BaseStruct(12.345,12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(1,$s1,$s2);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></param1><param2 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part1 xsi:type="ns1:SOAPStructFault"><soapStruct xsi:type="ns1:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></soapStruct></ns2:part1></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt
deleted file mode 100644
index 9a31ca6b5d..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg',34,325.325);
-$s2 = new BaseStruct(12.345,12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(2,$s1,$s2);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></param1><param2 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part2 xsi:type="ns1:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></ns2:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt
deleted file mode 100644
index 7d6ccba81b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPStruct {
-    function SOAPStruct($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-$s1 = new SOAPStruct('arg',34,325.325);
-$s2 = new BaseStruct(12.345,12);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(3,$s1,$s2);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></param1><param2 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">12</shortMessage></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part1 xsi:type="ns1:SOAPStructFault"><soapStruct xsi:type="ns1:SOAPStruct"><varString xsi:type="xsd:string">arg</varString><varInt xsi:type="xsd:int">34</varInt><varFloat xsi:type="xsd:float">325.325</varFloat></soapStruct></ns2:part1></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt
deleted file mode 100644
index 8827731064..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 007 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(12.345,1);
-$s2 = new ExtendedStruct(12.345,2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(1,$s1,$s2,$s3);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></param1><param2 xsi:type="ns2:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">2</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></param2><param3 xsi:type="ns2:MoreExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">3</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage><booleanMessage xsi:type="xsd:boolean">true</booleanMessage></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:part2 xsi:type="ns1:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></ns2:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt
deleted file mode 100644
index 9f0069adb2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 008 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(12.345,1);
-$s2 = new ExtendedStruct(12.345,2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(2,$s1,$s2,$s3);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></param1><param2 xsi:type="ns2:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">2</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></param2><param3 xsi:type="ns2:MoreExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">3</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage><booleanMessage xsi:type="xsd:boolean">true</booleanMessage></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:part3 xsi:type="ns1:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">2</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></ns2:part3></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt
deleted file mode 100644
index 6971cd9e1e..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 009 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(12.345,1);
-$s2 = new ExtendedStruct(12.345,2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(3,$s1,$s2,$s3);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></param1><param2 xsi:type="ns2:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">2</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></param2><param3 xsi:type="ns2:MoreExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">3</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage><booleanMessage xsi:type="xsd:boolean">true</booleanMessage></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:part4 xsi:type="ns1:MoreExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">3</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage><booleanMessage xsi:type="xsd:boolean">true</booleanMessage></ns2:part4></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt
deleted file mode 100644
index c90d332aa0..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Complex RPC Enc 010 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class BaseStruct {
-    function BaseStruct($f, $s) {
-        $this->floatMessage = $f;
-        $this->shortMessage = $s;
-    }
-}
-class ExtendedStruct extends BaseStruct {
-    function ExtendedStruct($f, $s, $x1, $x2, $x3) {
-        $this->BaseStruct($f,$s);
-        $this->stringMessage = $x1;
-        $this->intMessage = $x2;
-        $this->anotherIntMessage = $x3;
-    }
-}
-class MoreExtendedStruct extends ExtendedStruct {
-    function MoreExtendedStruct($f, $s, $x1, $x2, $x3, $b) {
-        $this->ExtendedStruct($f, $s, $x1, $x2, $x3);
-        $this->booleanMessage = $b;
-    }
-}
-$s1 = new BaseStruct(12.345,1);
-$s2 = new ExtendedStruct(12.345,2,"arg",-3,5);
-$s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(4,$s1,$s2,$s3);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_complex_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">4</whichFault><param1 xsi:type="ns2:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></param1><param2 xsi:type="ns2:ExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">2</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage></param2><param3 xsi:type="ns2:MoreExtendedStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">3</shortMessage><stringMessage xsi:type="xsd:string">arg</stringMessage><intMessage xsi:type="xsd:int">-3</intMessage><anotherIntMessage xsi:type="xsd:int">5</anotherIntMessage><booleanMessage xsi:type="xsd:boolean">true</booleanMessage></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:part2 xsi:type="ns1:BaseStruct"><floatMessage xsi:type="xsd:float">12.345</floatMessage><shortMessage xsi:type="xsd:short">1</shortMessage></ns2:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt
deleted file mode 100644
index 49bbce814a..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 001 (php/wsdl): echoEmptyFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoEmptyFault();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoEmptyFaultRequest/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoEmptyFault'.</faultstring><detail><ns1:EmptyPart/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt
deleted file mode 100644
index a2eddc68bf..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 002 (php/wsdl): echoStringFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringFault("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoStringFaultRequest>Hello World</ns1:echoStringFaultRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoStringFault'.</faultstring><detail><ns1:StringPart>Hello World</ns1:StringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt
deleted file mode 100644
index 7d29db3ab7..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 003 (php/wsdl): echoIntArrayFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoIntArrayFault(array(34,12.345));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns2:echoIntArrayFaultRequest><ns1:value>34</ns1:value><ns1:value>12</ns1:value></ns2:echoIntArrayFaultRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoIntArrayFault'.</faultstring><detail><ns2:ArrayOfIntPart><ns1:value>34</ns1:value><ns1:value>12</ns1:value></ns2:ArrayOfIntPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt
deleted file mode 100644
index cd3c59251c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 1,
-                                   "param1" => "Hello world",
-                                   "param2" => array(12.345,45,678)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>1</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2><ns2:value>12.345</ns2:value><ns2:value>45</ns2:value><ns2:value>678</ns2:value></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns1:EmptyPart/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt
deleted file mode 100644
index c50068be82..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 2,
-                                   "param1" => "Hello world",
-                                   "param2" => array(12.345,45,678)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>2</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2><ns2:value>12.345</ns2:value><ns2:value>45</ns2:value><ns2:value>678</ns2:value></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns1:StringPart>Hello world</ns1:StringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt
deleted file mode 100644
index 5e94cb6b4b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 3,
-                                   "param1" => "Hello world",
-                                   "param2" => array(12.345,45,678)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>3</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2><ns2:value>12.345</ns2:value><ns2:value>45</ns2:value><ns2:value>678</ns2:value></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:ArrayOfFloatPart><ns1:value>12.345</ns1:value><ns1:value>45</ns1:value><ns1:value>678</ns1:value></ns2:ArrayOfFloatPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt
deleted file mode 100644
index c8b02e7107..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 007 (php/wsdl): echoMultipleFaults1(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(array("whichFault" => 4,
-                                   "param1" => "Hello world",
-                                   "param2" => array(12.345,45,678)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults1Request><ns1:whichFault>4</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2><ns2:value>12.345</ns2:value><ns2:value>45</ns2:value><ns2:value>678</ns2:value></ns1:param2></ns1:echoMultipleFaults1Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns1:EmptyPart/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt
deleted file mode 100644
index a216449971..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 008 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 1,
-                                   "param1" => "Hello world",
-                                   "param2" => 12.345,
-                                   "param3" => array("one","two","three")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>1</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2>12.345</ns1:param2><ns1:param3><ns2:value>one</ns2:value><ns2:value>two</ns2:value><ns2:value>three</ns2:value></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:FloatPart>12.345</ns1:FloatPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt
deleted file mode 100644
index 065296e9b5..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 009 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 2,
-                                   "param1" => "Hello world",
-                                   "param2" => 12.345,
-                                   "param3" => array("one","two","three")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>2</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2>12.345</ns1:param2><ns1:param3><ns2:value>one</ns2:value><ns2:value>two</ns2:value><ns2:value>three</ns2:value></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:StringPart>Hello world</ns1:StringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt
deleted file mode 100644
index cb1ce27296..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 010 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 3,
-                                   "param1" => "Hello world",
-                                   "param2" => 12.345,
-                                   "param3" => array("one","two","three")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>3</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2>12.345</ns1:param2><ns1:param3><ns2:value>one</ns2:value><ns2:value>two</ns2:value><ns2:value>three</ns2:value></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:ArrayOfStringPart><ns1:value>one</ns1:value><ns1:value>two</ns1:value><ns1:value>three</ns1:value></ns2:ArrayOfStringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt
deleted file mode 100644
index 449512afa2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 011 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(array("whichFault" => 4,
-                                   "param1" => "Hello world",
-                                   "param2" => 12.345,
-                                   "param3" => array("one","two","three")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse" xmlns:ns2="http://soapinterop.org/types"><SOAP-ENV:Body><ns1:echoMultipleFaults2Request><ns1:whichFault>4</ns1:whichFault><ns1:param1>Hello world</ns1:param1><ns1:param2>12.345</ns1:param2><ns1:param3><ns2:value>one</ns2:value><ns2:value>two</ns2:value><ns2:value>three</ns2:value></ns1:param3></ns1:echoMultipleFaults2Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:FloatPart>12.345</ns1:FloatPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt
deleted file mode 100644
index cb32e62af8..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 012 (php/wsdl): echoMultipleFaults3(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(array("whichFault" => 1,
-                                   "param1" => "arg1",
-                                   "param2" => "arg2"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults3Request><ns1:whichFault>1</ns1:whichFault><ns1:param1>arg1</ns1:param1><ns1:param2>arg2</ns1:param2></ns1:echoMultipleFaults3Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:StringPart>arg1</ns1:StringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt
deleted file mode 100644
index f8cc39a9f0..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 013 (php/wsdl): echoMultipleFaults3(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(array("whichFault" => 2,
-                                   "param1" => "arg1",
-                                   "param2" => "arg2"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults3Request><ns1:whichFault>2</ns1:whichFault><ns1:param1>arg1</ns1:param1><ns1:param2>arg2</ns1:param2></ns1:echoMultipleFaults3Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:String2Part>arg2</ns1:String2Part></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt
deleted file mode 100644
index bcc1d248cf..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 014 (php/wsdl): echoMultipleFaults3(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(array("whichFault" => 3,
-                                   "param1" => "arg1",
-                                   "param2" => "arg2"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults3Request><ns1:whichFault>3</ns1:whichFault><ns1:param1>arg1</ns1:param1><ns1:param2>arg2</ns1:param2></ns1:echoMultipleFaults3Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:StringPart>arg1</ns1:StringPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt
deleted file mode 100644
index 622cb3c6cc..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 015 (php/wsdl): echoMultipleFaults4(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(array("whichFault" => 1,
-                                   "param1" => 162,
-                                   "param2" => 1));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults4Request><ns1:whichFault>1</ns1:whichFault><ns1:param1>162</ns1:param1><ns1:param2>1</ns1:param2></ns1:echoMultipleFaults4Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns1:IntPart>162</ns1:IntPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt
deleted file mode 100644
index 6511770f79..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 016 (php/wsdl): echoMultipleFaults4(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(array("whichFault" => 2,
-                                   "param1" => 162,
-                                   "param2" => 1));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults4Request><ns1:whichFault>2</ns1:whichFault><ns1:param1>162</ns1:param1><ns1:param2>1</ns1:param2></ns1:echoMultipleFaults4Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns1:EnumPart>1</ns1:EnumPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt
deleted file mode 100644
index fd812007ef..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple Doc Lit 017 (php/wsdl): echoMultipleFaults4(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(array("whichFault" => 3,
-                                   "param1" => 162,
-                                   "param2" => 1));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_doclit.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/requestresponse"><SOAP-ENV:Body><ns1:echoMultipleFaults4Request><ns1:whichFault>3</ns1:whichFault><ns1:param1>162</ns1:param1><ns1:param2>1</ns1:param2></ns1:echoMultipleFaults4Request></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/types/part"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns1:IntPart>162</ns1:IntPart></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt
deleted file mode 100644
index 943c777441..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 001 (php/wsdl): echoEmptyFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoEmptyFault();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoEmptyFault/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoEmptyFault'.</faultstring><detail><ns2:part1 xsi:nil="true" xsi:type="ns1:EmptyFault"/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt
deleted file mode 100644
index 9bd340cd8f..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 002 (php/wsdl): echoStringFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringFault("Hello World");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoStringFault><param xsi:type="xsd:string">Hello World</param></ns1:echoStringFault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoStringFault'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">Hello World</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt
deleted file mode 100644
index e60cc7fc1b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 003 (php/wsdl): echoIntArrayFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoIntArrayFault(array(34,12.345));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoIntArrayFault><param SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns2:ArrayOfInt"><item xsi:type="xsd:int">34</item><item xsi:type="xsd:int">12</item></param></ns1:echoIntArrayFault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoIntArrayFault'.</faultstring><detail><ns2:part5 SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns1:ArrayOfInt"><item xsi:type="xsd:int">34</item><item xsi:type="xsd:int">12</item></ns2:part5></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt
deleted file mode 100644
index 36e53d74ac..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(1,"Hello world",array(12.345,45,678));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="xsd:string">Hello world</param1><param2 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOfFloat"><item xsi:type="xsd:float">12.345</item><item xsi:type="xsd:float">45</item><item xsi:type="xsd:float">678</item></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part1 xsi:nil="true" xsi:type="ns1:EmptyFault"/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt
deleted file mode 100644
index 18078dd364..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(2,"Hello world",array(12.345,45,678));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="xsd:string">Hello world</param1><param2 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOfFloat"><item xsi:type="xsd:float">12.345</item><item xsi:type="xsd:float">45</item><item xsi:type="xsd:float">678</item></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">Hello world</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt
deleted file mode 100644
index 8b857e7f12..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(3,"Hello world",array(12.345,45,678));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="xsd:string">Hello world</param1><param2 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOfFloat"><item xsi:type="xsd:float">12.345</item><item xsi:type="xsd:float">45</item><item xsi:type="xsd:float">678</item></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part7 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns1:ArrayOfFloat"><item xsi:type="xsd:float">12.345</item><item xsi:type="xsd:float">45</item><item xsi:type="xsd:float">678</item></ns2:part7></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt
deleted file mode 100644
index f343286319..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 007 (php/wsdl): echoMultipleFaults1(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults1(4,"Hello world",array(12.345,45,678));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults1><whichFault xsi:type="xsd:int">4</whichFault><param1 xsi:type="xsd:string">Hello world</param1><param2 SOAP-ENC:arrayType="xsd:float[3]" xsi:type="ns2:ArrayOfFloat"><item xsi:type="xsd:float">12.345</item><item xsi:type="xsd:float">45</item><item xsi:type="xsd:float">678</item></param2></ns1:echoMultipleFaults1></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults1'.</faultstring><detail><ns2:part1 xsi:nil="true" xsi:type="ns1:EmptyFault"/></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt
deleted file mode 100644
index f5cf86da92..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 008 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(1, "Hello World", 12.345, array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="xsd:string">Hello World</param1><param2 xsi:type="xsd:float">12.345</param2><param3 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfString"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:part4 xsi:type="xsd:float">12.345</ns1:part4></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt
deleted file mode 100644
index 62920954f1..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 009 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(2, "Hello World", 12.345, array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="xsd:string">Hello World</param1><param2 xsi:type="xsd:float">12.345</param2><param3 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfString"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">Hello World</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt
deleted file mode 100644
index 25a7da54c7..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 010 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(3, "Hello World", 12.345, array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="xsd:string">Hello World</param1><param2 xsi:type="xsd:float">12.345</param2><param3 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfString"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns2:part6 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns1:ArrayOfString"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></ns2:part6></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt
deleted file mode 100644
index 2c1199c271..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 011 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults2(4, "Hello World", 12.345, array("one","two","three"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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/" xmlns:ns2="http://soapinterop.org/types" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults2><whichFault xsi:type="xsd:int">4</whichFault><param1 xsi:type="xsd:string">Hello World</param1><param2 xsi:type="xsd:float">12.345</param2><param3 SOAP-ENC:arrayType="xsd:string[3]" xsi:type="ns2:ArrayOfString"><item xsi:type="xsd:string">one</item><item xsi:type="xsd:string">two</item><item xsi:type="xsd:string">three</item></param3></ns1:echoMultipleFaults2></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults2'.</faultstring><detail><ns1:part4 xsi:type="xsd:float">12.345</ns1:part4></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt
deleted file mode 100644
index d3f054b1eb..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 012 (php/wsdl): echoMultipleFaults3(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(1,"arg1","arg2");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoMultipleFaults3><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="xsd:string">arg1</param1><param2 xsi:type="xsd:string">arg2</param2></ns1:echoMultipleFaults3></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl/fault1" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">arg1</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt
deleted file mode 100644
index 463c65af35..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 013 (php/wsdl): echoMultipleFaults3(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(2,"arg1","arg2");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoMultipleFaults3><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="xsd:string">arg1</param1><param2 xsi:type="xsd:string">arg2</param2></ns1:echoMultipleFaults3></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl/fault2" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">arg2</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt
deleted file mode 100644
index ad7514fab3..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 014 (php/wsdl): echoMultipleFaults3(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults3(3,"arg1","arg2");
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoMultipleFaults3><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="xsd:string">arg1</param1><param2 xsi:type="xsd:string">arg2</param2></ns1:echoMultipleFaults3></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl/fault1" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults3'.</faultstring><detail><ns1:part2 xsi:type="xsd:string">arg1</ns1:part2></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt
deleted file mode 100644
index 2e4139f712..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 015 (php/wsdl): echoMultipleFaults4(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(1, 162, 1);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults4><whichFault xsi:type="xsd:int">1</whichFault><param1 xsi:type="xsd:int">162</param1><param2 xsi:type="ns2:Enum">1</param2></ns1:echoMultipleFaults4></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns1:part3 xsi:type="xsd:int">162</ns1:part3></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt
deleted file mode 100644
index 88063d0926..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 016 (php/wsdl): echoMultipleFaults4(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(2, 162, 1);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults4><whichFault xsi:type="xsd:int">2</whichFault><param1 xsi:type="xsd:int">162</param1><param2 xsi:type="ns2:Enum">1</param2></ns1:echoMultipleFaults4></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/types" xmlns:ns2="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns2:part9 xsi:type="ns1:Enum">1</ns2:part9></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt
deleted file mode 100644
index 6e9173de52..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH Simple RPC Enc 017 (php/wsdl): echoMultipleFaults4(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoMultipleFaults4(3, 162, 1);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_simple_rpcenc.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/types" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoMultipleFaults4><whichFault xsi:type="xsd:int">3</whichFault><param1 xsi:type="xsd:int">162</param1><param2 xsi:type="ns2:Enum">1</param2></ns1:echoMultipleFaults4></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Fault in response to 'echoMultipleFaults4'.</faultstring><detail><ns1:part3 xsi:type="xsd:int">162</ns1:part3></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt
deleted file mode 100644
index 17aabd5d44..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH SoapFault 001 (php/wsdl): echoVersionMismatchFault(SOAP 1.1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVersionMismatchFault();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_soapfault.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVersionMismatchFault/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoVersionMismatchFaultResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt
deleted file mode 100644
index 9106a5e1e6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH SoapFault 002 (php/wsdl): echoVersionMismatchFault(SOAP 1.2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0,"soap_version"=>SOAP_1_2));
-$client->echoVersionMismatchFault();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_soapfault.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body><ns1:echoVersionMismatchFault env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"/></env:Body></env:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body><ns1:echoVersionMismatchFaultResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"/></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt
deleted file mode 100644
index 398d70eb7c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH SoapFault 003 (php/wsdl): echoVersionMismatchFault(unknown version)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://unknown.org/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoVersionMismatchFault/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-echo $HTTP_RAW_POST_DATA."\n";
-include("round4_groupH_soapfault.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://unknown.org/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" 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:echoVersionMismatchFault/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:VersionMismatch</faultcode><faultstring>Wrong Version</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt
deleted file mode 100644
index 17f4beba1a..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupH SoapFault 004 (php/wsdl): echoMustUnderstandFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/wsdl", "UnknownHeaderRequest", "Hello World", 1);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVersionMismatchFault",array(), null, $hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupH_soapfault.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:UnknownHeaderRequest SOAP-ENV:mustUnderstand="1">Hello World</ns1:UnknownHeaderRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVersionMismatchFault/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:MustUnderstand</faultcode><faultstring>Header not understood</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc
deleted file mode 100644
index 1c31aa3da0..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-class SOAP_Interop_GroupH {
-
-  function echoSOAPStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoSOAPStructFault'.", null, array("soapStruct"=>$input), "ComplexFault");
-  }
-
-  function echoBaseStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoBaseStructFault'.", null, $input, "ComplexFault");
-  }
-
-  function echoExtendedStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoExtendedStructFault'.", null, $input, "ComplexFault");
-  }
-
-  function echoMultipleFaults1($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "ComplexFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$input->param1), "ComplexFault1");
-	  }
-  }
-
-  function echoMultipleFaults2($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "ComplexFault2");
-  	} else if ($input->whichFault == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "ComplexFault3");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "ComplexFault1");
-	  }
-  }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl");
-$server->setClass("SOAP_Interop_GroupH");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.wsdl b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.wsdl
deleted file mode 100644
index f1c383dc1d..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.wsdl
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://soapinterop.org/wsdl"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns2="http://soapinterop.org/types"
-	xmlns:ns3="http://soapinterop.org/types/part"
-	xmlns:ns4="http://soapinterop.org/types/requestresponse"
-	targetNamespace="http://soapinterop.org/wsdl">
-
-	<types>
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types"
-			targetNamespace="http://soapinterop.org/types">
-
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-			<complexType name="SOAPStruct">
-				<sequence>
-					<element name="varString" type="xsd:string"/>
-					<element name="varInt" type="xsd:int"/>
-					<element name="varFloat" type="xsd:float"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="SOAPStructFault">
-				<sequence>
-					<element name="soapStruct" type="tns:SOAPStruct"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="BaseStruct">
-				<sequence>
-					<element name="structMessage" type="tns:SOAPStruct"/>
-					<element name="shortMessage" type="xsd:short"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="ExtendedStruct">
-				<complexContent>
-					<extension base="tns:BaseStruct">
-						<sequence>
-							<element name="stringMessage" type="xsd:string"/>
-							<element name="intMessage" type="xsd:int"/>
-							<element name="anotherIntMessage" type="xsd:int"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-
-			<complexType name="MoreExtendedStruct">
-				<complexContent>
-					<extension base="tns:ExtendedStruct">
-						<sequence>
-							<element name="booleanMessage" type="xsd:boolean"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-
-		</schema>
-
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types/part"
-			targetNamespace="http://soapinterop.org/types/part">
-
-			<element name="SOAPStructFaultPart" type="ns2:SOAPStructFault"/>
-			<element name="BaseStructPart" type="ns2:BaseStruct"/>
-			<element name="ExtendedStructPart" type="ns2:ExtendedStruct"/>
-			<element name="MoreExtendedStructPart" type="ns2:MoreExtendedStruct"/>
-
-		</schema>
-
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types/requestresponse"
-			targetNamespace="http://soapinterop.org/types/requestresponse">
-
-			<element name="echoSOAPStructFaultRequest" type="ns2:SOAPStruct"/>
-			<element name="echoSOAPStructFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoBaseStructFaultRequest" type="ns2:BaseStruct"/>
-			<element name="echoBaseStructFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoExtendedStructFaultRequest" type="ns2:ExtendedStruct"/>
-			<element name="echoExtendedStructFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults1Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="ns2:SOAPStruct"/>
-						<element name="param2" type="ns2:BaseStruct"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults1Response">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults2Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="ns2:BaseStruct"/>
-						<element name="param2" type="ns2:ExtendedStruct"/>
-						<element name="param3" type="ns2:MoreExtendedStruct"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults2Response">
-				<complexType/>
-			</element>
-
-		</schema>
-	</types>
-
-	<message name="echoSOAPStructFaultRequest">
-		<part name="param" element="ns4:echoSOAPStructFaultRequest"/>
-	</message>
-	<message name="echoSOAPStructFaultResponse">
-		<part name="param" element="ns4:echoSOAPStructFaultResponse"/>
-	</message>
-
-	<message name="echoBaseStructFaultRequest">
-		<part name="param" element="ns4:echoBaseStructFaultRequest"/>
-	</message>
-	<message name="echoBaseStructFaultResponse">
-		<part name="param" element="ns4:echoBaseStructFaultResponse"/>
-	</message>
-
-	<message name="echoExtendedStructFaultRequest">
-		<part name="param" element="ns4:echoExtendedStructFaultRequest"/>
-	</message>
-	<message name="echoExtendedStructFaultResponse">
-		<part name="param" element="ns4:echoExtendedStructFaultResponse"/>
-	</message>
-
-	<message name="echoMultipleFaults1Request">
-		<part name="param" element="ns4:echoMultipleFaults1Request"/>
-	</message>
-	<message name="echoMultipleFaults1Response">
-		<part name="param" element="ns4:echoMultipleFaults1Response"/>
-	</message>
-
-	<message name="echoMultipleFaults2Request">
-		<part name="param" element="ns4:echoMultipleFaults2Request"/>
-	</message>
-	<message name="echoMultipleFaults2Response">
-		<part name="param" element="ns4:echoMultipleFaults2Response"/>
-	</message>
-
-	<!-- Fault messages -->
-	<message name="SOAPStructFault">
-		<part name="part3" element="ns3:SOAPStructFaultPart"/>
-	</message>
-	<message name="BaseStructFault">
-		<part name="part1" element="ns3:BaseStructPart"/>
-	</message>
-	<message name="ExtendedStructFault">
-		<part name="part2" element="ns3:ExtendedStructPart"/>
-	</message>
-	<message name="MoreExtendedStructFault">
-		<part name="part5" element="ns3:MoreExtendedStructPart"/>
-	</message>
-
-	<portType name="ComplexDocLitPortType">
-		<!--
-			Throws a fault with an embedded SOAPStruct
-		-->
-		<operation name="echoSOAPStructFault" parameterOrder="">
-			<input message="tns:echoSOAPStructFaultRequest"/>
-			<output message="tns:echoSOAPStructFaultResponse"/>
-			<fault name="ComplexFault" message="tns:SOAPStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with a base complex struct
-		-->
-		<operation name="echoBaseStructFault" parameterOrder="">
-			<input message="tns:echoBaseStructFaultRequest"/>
-			<output message="tns:echoBaseStructFaultResponse"/>
-			<fault name="ComplexFault" message="tns:BaseStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with an en extended complex type
-		-->
-		<operation name="echoExtendedStructFault" parameterOrder="">
-			<input message="tns:echoExtendedStructFaultRequest"/>
-			<output message="tns:echoExtendedStructFaultResponse"/>
-			<fault name="ComplexFault" message="tns:ExtendedStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with embedded complex type, fault with an
-			extended complex type and fault with an array of a base
-			complex type
-		-->
-		<operation name="echoMultipleFaults1" parameterOrder="param">
-			<input message="tns:echoMultipleFaults1Request"/>
-			<output message="tns:echoMultipleFaults1Response"/>
-			<fault name="ComplexFault1" message="tns:SOAPStructFault"/>
-			<fault name="ComplexFault2" message="tns:BaseStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with an array of base complex type and
-			a fault with doubly extended complex type
-		-->
-		<operation name="echoMultipleFaults2" parameterOrder="param">
-			<input message="tns:echoMultipleFaults2Request"/>
-			<output message="tns:echoMultipleFaults2Response"/>
-			<fault name="ComplexFault1" message="tns:BaseStructFault"/>
-			<fault name="ComplexFault2" message="tns:ExtendedStructFault"/>
-			<fault name="ComplexFault3" message="tns:MoreExtendedStructFault"/>
-		</operation>
-	</portType>
-
-	<binding name="ComplexDocLitBinding" type="tns:ComplexDocLitPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-		<operation name="echoSOAPStructFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					use="literal"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoBaseStructFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					use="literal"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoExtendedStructFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					use="literal"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults1">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="ComplexFault1">
-				<soap:fault 
-					name="ComplexFault1"
-					use="literal"/>
-			</fault>
-			<fault name="ComplexFault2">
-				<soap:fault
-					name="ComplexFault2"
-					use="literal"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults2">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="ComplexFault1">
-				<soap:fault
-					name="ComplexFault1"
-					use="literal"/>
-			</fault>
-			<fault name="ComplexFault2">
-				<soap:fault 
-					name="ComplexFault2"
-					use="literal"/>
-			</fault>
-			<fault name="ComplexFault3">
-				<soap:fault 
-					name="ComplexFault3"
-					use="literal"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-	</binding>
-
-	<service name="ComplexDocLitService">
-		<port name="ComplexDocLitPort" binding="tns:ComplexDocLitBinding">
-			<soap:address
-				location="test://"/>
-		</port>
-	</service>
-</definitions>
-
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc
deleted file mode 100644
index 6dec186474..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-class SOAP_Interop_GroupH {
-
-  function echoSOAPStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoSOAPStructFault'.", null, $input, "ComplexFault");
-  }
-
-  function echoBaseStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoBaseStructFault'.", null, $input, "ComplexFault");
-  }
-
-  function echoExtendedStructFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoExtendedStructFault'.", null, $input, "ComplexFault");
-  }
-
-  function echoMultipleFaults1($which, $s1, $s2) {
-  	if ($which == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $s2, "ComplexFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$s1), "ComplexFault1");
-	  }
-  }
-
-  function echoMultipleFaults2($which, $s1, $s2, $s3) {
-  	if ($which == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s2, "ComplexFault2");
-  	} else if ($which == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s3, "ComplexFault3");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s1, "ComplexFault1");
-	  }
-  }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl");
-$server->setClass("SOAP_Interop_GroupH");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.wsdl b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.wsdl
deleted file mode 100644
index e78ca38ea5..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.wsdl
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://soapinterop.org/wsdl"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns2="http://soapinterop.org/types"
-	targetNamespace="http://soapinterop.org/wsdl">
-
-	<types>
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
-			xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-			targetNamespace="http://soapinterop.org/types">
-
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-			<complexType name="SOAPStruct">
-				<sequence>
-					<element name="varString" type="xsd:string"/>
-					<element name="varInt" type="xsd:int"/>
-					<element name="varFloat" type="xsd:float"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="SOAPStructFault">
-				<sequence>
-					<element name="soapStruct" type="tns:SOAPStruct"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="BaseStruct">
-				<sequence>
-					<element name="floatMessage" type="xsd:float"/>
-					<element name="shortMessage" type="xsd:short"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="ExtendedStruct">
-				<complexContent>
-					<extension base="tns:BaseStruct">
-						<sequence>
-							<element name="stringMessage" type="xsd:string"/>
-							<element name="intMessage" type="xsd:int"/>
-							<element name="anotherIntMessage" type="xsd:int"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-
-			<complexType name="MoreExtendedStruct">
-				<complexContent>
-					<extension base="tns:ExtendedStruct">
-						<sequence>
-							<element name="booleanMessage" type="xsd:boolean"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-
-		</schema>
-	</types>
-
-	<message name="echoFaultResponse"/>
-	<message name="echoSOAPStructFaultRequest">
-		<part name="param" type="ns2:SOAPStructFault"/>
-	</message>
-	<message name="echoBaseStructFaultRequest">
-		<part name="param" type="ns2:BaseStruct"/>
-	</message>
-	<message name="echoExtendedStructFaultRequest">
-		<part name="param" type="ns2:ExtendedStruct"/>
-	</message>
-	<message name="echoMultipleFaults1Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="ns2:SOAPStruct"/>
-		<part name="param2" type="ns2:BaseStruct"/>
-	</message>
-	<message name="echoMultipleFaults2Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="ns2:BaseStruct"/>
-		<part name="param2" type="ns2:ExtendedStruct"/>
-		<part name="param3" type="ns2:MoreExtendedStruct"/>
-	</message>
-
-	<!-- Fault messages -->
-	<message name="SOAPStructFault">
-		<part name="part1" type="ns2:SOAPStructFault"/>
-	</message>
-	<message name="BaseStructFault">
-		<part name="part2" type="ns2:BaseStruct"/>
-	</message>
-	<message name="ExtendedStructFault">
-		<part name="part3" type="ns2:ExtendedStruct"/>
-	</message>
-	<message name="MoreExtendedStructFault">
-		<part name="part4" type="ns2:MoreExtendedStruct"/>
-	</message>
-
-	<portType name="ComplexRpcEncPortType">
-		<!--
-			Throws a fault with an embedded SOAPStruct
-		-->
-		<operation name="echoSOAPStructFault" parameterOrder="param">
-			<input message="tns:echoSOAPStructFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="ComplexFault" message="tns:SOAPStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with a base complex struct
-		-->
-		<operation name="echoBaseStructFault" parameterOrder="param">
-			<input message="tns:echoBaseStructFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="ComplexFault" message="tns:BaseStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with an en extended complex type
-		-->
-		<operation name="echoExtendedStructFault" parameterOrder="param">
-			<input message="tns:echoExtendedStructFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="ComplexFault" message="tns:ExtendedStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with embedded complex type and fault with
-			another complex type
-		-->
-		<operation name="echoMultipleFaults1" parameterOrder="whichFault param1 param2">
-			<input message="tns:echoMultipleFaults1Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="ComplexFault1" message="tns:SOAPStructFault"/>
-			<fault name="ComplexFault2" message="tns:BaseStructFault"/>
-		</operation>
-
-		<!--
-			Throws a fault with base complex type, fault with an extended
-			complex type and a fault with doubly extended complex type
-		-->
-		<operation name="echoMultipleFaults2" parameterOrder="whichFault param1 param2 param3">
-			<input message="tns:echoMultipleFaults2Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="ComplexFault1" message="tns:BaseStructFault"/>
-			<fault name="ComplexFault2" message="tns:ExtendedStructFault"/>
-			<fault name="ComplexFault3" message="tns:MoreExtendedStructFault"/>
-		</operation>
-	</portType>
-
-	<binding name="ComplexRpcEncBinding" type="tns:ComplexRpcEncPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-		<operation name="echoSOAPStructFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoBaseStructFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoExtendedStructFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="ComplexFault">
-				<soap:fault
-					name="ComplexFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults1">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="ComplexFault1">
-				<soap:fault
-					name="ComplexFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="ComplexFault2">
-				<soap:fault
-					name="ComplexFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults2">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="ComplexFault1">
-				<soap:fault
-					name="ComplexFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="ComplexFault2">
-				<soap:fault
-					name="ComplexFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="ComplexFault3">
-				<soap:fault
-					name="ComplexFault3"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-	</binding>
-
-	<service name="ComplexRpcEncService">
-		<port name="ComplexRpcEncPort" binding="tns:ComplexRpcEncBinding">
-			<soap:address
-				location="test://"/>
-		</port>
-	</service>
-</definitions>
-
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc
deleted file mode 100644
index 6a04cfd2d9..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-class SOAP_Interop_GroupH {
-
-  function echoEmptyFault() {
-    return new SoapFault("Server", "Fault in response to 'echoEmptyFault'.", null, null, "SimpleFault");
-  }
-
-  function echoStringFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoStringFault'.", null, $input, "SimpleFault");
-  }
-
-  function echoIntArrayFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoIntArrayFault'.", null, $input, "SimpleFault");
-  }
-
-  function echoMultipleFaults1($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param1, "SimpleFault2");
-  	} else if ($input->whichFault == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "SimpleFault3");
-  	} else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1");
-	  }
-  }
-
-  function echoMultipleFaults2($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "SimpleFault1");
-  	} else if ($input->whichFault == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "SimpleFault3");
-  	} else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "SimpleFault2");
-	  }
-  }
-
-  function echoMultipleFaults3($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param2, "SimpleFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param1, "SimpleFault1");
-	  }
-  }
-
-  function echoMultipleFaults4($input) {
-  	if ($input->whichFault == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param2, "SimpleFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param1, "SimpleFault1");
-	  }
-  }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl");
-$server->setClass("SOAP_Interop_GroupH");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.wsdl b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.wsdl
deleted file mode 100644
index 8f0d322173..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.wsdl
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://soapinterop.org/wsdl"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns2="http://soapinterop.org/types"
-	xmlns:ns3="http://soapinterop.org/types/part"
-	xmlns:ns4="http://soapinterop.org/types/requestresponse"
-	targetNamespace="http://soapinterop.org/wsdl">
-	<types>
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types"
-			targetNamespace="http://soapinterop.org/types">
-
-			<complexType name="ArrayOfString">
-				<sequence>
-					<element name="value" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="ArrayOfInt">
-				<sequence>
-					<element name="value" minOccurs="0" maxOccurs="unbounded" type="xsd:int"/>
-				</sequence>
-			</complexType>
-
-			<complexType name="ArrayOfFloat">
-				<sequence>
-					<element name="value" minOccurs="0" maxOccurs="unbounded" type="xsd:float"/>
-				</sequence>
-			</complexType>
-
-			<simpleType name="Enum">
-				<restriction base="xsd:int">
-					<enumeration value="1"/>
-					<enumeration value="2"/>
-				</restriction>
-			</simpleType>
-
-		</schema>
-
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types/part"
-			targetNamespace="http://soapinterop.org/types/part">
-
-			<element name="EmptyPart">
-				<complexType/>
-			</element>
-
-			<element name="StringPart" type="xsd:string"/>
-			<element name="IntPart" type="xsd:int"/>
-			<element name="FloatPart" type="xsd:float"/>
-			<element name="ArrayOfStringPart" type="ns2:ArrayOfString"/>
-			<element name="ArrayOfIntPart" type="ns2:ArrayOfInt"/>
-			<element name="ArrayOfFloatPart" type="ns2:ArrayOfFloat"/>
-			<element name="String2Part" type="xsd:string"/>
-			<element name="EnumPart" type="ns2:Enum"/>
-
-		</schema>
-
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types/requestresponse"
-			targetNamespace="http://soapinterop.org/types/requestresponse">
-
-			<element name="echoEmptyFaultRequest">
-				<complexType/>
-			</element>
-			<element name="echoEmptyFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoStringFaultRequest" type="xsd:string"/>
-			<element name="echoStringFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoIntArrayFaultRequest" type="ns2:ArrayOfInt"/>
-			<element name="echoIntArrayFaultResponse">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults1Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="xsd:string"/>
-						<element name="param2" type="ns2:ArrayOfFloat"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults1Response">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults2Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="xsd:string"/>
-						<element name="param2" type="xsd:float"/>
-						<element name="param3" type="ns2:ArrayOfString"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults2Response">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults3Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="xsd:string"/>
-						<element name="param2" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults3Response">
-				<complexType/>
-			</element>
-
-			<element name="echoMultipleFaults4Request">
-				<complexType>
-					<sequence>
-						<element name="whichFault" type="xsd:int"/>
-						<element name="param1" type="xsd:int"/>
-						<element name="param2" type="ns2:Enum"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="echoMultipleFaults4Response">
-				<complexType/>
-			</element>
-
-		</schema>
-	</types>
-
-	<message name="echoEmptyFaultRequest">
-		<part name="param" element="ns4:echoEmptyFaultRequest"/>
-	</message>
-	<message name="echoEmptyFaultResponse">
-		<part name="param" element="ns4:echoEmptyFaultResponse"/>
-	</message>
-
-	<message name="echoStringFaultRequest">
-		<part name="param" element="ns4:echoStringFaultRequest"/>
-	</message>
-	<message name="echoStringFaultResponse">
-		<part name="param" element="ns4:echoStringFaultResponse"/>
-	</message>
-
-	<message name="echoIntArrayFaultRequest">
-		<part name="param" element="ns4:echoIntArrayFaultRequest"/>
-	</message>
-	<message name="echoIntArrayFaultResponse">
-		<part name="param" element="ns4:echoIntArrayFaultResponse"/>
-	</message>
-
-	<message name="echoMultipleFaults1Request">
-		<part name="param" element="ns4:echoMultipleFaults1Request"/>
-	</message>
-	<message name="echoMultipleFaults1Response">
-		<part name="param" element="ns4:echoMultipleFaults1Response"/>
-	</message>
-
-	<message name="echoMultipleFaults2Request">
-		<part name="param" element="ns4:echoMultipleFaults2Request"/>
-	</message>
-	<message name="echoMultipleFaults2Response">
-		<part name="param" element="ns4:echoMultipleFaults2Response"/>
-	</message>
-
-	<message name="echoMultipleFaults3Request">
-		<part name="param" element="ns4:echoMultipleFaults3Request"/>
-	</message>
-	<message name="echoMultipleFaults3Response">
-		<part name="param" element="ns4:echoMultipleFaults3Response"/>
-	</message>
-
-	<message name="echoMultipleFaults4Request">
-		<part name="param" element="ns4:echoMultipleFaults4Request"/>
-	</message>
-	<message name="echoMultipleFaults4Response">
-		<part name="param" element="ns4:echoMultipleFaults4Response"/>
-	</message>
-
-	<!-- Fault messages -->
-	<message name="EmptyFault">
-		<part name="part1" element="ns3:EmptyPart"/>
-	</message>
-	<message name="StringFault">
-		<part name="part2" element="ns3:StringPart"/>
-	</message>
-	<message name="IntFault">
-		<part name="part3" element="ns3:IntPart"/>
-	</message>
-	<message name="FloatFault">
-		<part name="part4" element="ns3:FloatPart"/>
-	</message>
-	<message name="StringArrayFault">
-		<part name="part5" element="ns3:ArrayOfStringPart"/>
-	</message>
-	<message name="IntArrayFault">
-		<part name="part6" element="ns3:ArrayOfIntPart"/>
-	</message>
-	<message name="FloatArrayFault">
-		<part name="part7" element="ns3:ArrayOfFloatPart"/>
-	</message>
-	<!--
-		Part name same as in Fault2 message
-	-->
-	<message name="String2Fault">
-		<part name="part2" element="ns3:String2Part"/>
-	</message>
-	<message name="EnumFault">
-		<part name="part9" element="ns3:EnumPart"/>
-	</message>
-
-	<portType name="SimpleDocLitPortType">
-		<!--
-			Throws an empty fault
-		-->
-		<operation name="echoEmptyFault" parameterOrder="">
-			<input message="tns:echoEmptyFaultRequest"/>
-			<output message="tns:echoEmptyFaultResponse"/>
-			<fault name="SimpleFault" message="tns:EmptyFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:string parameter
-		-->
-		<operation name="echoStringFault" parameterOrder="param">
-			<input message="tns:echoStringFaultRequest"/>
-			<output message="tns:echoStringFaultResponse"/>
-			<fault name="SimpleFault" message="tns:StringFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:int[] parameter
-		-->
-		<operation name="echoIntArrayFault" parameterOrder="param">
-			<input message="tns:echoIntArrayFaultRequest"/>
-			<output message="tns:echoIntArrayFaultResponse"/>
-			<fault name="SimpleFault" message="tns:IntArrayFault"/>
-		</operation>
-
-		<!--
-			Throws empty fault, fault with a xsd:string
-			parameter and fault with xsd:float[] parameter
-		-->
-		<operation name="echoMultipleFaults1" parameterOrder="param">
-			<input message="tns:echoMultipleFaults1Request"/>
-			<output message="tns:echoMultipleFaults1Response"/>
-			<fault name="SimpleFault1" message="tns:EmptyFault"/>
-			<fault name="SimpleFault2" message="tns:StringFault"/>
-			<fault name="SimpleFault3" message="tns:FloatArrayFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:string parameter, fault with
-			xsd:float parameter and fault with xsd:string[]
-			parameters
-		-->
-		<operation name="echoMultipleFaults2" parameterOrder="param">
-			<input message="tns:echoMultipleFaults2Request"/>
-			<output message="tns:echoMultipleFaults2Response"/>
-			<fault name="SimpleFault1" message="tns:StringFault"/>
-			<fault name="SimpleFault2" message="tns:FloatFault"/>
-			<fault name="SimpleFault3" message="tns:StringArrayFault"/>
-		</operation>
-
-		<!--
-			Throws two faults, each with xsd:string parameters
-			and same part names
-		-->
-		<operation name="echoMultipleFaults3" parameterOrder="param">
-			<input message="tns:echoMultipleFaults3Request"/>
-			<output message="tns:echoMultipleFaults3Response"/>
-			<fault name="SimpleFault1" message="tns:StringFault"/>
-			<fault name="SimpleFault2" message="tns:String2Fault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:int parameter and fault with an
-			int enumeration parameter
-		-->
-		<operation name="echoMultipleFaults4" parameterOrder="param">
-			<input message="tns:echoMultipleFaults4Request"/>
-			<output message="tns:echoMultipleFaults4Response"/>
-			<fault name="SimpleFault1" message="tns:IntFault"/>
-			<fault name="SimpleFault2" message="tns:EnumFault"/>
-		</operation>
-	</portType>
-
-	<binding name="SimpleDocLitBinding" type="tns:SimpleDocLitPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-
-		<operation name="echoEmptyFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<soap:fault use="literal"/>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoStringFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoIntArrayFault">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoMultipleFaults1">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault3">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoMultipleFaults2">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault3">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoMultipleFaults3">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-		<operation name="echoMultipleFaults4">
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault use="literal"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault use="literal"/>
-			</fault>
-			<soap:operation soapAction="http://soapinterop.org/r4/groupg/"/>
-		</operation>
-
-	</binding>
-
-	<service name="SimpleDocLitService">
-		<port name="SimpleDocLitPort" binding="tns:SimpleDocLitBinding">
-			<soap:address
-				location="http://"/>
-		</port>
-	</service>
-</definitions>
-
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc
deleted file mode 100644
index 0b85a34f99..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-class SOAP_Interop_GroupH {
-
-  function echoEmptyFault() {
-    return new SoapFault("Server", "Fault in response to 'echoEmptyFault'.", null, null, "SimpleFault");
-  }
-
-  function echoStringFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoStringFault'.", null, $input, "SimpleFault");
-  }
-
-  function echoIntArrayFault($input) {
-    return new SoapFault("Server", "Fault in response to 'echoIntArrayFault'.", null, $input, "SimpleFault");
-  }
-
-  function echoMultipleFaults1($param, $string, $floats) {
-  	if ($param == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $string, "SimpleFault2");
-  	} else if ($param == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $floats, "SimpleFault3");
-  	} else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1");
-	  }
-  }
-
-  function echoMultipleFaults2($param, $string, $float, $strings) {
-  	if ($param == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $string, "SimpleFault1");
-  	} else if ($param == 3) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $strings, "SimpleFault3");
-  	} else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $float, "SimpleFault2");
-	  }
-  }
-
-  function echoMultipleFaults3($param, $param1, $param2) {
-  	if ($param == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param2, "SimpleFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param1, "SimpleFault1");
-	  }
-  }
-
-  function echoMultipleFaults4($param, $int, $enum) {
-  	if ($param == 2) {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $enum, "SimpleFault2");
-	  } else {
-	    return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $int, "SimpleFault1");
-	  }
-  }
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl");
-$server->setClass("SOAP_Interop_GroupH");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.wsdl b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.wsdl
deleted file mode 100644
index 24f73fcb0e..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.wsdl
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://soapinterop.org/wsdl"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns2="http://soapinterop.org/types"
-	targetNamespace="http://soapinterop.org/wsdl">
-	<types>
-		<schema elementFormDefault="qualified"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:tns="http://soapinterop.org/types"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
-			xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-			targetNamespace="http://soapinterop.org/types">
-
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-			<complexType name="EmptyFault"/>
-
-			<complexType name="ArrayOfString">
-				<complexContent>
-					<restriction base="soap-enc:Array">
-						<attribute ref="soap-enc:arrayType" wsdl:arrayType="string[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="ArrayOfInt">
-				<complexContent>
-					<restriction base="soap-enc:Array">
-						<attribute ref="soap-enc:arrayType" wsdl:arrayType="int[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="ArrayOfFloat">
-				<complexContent>
-					<restriction base="soap-enc:Array">
-						<attribute ref="soap-enc:arrayType" wsdl:arrayType="float[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<simpleType name="Enum">
-				<restriction base="int">
-					<enumeration value="1"/>
-					<enumeration value="2"/>
-				</restriction>
-			</simpleType>
-		</schema>
-	</types>
-
-	<message name="echoFaultRequest"/>
-	<message name="echoFaultResponse"/>
-	<message name="echoStringFaultRequest">
-		<part name="param" type="xsd:string"/>
-	</message>
-	<message name="echoIntArrayFaultRequest">
-		<part name="param" type="ns2:ArrayOfInt"/>
-	</message>
-	<message name="echoMultipleFaults1Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="xsd:string"/>
-		<part name="param2" type="ns2:ArrayOfFloat"/>
-	</message>
-	<message name="echoMultipleFaults2Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="xsd:string"/>
-		<part name="param2" type="xsd:float"/>
-		<part name="param3" type="ns2:ArrayOfString"/>
-	</message>
-	<message name="echoMultipleFaults3Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="xsd:string"/>
-		<part name="param2" type="xsd:string"/>
-	</message>
-	<message name="echoMultipleFaults4Request">
-		<part name="whichFault" type="xsd:int"/>
-		<part name="param1" type="xsd:int"/>
-		<part name="param2" type="ns2:Enum"/>
-	</message>
-
-	<!-- Fault messages -->
-	<message name="EmptyFault">
-		<part name="part1" type="ns2:EmptyFault"/>
-	</message>
-	<message name="StringFault">
-		<part name="part2" type="xsd:string"/>
-	</message>
-	<message name="IntFault">
-		<part name="part3" type="xsd:int"/>
-	</message>
-	<message name="FloatFault">
-		<part name="part4" type="xsd:float"/>
-	</message>
-	<message name="IntArrayFault">
-		<part name="part5" type="ns2:ArrayOfInt"/>
-	</message>
-	<message name="StringArrayFault">
-		<part name="part6" type="ns2:ArrayOfString"/>
-	</message>
-	<message name="FloatArrayFault">
-		<part name="part7" type="ns2:ArrayOfFloat"/>
-	</message>
-	<!--
-		Part name same as in StringFault message
-	-->
-	<message name="String2Fault">
-		<part name="part2" type="xsd:string"/>
-	</message>
-	<message name="EnumFault">
-		<part name="part9" type="ns2:Enum"/>
-	</message>
-
-	<portType name="SimpleRpcEncPortType">
-		<!--
-			Throws an empty fault
-		-->
-		<operation name="echoEmptyFault" parameterOrder="">
-			<input message="tns:echoFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault" message="tns:EmptyFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:string parameter
-		-->
-		<operation name="echoStringFault" parameterOrder="param">
-			<input message="tns:echoStringFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault" message="tns:StringFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:int[] parameter
-		-->
-		<operation name="echoIntArrayFault" parameterOrder="param">
-			<input message="tns:echoIntArrayFaultRequest"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault" message="tns:IntArrayFault"/>
-		</operation>
-
-		<!--
-			Throws empty fault, fault with a xsd:string
-			parameter and fault with xsd:float[] parameter
-		-->
-		<operation name="echoMultipleFaults1" parameterOrder="whichFault param1 param2">
-			<input message="tns:echoMultipleFaults1Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault1" message="tns:EmptyFault"/>
-			<fault name="SimpleFault2" message="tns:StringFault"/>
-			<fault name="SimpleFault3" message="tns:FloatArrayFault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:string parameter, fault with
-			xsd:float parameter and fault with xsd:string[]
-			parameters
-		-->
-		<operation name="echoMultipleFaults2" parameterOrder="whichFault param1 param2 param3">
-			<input message="tns:echoMultipleFaults2Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault1" message="tns:StringFault"/>
-			<fault name="SimpleFault2" message="tns:FloatFault"/>
-			<fault name="SimpleFault3" message="tns:StringArrayFault"/>
-		</operation>
-
-		<!--
-			Throws two faults, each with xsd:string parameters
-			and same part names. Each part name is bound to a different
-			namespace.
-		-->
-		<operation name="echoMultipleFaults3" parameterOrder="whichFault param1 param2">
-			<input message="tns:echoMultipleFaults3Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault1" message="tns:StringFault"/>
-			<fault name="SimpleFault2" message="tns:String2Fault"/>
-		</operation>
-
-		<!--
-			Throws fault with xsd:int parameter and fault with an
-			int enumeration parameter
-		-->
-		<operation name="echoMultipleFaults4" parameterOrder="whichFault param1 param2">
-			<input message="tns:echoMultipleFaults4Request"/>
-			<output message="tns:echoFaultResponse"/>
-			<fault name="SimpleFault1" message="tns:IntFault"/>
-			<fault name="SimpleFault2" message="tns:EnumFault"/>
-		</operation>
-	</portType>
-
-	<binding name="SimpleRpcEncBinding" type="tns:SimpleRpcEncPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-
-		<operation name="echoEmptyFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault">
-				<soap:fault
-					name="SimpleFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoStringFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault">
-				<soap:fault
-					name="SimpleFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoIntArrayFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault">
-				<soap:fault
-					name="SimpleFault"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults1">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault
-					name="SimpleFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault
-					name="SimpleFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="SimpleFault3">
-				<soap:fault
-					name="SimpleFault3"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults2">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault
-					name="SimpleFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault
-					name="SimpleFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="SimpleFault3">
-				<soap:fault
-					name="SimpleFault3"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults3">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault
-					name="SimpleFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl/fault1"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault
-					name="SimpleFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl/fault2"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMultipleFaults4">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<fault name="SimpleFault1">
-				<soap:fault
-					name="SimpleFault1"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<fault name="SimpleFault2">
-				<soap:fault
-					name="SimpleFault2"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</fault>
-			<soap:operation soapAction=""/>
-		</operation>
-
-	</binding>
-
-	<service name="SimpleRpcEncService">
-		<port name="SimpleRpcEncPort" binding="tns:SimpleRpcEncBinding">
-			<soap:address location="test://"/>
-		</port>
-	</service>
-</definitions>
-
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.inc
deleted file mode 100644
index cf6c3741c6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class SOAP_Interop_GroupH {
-
-    function echoVersionMismatchFault()
-    {
-    }
-
-    function echoMustUnderstandFault()
-    {
-    }
-
-    function HeaderRequest($string)
-    {
-    }
-
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupH_soapfault.wsdl");
-$server->setClass("SOAP_Interop_GroupH");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.wsdl b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.wsdl
deleted file mode 100644
index 4f49b8f1b2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_soapfault.wsdl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://soapinterop.org/wsdl"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns2="http://soapinterop.org/types"
-	targetNamespace="http://soapinterop.org/wsdl">
-
-	<message name="echoVoidRequest"/>
-	<message name="echoVoidResponse"/>
-	<message name="HeaderRequest">
-		<part name="param" type="xsd:string"/>
-	</message>
-
-	<portType name="SOAPFaultPortType">
-		<operation name="echoVersionMismatchFault" parameterOrder="">
-			<input message="tns:echoVoidRequest"/>
-			<output message="tns:echoVoidResponse"/>
-		</operation>
-
-		<operation name="echoMustUnderstandFault" parameterOrder="">
-			<input message="tns:echoVoidRequest"/>
-			<output message="tns:echoVoidResponse"/>
-		</operation>
-	</portType>
-
-	<binding name="SOAPFaultBinding" type="tns:SOAPFaultPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-		<!--
-			If the server receives an envelope with an incorrect
-			namespace, then a fault with VersionMismatch fault code
-			is populated in the SOAP response
-		-->
-		<operation name="echoVersionMismatchFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<soap:operation soapAction=""/>
-		</operation>
-
-		<operation name="echoMustUnderstandFault">
-			<input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-				<soap:header
-					message="tns:HeaderRequest"
-					part="param"
-					use="encoded"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					use="encoded"
-					namespace="http://soapinterop.org/wsdl"/>
-			</output>
-			<soap:operation soapAction=""/>
-		</operation>
-
-	</binding>
-
-	<service name="SOAPFaultService">
-		<port name="SOAPFaultPort" binding="tns:SOAPFaultBinding">
-			<soap:address location="test://"/>
-		</port>
-	</service>
-</definitions>
-
-
diff --git a/ext/soap/tests/interop/Round4/GroupH/skipif.inc b/ext/soap/tests/interop/Round4/GroupH/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupH/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt
deleted file mode 100644
index 2ed20e94b3..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 001 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoVoid();
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoVoid/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoVoidResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt
deleted file mode 100644
index 27ff0fcc6b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 002 (php/wsdl): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoInteger(array("inputInteger"=>22));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoInteger><ns1:inputInteger>22</ns1:inputInteger></ns1:echoInteger></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoIntegerResponse><ns1:return>22</ns1:return></ns1:echoIntegerResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt
deleted file mode 100644
index 29ea32c000..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 003 (php/wsdl): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoFloat(array("inputFloat"=>12.345));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoFloat><ns1:inputFloat>12.345</ns1:inputFloat></ns1:echoFloat></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoFloatResponse><ns1:return>12.345</ns1:return></ns1:echoFloatResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt
deleted file mode 100644
index 3e765bbdc1..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 004 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(array("inputString"=>"Hello World"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoString><ns1:inputString>Hello World</ns1:inputString></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoStringResponse><ns1:return>Hello World</ns1:return></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt
deleted file mode 100644
index 6960190b65..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 005 (php/wsdl): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoString(array());
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoString/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoStringResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt
deleted file mode 100644
index 85ae009031..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt
+++ /dev/null
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt
deleted file mode 100644
index ddde658fb6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 007 (php/wsdl): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDate(array("inputDate"=>"2002-12-22T21:41:17Z"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoDate><ns1:inputDate>2002-12-22T21:41:17Z</ns1:inputDate></ns1:echoDate></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoDateResponse><ns1:return>2002-12-22T21:41:17Z</ns1:return></ns1:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt
deleted file mode 100644
index 23dc33bdcd..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 008 (php/wsdl): echoComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexType(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexType><ns2:inputComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:inputComplexType></ns2:echoComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return></ns2:echoComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt
deleted file mode 100644
index 9182029fbf..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 009 (php/wsdl): echoComplexType(minOccur=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-unset($struct->varString);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexType(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexType><ns2:inputComplexType><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns2:inputComplexType></ns2:echoComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns2:return></ns2:echoComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt
deleted file mode 100644
index bb6e77f3f0..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 010 (php/wsdl): echoIntegerMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoIntegerMultiOccurs(array("inputIntegerMultiOccurs"=>array(22,29,36)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoIntegerMultiOccurs><ns1:inputIntegerMultiOccurs><ns1:int>22</ns1:int><ns1:int>29</ns1:int><ns1:int>36</ns1:int></ns1:inputIntegerMultiOccurs></ns1:echoIntegerMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoIntegerMultiOccursResponse><ns1:return>22</ns1:return><ns1:return>29</ns1:return><ns1:return>36</ns1:return></ns1:echoIntegerMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt
deleted file mode 100644
index 4b268a7d49..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 011 (php/wsdl): echoFloatMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoFloatMultiOccurs(array("inputFloatMultiOccurs"=>array(22.5,12.345)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoFloatMultiOccurs><ns1:inputFloatMultiOccurs><ns1:float>22.5</ns1:float><ns1:float>12.345</ns1:float></ns1:inputFloatMultiOccurs></ns1:echoFloatMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoFloatMultiOccursResponse><ns1:return>22.5</ns1:return><ns1:return>12.345</ns1:return></ns1:echoFloatMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt
deleted file mode 100644
index c2c47f4c70..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 012 (php/wsdl): echoStringMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringMultiOccurs(array("inputStringMultiOccurs"=>array("arg1","arg2","arg3")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoStringMultiOccurs><ns1:inputStringMultiOccurs><ns1:string>arg1</ns1:string><ns1:string>arg2</ns1:string><ns1:string>arg3</ns1:string></ns1:inputStringMultiOccurs></ns1:echoStringMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoStringMultiOccursResponse><ns1:return>arg1</ns1:return><ns1:return>arg2</ns1:return><ns1:return>arg3</ns1:return></ns1:echoStringMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt
deleted file mode 100644
index a42f79f867..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 013 (php/wsdl): echoStringMultiOccurs(nil)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStringMultiOccurs(array("inputStringMultiOccurs"=>array("arg1",NULL,"arg3")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><SOAP-ENV:Body><ns1:echoStringMultiOccurs><ns1:inputStringMultiOccurs><ns1:string>arg1</ns1:string><ns1:string xsi:nil="true"/><ns1:string>arg3</ns1:string></ns1:inputStringMultiOccurs></ns1:echoStringMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoStringMultiOccursResponse><ns1:return>arg1</ns1:return><ns1:return/><ns1:return>arg3</ns1:return></ns1:echoStringMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
deleted file mode 100644
index 0da7004009..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 014 (php/wsdl): echoComplexTypeMultiOccurs(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct,$struct,$struct)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeMultiOccurs><ns2:inputComplexTypeMultiOccurs><ns2:SOAPComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:SOAPComplexType><ns2:SOAPComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:SOAPComplexType><ns2:SOAPComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:SOAPComplexType></ns2:inputComplexTypeMultiOccurs></ns2:echoComplexTypeMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeMultiOccursResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return></ns2:echoComplexTypeMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
deleted file mode 100644
index 63f551448e..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 015 (php/wsdl): echoComplexTypeMultiOccurs(nil)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct,null,$struct)));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><SOAP-ENV:Body><ns2:echoComplexTypeMultiOccurs><ns2:inputComplexTypeMultiOccurs><ns2:SOAPComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:SOAPComplexType><ns2:SOAPComplexType xsi:nil="true"/><ns2:SOAPComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:SOAPComplexType></ns2:inputComplexTypeMultiOccurs></ns2:echoComplexTypeMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeMultiOccursResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return><ns2:return/><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return></ns2:echoComplexTypeMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt
deleted file mode 100644
index a5f060cae1..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 016 (php/wsdl): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoDecimal(array("inputDecimal"=>"123456789.123456789"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoDecimal><ns1:inputDecimal>123456789.123456789</ns1:inputDecimal></ns1:echoDecimal></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoDecimalResponse><ns1:return>123456789.123456789</ns1:return></ns1:echoDecimalResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt
deleted file mode 100644
index 08900ac5e5..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 017 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoBoolean(array("inputBoolean"=>true));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoBoolean><ns1:inputBoolean>true</ns1:inputBoolean></ns1:echoBoolean></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoBooleanResponse><ns1:return>true</ns1:return></ns1:echoBooleanResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt
deleted file mode 100644
index 73b5b68ba8..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 018 (php/wsdl): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoHexBinary(array("inputHexBinary"=>"\x80\xFF\x00\x01\x7F"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoHexBinary><ns1:inputHexBinary>80FF00017F</ns1:inputHexBinary></ns1:echoHexBinary></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoHexBinaryResponse><ns1:return>80FF00017F</ns1:return></ns1:echoHexBinaryResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt
deleted file mode 100644
index 4b81f6e674..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 019 (php/wsdl): echoComplexTypeAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeAsSimpleTypes(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeAsSimpleTypes><ns2:inputComplexType><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:inputComplexType></ns2:echoComplexTypeAsSimpleTypes></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoComplexTypeAsSimpleTypesResponse><ns1:outputString>arg</ns1:outputString><ns1:outputInteger>34</ns1:outputInteger><ns1:outputFloat>325.325</ns1:outputFloat></ns1:echoComplexTypeAsSimpleTypesResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt
deleted file mode 100644
index afc8ece102..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 020 (php/wsdl): echoComplexTypeAsSimpleTypes(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-unset($struct->varString);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeAsSimpleTypes(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoComplexTypeAsSimpleTypes><ns2:inputComplexType><ns1:varInt>34</ns1:varInt><ns1:varFloat>325.325</ns1:varFloat></ns2:inputComplexType></ns2:echoComplexTypeAsSimpleTypes></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoComplexTypeAsSimpleTypesResponse><ns1:outputInteger>34</ns1:outputInteger><ns1:outputFloat>325.325</ns1:outputFloat></ns1:echoComplexTypeAsSimpleTypesResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt
deleted file mode 100644
index cd92d5116a..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 021 (php/wsdl): echoSimpleTypesAsComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoSimpleTypesAsComplexType(array("inputInteger"=>34,
-                                            "inputFloat"=>12.345,
-                                            "inputString"=>"arg"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoSimpleTypesAsComplexType><ns1:inputString>arg</ns1:inputString><ns1:inputInteger>34</ns1:inputInteger><ns1:inputFloat>12.345</ns1:inputFloat></ns1:echoSimpleTypesAsComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoSimpleTypesAsComplexTypeResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>12.345</ns1:varFloat></ns2:return></ns2:echoSimpleTypesAsComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt
deleted file mode 100644
index cd408dfb4c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 022 (php/wsdl): echoSimpleTypesAsComplexType(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoSimpleTypesAsComplexType(array("inputInteger"=>34,
-                                            "inputFloat"=>12.345));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoSimpleTypesAsComplexType><ns1:inputInteger>34</ns1:inputInteger><ns1:inputFloat>12.345</ns1:inputFloat></ns1:echoSimpleTypesAsComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoSimpleTypesAsComplexTypeResponse><ns2:return><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:return></ns2:echoSimpleTypesAsComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt
deleted file mode 100644
index d960748ce8..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 023 (php/wsdl): echoNestedComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-class SOAPComplexTypeComplexType {
-    function SOAPComplexTypeComplexType($s, $i, $f, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-        $this->varComplexType = $c;
-    }
-}
-$struct = new SOAPComplexTypeComplexType("arg",34,12.345,new SOAPComplexType("arg",43,54.321));
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoNestedComplexType(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedComplexType><ns2:inputComplexType><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat><ns1:varComplexType><ns1:varInt>43</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>54.321</ns1:varFloat></ns1:varComplexType></ns2:inputComplexType></ns2:echoNestedComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedComplexTypeResponse><ns2:return><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat><ns1:varComplexType><ns1:varInt>43</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>54.321</ns1:varFloat></ns1:varComplexType></ns2:return></ns2:echoNestedComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt
deleted file mode 100644
index 4152b992c7..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 024 (php/wsdl): echoNestedComplexType(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexTypeComplexType {
-    function SOAPComplexTypeComplexType($s, $i, $f, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-        $this->varComplexType = $c;
-    }
-}
-$struct = new SOAPComplexTypeComplexType("arg",34,12.345,NULL);
-unset($struct->varComplexType);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoNestedComplexType(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedComplexType><ns2:inputComplexType><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:inputComplexType></ns2:echoNestedComplexType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedComplexTypeResponse><ns2:return><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:return></ns2:echoNestedComplexTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt
deleted file mode 100644
index cba1d1c667..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 025 (php/wsdl): echoNestedMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPMultiOccursComplexType {
-    function SOAPMultiOccursComplexType($s, $i, $f, $c) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-        $this->varMultiOccurs = $c;
-    }
-}
-$struct = new SOAPMultiOccursComplexType("arg",34,12.345,array("red","green","blue"));
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoNestedMultiOccurs(array("inputComplexType"=>$struct));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedMultiOccurs><ns2:inputComplexType><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat><ns1:varMultiOccurs><ns1:string>red</ns1:string><ns1:string>green</ns1:string><ns1:string>blue</ns1:string></ns1:varMultiOccurs></ns2:inputComplexType></ns2:echoNestedMultiOccurs></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoNestedMultiOccursResponse><ns2:return><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat><ns1:varMultiOccurs><ns1:string>red</ns1:string><ns1:string>green</ns1:string><ns1:string>blue</ns1:string></ns1:varMultiOccurs></ns2:return></ns2:echoNestedMultiOccursResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt
deleted file mode 100644
index 07e24f52c6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 026 (php/wsdl): echoChoice
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoChoice(array("inputChoice"=>(object)array("name1"=>"Hello World")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoChoice><ns2:inputChoice><ns1:name1>Hello World</ns1:name1></ns2:inputChoice></ns2:echoChoice></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoChoiceResponse><ns2:return><ns1:name1>Hello World</ns1:name1></ns2:return></ns2:echoChoiceResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt
deleted file mode 100644
index e4a270a21c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 027 (php/wsdl): echoEnum
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoEnum(array("inputEnum"=>"bitTwo"));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoEnum><ns1:inputEnum>bitTwo</ns1:inputEnum></ns1:echoEnum></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoEnumResponse><ns1:return>bitTwo</ns1:return></ns1:echoEnumResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt
deleted file mode 100644
index b9e13e2fb6..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 028 (php/wsdl): echoAnyType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class SOAPComplexType {
-    function SOAPComplexType($s, $i, $f) {
-        $this->varString = $s;
-        $this->varInt = $i;
-        $this->varFloat = $f;
-    }
-}
-$struct = new SOAPComplexType('arg',34,325.325);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoAnyType(array('inputAnyType'=>new SoapVar($struct,SOAP_ENC_OBJECT,"SOAPComplexType","http://soapinterop.org/xsd")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoAnyType><ns2:inputAnyType xsi:type="ns1:SOAPComplexType"><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:inputAnyType></ns2:echoAnyType></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Body><ns2:echoAnyTypeResponse><ns2:return xsi:type="ns1:SOAPComplexType"><ns1:varInt>34</ns1:varInt><ns1:varString>arg</ns1:varString><ns1:varFloat>325.325</ns1:varFloat></ns2:return></ns2:echoAnyTypeResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt
deleted file mode 100644
index fad222179c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 029 (php/wsdl): echoAnyElement
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoAnyElement(array("inputAny"=>array("any"=>"<bold>Hello World</bold>")));
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoAnyElement><ns1:inputAny><bold>Hello World</bold></ns1:inputAny></ns1:echoAnyElement></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Body><ns1:echoAnyElementResponse><ns1:return><bold>Hello World</bold></ns1:return></ns1:echoAnyElementResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt
deleted file mode 100644
index d7f748743c..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 030 (php/wsdl): echoVoidSoapHeader(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array("varString"=>"Hello World"), 1);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/echoheader/" xmlns:ns3="http://soapinterop.org/"><SOAP-ENV:Header><ns3:echoMeStringRequest SOAP-ENV:mustUnderstand="1"><ns2:varString>Hello World</ns2:varString></ns3:echoMeStringRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/echoheader/" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeStringResponse><ns1:varString>Hello World</ns1:varString></ns2:echoMeStringResponse></SOAP-ENV:Header><SOAP-ENV:Body><ns2:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt
deleted file mode 100644
index b4273bf54b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 031 (php/wsdl): echoVoidSoapHeader(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array(), 1);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeStringRequest SOAP-ENV:mustUnderstand="1"/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/"><SOAP-ENV:Header><ns1:echoMeStringResponse/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt
deleted file mode 100644
index ffd18e3df3..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 032 (php/wsdl): echoVoidSoapHeader(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varString"=>"arg","varFloat"=>12.345), 1);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/echoheader/" xmlns:ns3="http://soapinterop.org/"><SOAP-ENV:Header><ns3:echoMeComplexTypeRequest SOAP-ENV:mustUnderstand="1"><ns2:varString>arg</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>12.345</ns2:varFloat></ns3:echoMeComplexTypeRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/echoheader/" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeComplexTypeResponse><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:echoMeComplexTypeResponse></SOAP-ENV:Header><SOAP-ENV:Body><ns2:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt
deleted file mode 100644
index 3c024fc002..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 033 (php/wsdl): echoVoidSoapHeader(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varFloat"=>12.345), 1);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/echoheader/" xmlns:ns3="http://soapinterop.org/"><SOAP-ENV:Header><ns3:echoMeComplexTypeRequest SOAP-ENV:mustUnderstand="1"><ns2:varInt>34</ns2:varInt><ns2:varFloat>12.345</ns2:varFloat></ns3:echoMeComplexTypeRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/echoheader/" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeComplexTypeResponse><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:echoMeComplexTypeResponse></SOAP-ENV:Header><SOAP-ENV:Body><ns2:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt
deleted file mode 100644
index d3cec8cda7..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 034 (php/wsdl): echoVoidSoapHeader(5)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array("varString"=>"Hello World"), 1, SOAP_ACTOR_NEXT);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/echoheader/" xmlns:ns3="http://soapinterop.org/"><SOAP-ENV:Header><ns3:echoMeStringRequest SOAP-ENV:mustUnderstand="1" SOAP-ENV:actor="http://schemas.xmlsoap.org/soap/actor/next"><ns2:varString>Hello World</ns2:varString></ns3:echoMeStringRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/echoheader/" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeStringResponse><ns1:varString>Hello World</ns1:varString></ns2:echoMeStringResponse></SOAP-ENV:Header><SOAP-ENV:Body><ns2:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt
deleted file mode 100644
index 6dc0b927ff..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Interop Round4 GroupI XSD 035 (php/wsdl): echoVoidSoapHeader(6)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varString"=>"arg","varFloat"=>12.345), 1, SOAP_ACTOR_NEXT);
-$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoVoidSoapHeader",array(),null,$hdr);
-echo $client->__getlastrequest();
-$HTTP_RAW_POST_DATA = $client->__getlastrequest();
-include("round4_groupI_xsd.inc");
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org" xmlns:ns2="http://soapinterop.org/echoheader/" xmlns:ns3="http://soapinterop.org/"><SOAP-ENV:Header><ns3:echoMeComplexTypeRequest SOAP-ENV:mustUnderstand="1" SOAP-ENV:actor="http://schemas.xmlsoap.org/soap/actor/next"><ns2:varString>arg</ns2:varString><ns2:varInt>34</ns2:varInt><ns2:varFloat>12.345</ns2:varFloat></ns3:echoMeComplexTypeRequest></SOAP-ENV:Header><SOAP-ENV:Body><ns1:echoVoidSoapHeader/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/echoheader/" xmlns:ns2="http://soapinterop.org/"><SOAP-ENV:Header><ns2:echoMeComplexTypeResponse><ns1:varString>arg</ns1:varString><ns1:varInt>34</ns1:varInt><ns1:varFloat>12.345</ns1:varFloat></ns2:echoMeComplexTypeResponse></SOAP-ENV:Header><SOAP-ENV:Body><ns2:echoVoidSoapHeaderResponse/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc
deleted file mode 100644
index 0c50f199e4..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-class SOAP_Interop_GroupI {
-
-    function echoString($inputString)
-    {
-    	if (isset($inputString->inputString)) {
-	      return array("return"=>$inputString->inputString);
-	    } else {
-	      return $inputString;
-	    }
-    }
-
-    function echoInteger($inputInteger)
-    {
-      return array("return"=>$inputInteger->inputInteger);
-    }
-
-    function echoFloat($inputFloat)
-    {
-      return array("return"=>$inputFloat->inputFloat);
-    }
-
-    function echoVoid()
-    {
-    }
-
-    function echoBase64($inputBase64)
-    {
-    	if (isset($inputBase64->inputBase64)) {
-	      return array("return"=>$inputBase64->inputBase64);
-	    } else {
-	      return $inputBase64;
-	    }
-    }
-
-    function echoDate($timeInstant)
-    {
-      return array("return"=>$timeInstant->inputDate);
-    }
-
-    function echoComplexType($inputComplexType)
-    {
-    	if (isset($inputComplexType->inputComplexType)) {
-	      return array("return"=>$inputComplexType->inputComplexType);
-	    } else {
-	      return $inputComplexType;
-	    }
-    }
-
-    function echoIntegerMultiOccurs($input)
-    {
-    	if (isset($input->inputIntegerMultiOccurs->int)) {
-	      return array("return"=>$input->inputIntegerMultiOccurs->int);
-	    } else {
-	      return array();
-	    }
-    }
-
-    function echoFloatMultiOccurs($input)
-    {
-    	if (isset($input->inputFloatMultiOccurs->float)) {
-	      return array("return"=>$input->inputFloatMultiOccurs->float);
-	    } else {
-	      return array();
-	    }
-    }
-
-    function echoStringMultiOccurs($input)
-    {
-    	if (isset($input->inputStringMultiOccurs->string)) {
-	      return array("return"=>$input->inputStringMultiOccurs->string);
-	    } else {
-	      return array();
-	    }
-    }
-
-    function echoComplexTypeMultiOccurs($input)
-    {
-    	if (isset($input->inputComplexTypeMultiOccurs->SOAPComplexType)) {
-	      return array("return"=>$input->inputComplexTypeMultiOccurs->SOAPComplexType);
-	    } else {
-	      return array();
-	    }
-    }
-
-    function echoHexBinary($hb)
-    {
-    	if (isset($hb->inputHexBinary)) {
-	      return array("return"=>$hb->inputHexBinary);
-	    } else {
-	      return $hb;
-	    }
-    }
-
-    function echoDecimal($dec)
-    {
-      return array("return"=>$dec->inputDecimal);
-    }
-
-    function echoBoolean($boolean)
-    {
-      return array("return"=>$boolean->inputBoolean);
-    }
-
-    function echoComplexTypeAsSimpleTypes($input) 
-    {
-    	if (isset($input->inputComplexType)) {
-    	  $ret = array("outputInteger" => $input->inputComplexType->varInt,
-    	               "outputFloat"   => $input->inputComplexType->varFloat);
-    	  if (isset($input->inputComplexType->varString)) {
-    	    $ret["outputString"] = $input->inputComplexType->varString;
-    	  }
-	      return $ret;
-	    } else {
-	      return array();
-	    }
-	  }
-
-    function echoSimpleTypesAsComplexType($input) 
-    {
-   	  $ret = array("varInt"   => $input->inputInteger,
-   	               "varFloat" => $input->inputFloat);
-   	  if (isset($input->inputString)) {
-   	    $ret["varString"] = $input->inputString;
-   	  }
-   	  return array("return"=>$ret);
-    }
-
-    function echoNestedComplexType($inputComplexType)
-    {
-    	if (isset($inputComplexType->inputComplexType)) {
-	      return array("return"=>$inputComplexType->inputComplexType);
-	    } else {
-	      return $inputComplexType;
-	    }
-    }
-
-    function echoNestedMultiOccurs($inputComplexType)
-    {
-    	if (isset($inputComplexType->inputComplexType)) {
-	      return array("return"=>$inputComplexType->inputComplexType);
-	    } else {
-	      return $inputComplexType;
-	    }
-    }
-
-    function echoChoice($input)
-    {
-    	if (isset($input->inputChoice)) {
-	      return array("return"=>$input->inputChoice);
-	    } else {
-	      return $input;
-	    }
-    }
-
-    function echoEnum($input)
-    {
-      return array("return"=>$input->inputEnum);
-    }
-
-    function echoAnyType($input)
-    {
-    	if (isset($input->inputAnyType)) {
-	      return array("return"=>$input->inputAnyType);
-	    } else {
-	      return $input;
-	    }
-    }
-
-    function echoAnyElement($input)
-    {
-    	if (isset($input->inputAny)) {
-	      return array("return"=>$input->inputAny);
-	    } else {
-	      return $input;
-	    }
-    }
-
-    function echoVoidSoapHeader()
-    {
-    }
-
-    function echoMeStringRequest($input)
-    {
-      return new SoapHeader("http://soapinterop.org/","echoMeStringResponse",$input);
-    }
-
-    function echoMeComplexTypeRequest($input)
-    {
-      return new SoapHeader("http://soapinterop.org/","echoMeComplexTypeResponse",$input);
-    }
-
-}
-
-$server = new SoapServer(dirname(__FILE__)."/round4_groupI_xsd.wsdl");
-$server->setClass("SOAP_Interop_GroupI");
-$server->handle();
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl
deleted file mode 100644
index b62084669b..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl
+++ /dev/null
@@ -1,1113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:s1="http://soapinterop.org/xsd" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://soapinterop.org/" xmlns:s3="http://soapinterop.org/echoheader/" xmlns:soap12enc="http://www.w3.org/2002/06/soap-envelope" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s2="http://soapinterop.org" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://soapinterop.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/">
-      <s:import namespace="http://soapinterop.org/xsd" />
-      <s:import namespace="http://soapinterop.org/echoheader/" />
-      <s:element name="echoVoid">
-        <s:complexType />
-      </s:element>
-      <s:element name="echoVoidResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="echoInteger">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputInteger" type="s:int" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoIntegerResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s:int" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoFloat">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputFloat" type="s:float" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoFloatResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s:float" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoString">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputString" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoStringResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoBase64">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputBase64" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoBase64Response">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoDate">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputDate" type="s:dateTime" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoDateResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s:dateTime" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoComplexType">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputComplexType" type="s1:SOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoComplexTypeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s1:SOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoIntegerMultiOccurs">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputIntegerMultiOccurs" type="s0:ArrayOfInt" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfInt">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="int" type="s:int" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="echoIntegerMultiOccursResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="unbounded" name="return" type="s:int" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoFloatMultiOccurs">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputFloatMultiOccurs" type="s0:ArrayOfFloat" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfFloat">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="float" type="s:float" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="echoFloatMultiOccursResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="unbounded" name="return" type="s:float" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoStringMultiOccurs">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputStringMultiOccurs" type="s0:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfString">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="echoStringMultiOccursResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="unbounded" name="return" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoComplexTypeMultiOccurs">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputComplexTypeMultiOccurs" type="s1:ArrayOfSOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="SOAPComplexType" nillable="true" type="s1:SOAPComplexType" />
-      <s:element name="echoComplexTypeMultiOccursResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="unbounded" name="return" type="s1:SOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoDecimal">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputDecimal" type="s:decimal" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoDecimalResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s:decimal" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoBoolean">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputBoolean" type="s:boolean" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoBooleanResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s:boolean" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoHexBinary">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputHexBinary" type="s:hexBinary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoHexBinaryResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s:hexBinary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoComplexTypeAsSimpleTypes">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputComplexType" type="s1:SOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoComplexTypeAsSimpleTypesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="outputString" type="s:string" />
-            <s:element minOccurs="1" maxOccurs="1" name="outputInteger" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="outputFloat" type="s:float" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoSimpleTypesAsComplexType">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputString" type="s:string" />
-            <s:element minOccurs="1" maxOccurs="1" name="inputInteger" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="inputFloat" type="s:float" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoSimpleTypesAsComplexTypeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s1:SOAPComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoNestedComplexType">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputComplexType" type="s1:SOAPComplexTypeComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoNestedComplexTypeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s1:SOAPComplexTypeComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoNestedMultiOccurs">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputComplexType" type="s1:SOAPMultiOccursComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoNestedMultiOccursResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s1:SOAPMultiOccursComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoChoice">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputChoice" type="s1:ChoiceComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoChoiceResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" type="s1:ChoiceComplexType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoEnum">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="inputEnum" type="s1:Enum" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoEnumResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="return" type="s1:Enum" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoAnyType">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputAnyType" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoAnyTypeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoAnyElement">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="inputAny">
-              <s:complexType>
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoAnyElementResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="return">
-              <s:complexType>
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="echoVoidSoapHeaderResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="echoMeComplexTypeRequest" type="s3:echoMeComplexTypeRequest" />
-      <s:element name="echoMeStringRequest" type="s3:echoMeStringRequest" />
-      <s:element name="echoMeComplexTypeResponse" type="s3:echoMeComplexTypeResponse" />
-      <s:element name="echoMeStringResponse" type="s3:echoMeStringResponse" />
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/xsd">
-      <s:import namespace="http://soapinterop.org/" />
-      <s:complexType name="SOAPComplexType">
-        <s:sequence>
-          <s:element minOccurs="1" maxOccurs="1" name="varInt" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="varFloat" type="s:float" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfSOAPComplexType">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" ref="s0:SOAPComplexType" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="SOAPComplexTypeComplexType">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="varInt" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="varFloat" type="s:float" />
-          <s:element minOccurs="0" maxOccurs="1" name="varComplexType" type="s1:SOAPComplexType" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="SOAPMultiOccursComplexType">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="varInt" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="varFloat" type="s:float" />
-          <s:element minOccurs="0" maxOccurs="1" name="varMultiOccurs" type="s1:ArrayOfString" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfString">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ChoiceComplexType">
-        <s:sequence>
-          <s:choice minOccurs="1" maxOccurs="1">
-            <s:element minOccurs="0" maxOccurs="1" name="name0" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="name1" type="s:string" />
-          </s:choice>
-        </s:sequence>
-      </s:complexType>
-      <s:simpleType name="Enum">
-        <s:restriction base="s:string">
-          <s:enumeration value="BitOne" />
-          <s:enumeration value="BitTwo" />
-          <s:enumeration value="BitThree" />
-          <s:enumeration value="BitFour" />
-          <s:enumeration value="BitFive" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org">
-      <s:element name="echoVoidSoapHeader">
-        <s:complexType />
-      </s:element>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/echoheader/">
-      <s:complexType name="echoMeComplexTypeRequest">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="varInt" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="varFloat" type="s:float" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="echoMeStringRequest">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="echoMeComplexTypeResponse">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="varInt" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="varFloat" type="s:float" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="echoMeStringResponse">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="varString" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-    </s:schema>
-  </types>
-  <message name="echoVoidSoapIn">
-    <part name="parameters" element="s0:echoVoid" />
-  </message>
-  <message name="echoVoidSoapOut">
-    <part name="parameters" element="s0:echoVoidResponse" />
-  </message>
-  <message name="echoIntegerSoapIn">
-    <part name="parameters" element="s0:echoInteger" />
-  </message>
-  <message name="echoIntegerSoapOut">
-    <part name="parameters" element="s0:echoIntegerResponse" />
-  </message>
-  <message name="echoFloatSoapIn">
-    <part name="parameters" element="s0:echoFloat" />
-  </message>
-  <message name="echoFloatSoapOut">
-    <part name="parameters" element="s0:echoFloatResponse" />
-  </message>
-  <message name="echoStringSoapIn">
-    <part name="parameters" element="s0:echoString" />
-  </message>
-  <message name="echoStringSoapOut">
-    <part name="parameters" element="s0:echoStringResponse" />
-  </message>
-  <message name="echoBase64SoapIn">
-    <part name="parameters" element="s0:echoBase64" />
-  </message>
-  <message name="echoBase64SoapOut">
-    <part name="parameters" element="s0:echoBase64Response" />
-  </message>
-  <message name="echoDateSoapIn">
-    <part name="parameters" element="s0:echoDate" />
-  </message>
-  <message name="echoDateSoapOut">
-    <part name="parameters" element="s0:echoDateResponse" />
-  </message>
-  <message name="echoComplexTypeSoapIn">
-    <part name="parameters" element="s0:echoComplexType" />
-  </message>
-  <message name="echoComplexTypeSoapOut">
-    <part name="parameters" element="s0:echoComplexTypeResponse" />
-  </message>
-  <message name="echoIntegerMultiOccursSoapIn">
-    <part name="parameters" element="s0:echoIntegerMultiOccurs" />
-  </message>
-  <message name="echoIntegerMultiOccursSoapOut">
-    <part name="parameters" element="s0:echoIntegerMultiOccursResponse" />
-  </message>
-  <message name="echoFloatMultiOccursSoapIn">
-    <part name="parameters" element="s0:echoFloatMultiOccurs" />
-  </message>
-  <message name="echoFloatMultiOccursSoapOut">
-    <part name="parameters" element="s0:echoFloatMultiOccursResponse" />
-  </message>
-  <message name="echoStringMultiOccursSoapIn">
-    <part name="parameters" element="s0:echoStringMultiOccurs" />
-  </message>
-  <message name="echoStringMultiOccursSoapOut">
-    <part name="parameters" element="s0:echoStringMultiOccursResponse" />
-  </message>
-  <message name="echoComplexTypeMultiOccursSoapIn">
-    <part name="parameters" element="s0:echoComplexTypeMultiOccurs" />
-  </message>
-  <message name="echoComplexTypeMultiOccursSoapOut">
-    <part name="parameters" element="s0:echoComplexTypeMultiOccursResponse" />
-  </message>
-  <message name="echoDecimalSoapIn">
-    <part name="parameters" element="s0:echoDecimal" />
-  </message>
-  <message name="echoDecimalSoapOut">
-    <part name="parameters" element="s0:echoDecimalResponse" />
-  </message>
-  <message name="echoBooleanSoapIn">
-    <part name="parameters" element="s0:echoBoolean" />
-  </message>
-  <message name="echoBooleanSoapOut">
-    <part name="parameters" element="s0:echoBooleanResponse" />
-  </message>
-  <message name="echoHexBinarySoapIn">
-    <part name="parameters" element="s0:echoHexBinary" />
-  </message>
-  <message name="echoHexBinarySoapOut">
-    <part name="parameters" element="s0:echoHexBinaryResponse" />
-  </message>
-  <message name="echoComplexTypeAsSimpleTypesSoapIn">
-    <part name="parameters" element="s0:echoComplexTypeAsSimpleTypes" />
-  </message>
-  <message name="echoComplexTypeAsSimpleTypesSoapOut">
-    <part name="parameters" element="s0:echoComplexTypeAsSimpleTypesResponse" />
-  </message>
-  <message name="echoSimpleTypesAsComplexTypeSoapIn">
-    <part name="parameters" element="s0:echoSimpleTypesAsComplexType" />
-  </message>
-  <message name="echoSimpleTypesAsComplexTypeSoapOut">
-    <part name="parameters" element="s0:echoSimpleTypesAsComplexTypeResponse" />
-  </message>
-  <message name="echoNestedComplexTypeSoapIn">
-    <part name="parameters" element="s0:echoNestedComplexType" />
-  </message>
-  <message name="echoNestedComplexTypeSoapOut">
-    <part name="parameters" element="s0:echoNestedComplexTypeResponse" />
-  </message>
-  <message name="echoNestedMultiOccursSoapIn">
-    <part name="parameters" element="s0:echoNestedMultiOccurs" />
-  </message>
-  <message name="echoNestedMultiOccursSoapOut">
-    <part name="parameters" element="s0:echoNestedMultiOccursResponse" />
-  </message>
-  <message name="echoChoiceSoapIn">
-    <part name="parameters" element="s0:echoChoice" />
-  </message>
-  <message name="echoChoiceSoapOut">
-    <part name="parameters" element="s0:echoChoiceResponse" />
-  </message>
-  <message name="echoEnumSoapIn">
-    <part name="parameters" element="s0:echoEnum" />
-  </message>
-  <message name="echoEnumSoapOut">
-    <part name="parameters" element="s0:echoEnumResponse" />
-  </message>
-  <message name="echoAnyTypeSoapIn">
-    <part name="parameters" element="s0:echoAnyType" />
-  </message>
-  <message name="echoAnyTypeSoapOut">
-    <part name="parameters" element="s0:echoAnyTypeResponse" />
-  </message>
-  <message name="echoAnyElementSoapIn">
-    <part name="parameters" element="s0:echoAnyElement" />
-  </message>
-  <message name="echoAnyElementSoapOut">
-    <part name="parameters" element="s0:echoAnyElementResponse" />
-  </message>
-  <message name="echoVoidSoapHeaderSoapIn">
-    <part name="parameters" element="s2:echoVoidSoapHeader" />
-  </message>
-  <message name="echoVoidSoapHeaderSoapOut">
-    <part name="parameters" element="s0:echoVoidSoapHeaderResponse" />
-  </message>
-  <message name="echoVoidSoapHeaderechoMeComplexTypeRequest">
-    <part name="echoMeComplexTypeRequest" element="s0:echoMeComplexTypeRequest" />
-  </message>
-  <message name="echoVoidSoapHeaderechoMeComplexTypeResponse">
-    <part name="echoMeComplexTypeResponse" element="s0:echoMeComplexTypeResponse" />
-  </message>
-  <message name="echoVoidSoapHeaderechoMeStringRequest">
-    <part name="echoMeStringRequest" element="s0:echoMeStringRequest" />
-  </message>
-  <message name="echoVoidSoapHeaderechoMeStringResponse">
-    <part name="echoMeStringResponse" element="s0:echoMeStringResponse" />
-  </message>
-  <portType name="Round4XSDTestSoap">
-    <operation name="echoVoid">
-      <input message="s0:echoVoidSoapIn" />
-      <output message="s0:echoVoidSoapOut" />
-    </operation>
-    <operation name="echoInteger">
-      <input message="s0:echoIntegerSoapIn" />
-      <output message="s0:echoIntegerSoapOut" />
-    </operation>
-    <operation name="echoFloat">
-      <input message="s0:echoFloatSoapIn" />
-      <output message="s0:echoFloatSoapOut" />
-    </operation>
-    <operation name="echoString">
-      <input message="s0:echoStringSoapIn" />
-      <output message="s0:echoStringSoapOut" />
-    </operation>
-    <operation name="echoBase64">
-      <input message="s0:echoBase64SoapIn" />
-      <output message="s0:echoBase64SoapOut" />
-    </operation>
-    <operation name="echoDate">
-      <input message="s0:echoDateSoapIn" />
-      <output message="s0:echoDateSoapOut" />
-    </operation>
-    <operation name="echoComplexType">
-      <input message="s0:echoComplexTypeSoapIn" />
-      <output message="s0:echoComplexTypeSoapOut" />
-    </operation>
-    <operation name="echoIntegerMultiOccurs">
-      <input message="s0:echoIntegerMultiOccursSoapIn" />
-      <output message="s0:echoIntegerMultiOccursSoapOut" />
-    </operation>
-    <operation name="echoFloatMultiOccurs">
-      <input message="s0:echoFloatMultiOccursSoapIn" />
-      <output message="s0:echoFloatMultiOccursSoapOut" />
-    </operation>
-    <operation name="echoStringMultiOccurs">
-      <input message="s0:echoStringMultiOccursSoapIn" />
-      <output message="s0:echoStringMultiOccursSoapOut" />
-    </operation>
-    <operation name="echoComplexTypeMultiOccurs">
-      <input message="s0:echoComplexTypeMultiOccursSoapIn" />
-      <output message="s0:echoComplexTypeMultiOccursSoapOut" />
-    </operation>
-    <operation name="echoDecimal">
-      <input message="s0:echoDecimalSoapIn" />
-      <output message="s0:echoDecimalSoapOut" />
-    </operation>
-    <operation name="echoBoolean">
-      <input message="s0:echoBooleanSoapIn" />
-      <output message="s0:echoBooleanSoapOut" />
-    </operation>
-    <operation name="echoHexBinary">
-      <input message="s0:echoHexBinarySoapIn" />
-      <output message="s0:echoHexBinarySoapOut" />
-    </operation>
-    <operation name="echoComplexTypeAsSimpleTypes">
-      <input message="s0:echoComplexTypeAsSimpleTypesSoapIn" />
-      <output message="s0:echoComplexTypeAsSimpleTypesSoapOut" />
-    </operation>
-    <operation name="echoSimpleTypesAsComplexType">
-      <input message="s0:echoSimpleTypesAsComplexTypeSoapIn" />
-      <output message="s0:echoSimpleTypesAsComplexTypeSoapOut" />
-    </operation>
-    <operation name="echoNestedComplexType">
-      <input message="s0:echoNestedComplexTypeSoapIn" />
-      <output message="s0:echoNestedComplexTypeSoapOut" />
-    </operation>
-    <operation name="echoNestedMultiOccurs">
-      <input message="s0:echoNestedMultiOccursSoapIn" />
-      <output message="s0:echoNestedMultiOccursSoapOut" />
-    </operation>
-    <operation name="echoChoice">
-      <input message="s0:echoChoiceSoapIn" />
-      <output message="s0:echoChoiceSoapOut" />
-    </operation>
-    <operation name="echoEnum">
-      <input message="s0:echoEnumSoapIn" />
-      <output message="s0:echoEnumSoapOut" />
-    </operation>
-    <operation name="echoAnyType">
-      <input message="s0:echoAnyTypeSoapIn" />
-      <output message="s0:echoAnyTypeSoapOut" />
-    </operation>
-    <operation name="echoAnyElement">
-      <input message="s0:echoAnyElementSoapIn" />
-      <output message="s0:echoAnyElementSoapOut" />
-    </operation>
-    <operation name="echoVoidSoapHeader">
-      <input message="s0:echoVoidSoapHeaderSoapIn" />
-      <output message="s0:echoVoidSoapHeaderSoapOut" />
-    </operation>
-  </portType>
-  <binding name="Round4XSDTestSoap" type="s0:Round4XSDTestSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="echoVoid">
-      <soap:operation soapAction="http://soapinterop.org/echoVoid" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoInteger">
-      <soap:operation soapAction="http://soapinterop.org/echoInteger" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoFloat">
-      <soap:operation soapAction="http://soapinterop.org/echoFloat" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoString">
-      <soap:operation soapAction="http://soapinterop.org/echoString" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoBase64">
-      <soap:operation soapAction="http://soapinterop.org/echoBase64" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoDate">
-      <soap:operation soapAction="http://soapinterop.org/echoDate" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexType">
-      <soap:operation soapAction="http://soapinterop.org/echoComplexType" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoIntegerMultiOccurs">
-      <soap:operation soapAction="http://soapinterop.org/echoIntegerMultiOccurs" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoFloatMultiOccurs">
-      <soap:operation soapAction="http://soapinterop.org/echoFloatMultiOccurs" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoStringMultiOccurs">
-      <soap:operation soapAction="http://soapinterop.org/echoStringMultiOccurs" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexTypeMultiOccurs">
-      <soap:operation soapAction="http://soapinterop.org/echoComplexTypeMultiOccurs" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoDecimal">
-      <soap:operation soapAction="http://soapinterop.org/echoDecimal" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoBoolean">
-      <soap:operation soapAction="http://soapinterop.org/echoBoolean" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoHexBinary">
-      <soap:operation soapAction="http://soapinterop.org/echoHexBinary" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexTypeAsSimpleTypes">
-      <soap:operation soapAction="http://soapinterop.org/echoComplexTypeAsSimpleTypes" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoSimpleTypesAsComplexType">
-      <soap:operation soapAction="http://soapinterop.org/echoSimpleTypesAsComplexType" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoNestedComplexType">
-      <soap:operation soapAction="http://soapinterop.org/echoNestedComplexType" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoNestedMultiOccurs">
-      <soap:operation soapAction="http://soapinterop.org/echoNestedMultiOccurs" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoChoice">
-      <soap:operation soapAction="http://soapinterop.org/echoChoice" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoEnum">
-      <soap:operation soapAction="http://soapinterop.org/echoEnum" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoAnyType">
-      <soap:operation soapAction="http://soapinterop.org/echoAnyType" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoAnyElement">
-      <soap:operation soapAction="http://soapinterop.org/echoAnyElement" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoVoidSoapHeader">
-      <soap:operation soapAction="http://soapinterop.org" style="document" />
-      <input>
-        <soap:body use="literal" />
-        <soap:header message="s0:echoVoidSoapHeaderechoMeComplexTypeRequest" part="echoMeComplexTypeRequest" use="literal" />
-        <soap:header message="s0:echoVoidSoapHeaderechoMeStringRequest" part="echoMeStringRequest" use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-        <soap:header message="s0:echoVoidSoapHeaderechoMeComplexTypeResponse" part="echoMeComplexTypeResponse" use="literal" />
-        <soap:header message="s0:echoVoidSoapHeaderechoMeStringResponse" part="echoMeStringResponse" use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <binding name="Round4XSDTestSoap12" type="s0:Round4XSDTestSoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="echoVoid">
-      <soap12:operation soapAction="http://soapinterop.org/echoVoid" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoInteger">
-      <soap12:operation soapAction="http://soapinterop.org/echoInteger" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoFloat">
-      <soap12:operation soapAction="http://soapinterop.org/echoFloat" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoString">
-      <soap12:operation soapAction="http://soapinterop.org/echoString" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoBase64">
-      <soap12:operation soapAction="http://soapinterop.org/echoBase64" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoDate">
-      <soap12:operation soapAction="http://soapinterop.org/echoDate" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexType">
-      <soap12:operation soapAction="http://soapinterop.org/echoComplexType" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoIntegerMultiOccurs">
-      <soap12:operation soapAction="http://soapinterop.org/echoIntegerMultiOccurs" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoFloatMultiOccurs">
-      <soap12:operation soapAction="http://soapinterop.org/echoFloatMultiOccurs" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoStringMultiOccurs">
-      <soap12:operation soapAction="http://soapinterop.org/echoStringMultiOccurs" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexTypeMultiOccurs">
-      <soap12:operation soapAction="http://soapinterop.org/echoComplexTypeMultiOccurs" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoDecimal">
-      <soap12:operation soapAction="http://soapinterop.org/echoDecimal" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoBoolean">
-      <soap12:operation soapAction="http://soapinterop.org/echoBoolean" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoHexBinary">
-      <soap12:operation soapAction="http://soapinterop.org/echoHexBinary" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoComplexTypeAsSimpleTypes">
-      <soap12:operation soapAction="http://soapinterop.org/echoComplexTypeAsSimpleTypes" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoSimpleTypesAsComplexType">
-      <soap12:operation soapAction="http://soapinterop.org/echoSimpleTypesAsComplexType" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoNestedComplexType">
-      <soap12:operation soapAction="http://soapinterop.org/echoNestedComplexType" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoNestedMultiOccurs">
-      <soap12:operation soapAction="http://soapinterop.org/echoNestedMultiOccurs" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoChoice">
-      <soap12:operation soapAction="http://soapinterop.org/echoChoice" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoEnum">
-      <soap12:operation soapAction="http://soapinterop.org/echoEnum" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoAnyType">
-      <soap12:operation soapAction="http://soapinterop.org/echoAnyType" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoAnyElement">
-      <soap12:operation soapAction="http://soapinterop.org/echoAnyElement" style="document" />
-      <input>
-        <soap12:body use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-      </output>
-    </operation>
-    <operation name="echoVoidSoapHeader">
-      <soap12:operation soapAction="http://soapinterop.org" style="document" />
-      <input>
-        <soap12:body use="literal" />
-        <soap12:header message="s0:echoVoidSoapHeaderechoMeComplexTypeRequest" part="echoMeComplexTypeRequest" use="literal" />
-        <soap12:header message="s0:echoVoidSoapHeaderechoMeStringRequest" part="echoMeStringRequest" use="literal" />
-      </input>
-      <output>
-        <soap12:body use="literal" />
-        <soap12:header message="s0:echoVoidSoapHeaderechoMeComplexTypeResponse" part="echoMeComplexTypeResponse" use="literal" />
-        <soap12:header message="s0:echoVoidSoapHeaderechoMeStringResponse" part="echoMeStringResponse" use="literal" />
-      </output>
-    </operation>
-  </binding>
-  <service name="Round4XSDTest">
-    <documentation>These operations implement DOC/LIT SOAP operations, for interop testing. Please email johnko@microsoft.com with any questions/coments.</documentation>
-    <port name="Round4XSDTestSoap" binding="s0:Round4XSDTestSoap">
-      <soap:address location="test://" />
-    </port>
-    <port name="Round4XSDTestSoap12" binding="s0:Round4XSDTestSoap12">
-      <soap12:address location="http://mssoapinterop.org/asmx/xsd/round4xsd.asmx" />
-    </port>
-  </service>
-</definitions>
-\ No newline at end of file
diff --git a/ext/soap/tests/interop/Round4/GroupI/skipif.inc b/ext/soap/tests/interop/Round4/GroupI/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/interop/Round4/GroupI/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/schema/schema001.phpt b/ext/soap/tests/schema/schema001.phpt
deleted file mode 100644
index 9f2b7e5235..0000000000
--- a/ext/soap/tests/schema/schema001.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 1: simpleType/restriction
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<restriction base="xsd:int"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema002.phpt b/ext/soap/tests/schema/schema002.phpt
deleted file mode 100644
index 41f3bbe3fa..0000000000
--- a/ext/soap/tests/schema/schema002.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP XML Schema 2: simpleType/restriction (reference to type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType2">
-		<restriction base="xsd:int"/>
-	</simpleType>
-	<simpleType name="testType">
-		<restriction base="tns:testType2"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema003.phpt b/ext/soap/tests/schema/schema003.phpt
deleted file mode 100644
index 75991001e0..0000000000
--- a/ext/soap/tests/schema/schema003.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP XML Schema 3: simpleType/restriction (reference to type, that is not defined yet)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<restriction base="tns:testType2"/>
-	</simpleType>
-	<simpleType name="testType2">
-		<restriction base="xsd:int"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema004.phpt b/ext/soap/tests/schema/schema004.phpt
deleted file mode 100644
index b851f76050..0000000000
--- a/ext/soap/tests/schema/schema004.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 4: simpleType/restriction (reference to undefined type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<restriction base="tns:testType2"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123.5</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(5) "123.5"
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/schema/schema005.phpt b/ext/soap/tests/schema/schema005.phpt
deleted file mode 100644
index 1db0c62f99..0000000000
--- a/ext/soap/tests/schema/schema005.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 5: simpleType/restriction (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<restriction>
-			<simpleType name="testType2">
-		    <restriction base="xsd:int"/>
-	    </simpleType>
-	  </restriction>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema006.phpt b/ext/soap/tests/schema/schema006.phpt
deleted file mode 100644
index e41f27545b..0000000000
--- a/ext/soap/tests/schema/schema006.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP XML Schema 6: simpleType/restriction (referenced by ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<restriction>
-			<simpleType name="testType2">
-		    <restriction base="xsd:int"/>
-	    </simpleType>
-	  </restriction>
-	</simpleType>
-	<element name="testElement" type="tns:testType"/>
-EOF;
-test_schema($schema,'element="tns:testElement"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema007.phpt b/ext/soap/tests/schema/schema007.phpt
deleted file mode 100644
index fd93c7aa8e..0000000000
--- a/ext/soap/tests/schema/schema007.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP XML Schema 7: simpleType/restriction (referenced by ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<element name="testElement" type="tns:testType"/>
-	<simpleType name="testType">
-		<restriction>
-			<simpleType name="testType2">
-		    <restriction base="xsd:int"/>
-	    </simpleType>
-	  </restriction>
-	</simpleType>
-EOF;
-test_schema($schema,'element="tns:testElement"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
diff --git a/ext/soap/tests/schema/schema008.phpt b/ext/soap/tests/schema/schema008.phpt
deleted file mode 100644
index 1c4005f690..0000000000
--- a/ext/soap/tests/schema/schema008.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 8: simpleType/restriction (anonymous, inside an ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-<element name="testElement">
-	<simpleType>
-		<restriction>
-			<simpleType name="testType2">
-		    <restriction base="xsd:int"/>
-	    </simpleType>
-	  </restriction>
-	</simpleType>
-</element>
-EOF;
-test_schema($schema,'element="tns:testElement"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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:testElement">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-int(123)
-ok
-
diff --git a/ext/soap/tests/schema/schema009.phpt b/ext/soap/tests/schema/schema009.phpt
deleted file mode 100644
index f7d10242cc..0000000000
--- a/ext/soap/tests/schema/schema009.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 9: simpleType/list (as string)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list itemType="token"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"one two");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">one two</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(7) "one two"
-ok
diff --git a/ext/soap/tests/schema/schema010.phpt b/ext/soap/tests/schema/schema010.phpt
deleted file mode 100644
index 49136b9fe4..0000000000
--- a/ext/soap/tests/schema/schema010.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 10: simpleType/list (as array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list itemType="token"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',array("one","two"));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">one two</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(7) "one two"
-ok
diff --git a/ext/soap/tests/schema/schema011.phpt b/ext/soap/tests/schema/schema011.phpt
deleted file mode 100644
index 8296311a46..0000000000
--- a/ext/soap/tests/schema/schema011.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 11: simpleType/list (inline type) (as string)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list>
-			<simpleType>
-				<restriction base="int"/>
-			</simpleType>
-		</list>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"123 456.7");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123 456</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(7) "123 456"
-ok
diff --git a/ext/soap/tests/schema/schema012.phpt b/ext/soap/tests/schema/schema012.phpt
deleted file mode 100644
index 1d542d81d8..0000000000
--- a/ext/soap/tests/schema/schema012.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 12: simpleType/list (inline type) (as array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list>
-			<simpleType>
-				<restriction base="int"/>
-			</simpleType>
-		</list>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,456.7));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123 456</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(7) "123 456"
-ok
diff --git a/ext/soap/tests/schema/schema013.phpt b/ext/soap/tests/schema/schema013.phpt
deleted file mode 100644
index 4794d2d0f1..0000000000
--- a/ext/soap/tests/schema/schema013.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 13: simpleType/union
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union memberTypes="string int float"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"str");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">str</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(3) "str"
-ok
diff --git a/ext/soap/tests/schema/schema014.phpt b/ext/soap/tests/schema/schema014.phpt
deleted file mode 100644
index 0ffff86e6f..0000000000
--- a/ext/soap/tests/schema/schema014.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP XML Schema 14: simpleType/union
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union memberTypes="string int float"/>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(5) "123.5"
-ok
diff --git a/ext/soap/tests/schema/schema015.phpt b/ext/soap/tests/schema/schema015.phpt
deleted file mode 100644
index fe9b96b8cf..0000000000
--- a/ext/soap/tests/schema/schema015.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 15: simpleType/union (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="string"/>
-			</simpleType>
-			<simpleType>
-				<restriction base="int"/>
-			</simpleType>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"str");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">str</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(3) "str"
-ok
diff --git a/ext/soap/tests/schema/schema016.phpt b/ext/soap/tests/schema/schema016.phpt
deleted file mode 100644
index 462fc71404..0000000000
--- a/ext/soap/tests/schema/schema016.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 16: simpleType/union (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="string"/>
-			</simpleType>
-			<simpleType>
-				<restriction base="int"/>
-			</simpleType>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(5) "123.5"
-ok
diff --git a/ext/soap/tests/schema/schema017.phpt b/ext/soap/tests/schema/schema017.phpt
deleted file mode 100644
index e7674cfc41..0000000000
--- a/ext/soap/tests/schema/schema017.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 17: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-			<simpleType>
-				<list itemType="int"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',123.5);
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(5) "123.5"
-ok
diff --git a/ext/soap/tests/schema/schema018.phpt b/ext/soap/tests/schema/schema018.phpt
deleted file mode 100644
index 0f3e8b84ac..0000000000
--- a/ext/soap/tests/schema/schema018.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 18: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-			<simpleType>
-				<list itemType="int"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"123.5");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(5) "123.5"
-ok
diff --git a/ext/soap/tests/schema/schema019.phpt b/ext/soap/tests/schema/schema019.phpt
deleted file mode 100644
index 0d2d753764..0000000000
--- a/ext/soap/tests/schema/schema019.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 19: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-			<simpleType>
-				<list itemType="int"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"123.5 456.7");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5 456.7</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(11) "123.5 456.7"
-ok
diff --git a/ext/soap/tests/schema/schema020.phpt b/ext/soap/tests/schema/schema020.phpt
deleted file mode 100644
index 3ceb3de625..0000000000
--- a/ext/soap/tests/schema/schema020.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 20: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<union>
-			<simpleType>
-				<restriction base="float"/>
-			</simpleType>
-			<simpleType>
-				<list itemType="int"/>
-			</simpleType>
-		</union>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123.5,456.7));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123.5 456.7</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(11) "123.5 456.7"
-ok
diff --git a/ext/soap/tests/schema/schema021.phpt b/ext/soap/tests/schema/schema021.phpt
deleted file mode 100644
index 0628c6b3b8..0000000000
--- a/ext/soap/tests/schema/schema021.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 21: list of unions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list>
-			<simpleType>
-				<union memberTypes="int float str"/>
-			</simpleType>
-		</list>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',"123 123.5 456.7 str");
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123 123.5 456.7 str</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(19) "123 123.5 456.7 str"
-ok
diff --git a/ext/soap/tests/schema/schema022.phpt b/ext/soap/tests/schema/schema022.phpt
deleted file mode 100644
index fd598f6243..0000000000
--- a/ext/soap/tests/schema/schema022.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 22: list of unions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<simpleType name="testType">
-		<list>
-			<simpleType>
-				<union memberTypes="int float str"/>
-			</simpleType>
-		</list>
-	</simpleType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5,'str'));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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">123 123.5 str</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-string(13) "123 123.5 str"
-ok
diff --git a/ext/soap/tests/schema/schema023.phpt b/ext/soap/tests/schema/schema023.phpt
deleted file mode 100644
index 550bacfe84..0000000000
--- a/ext/soap/tests/schema/schema023.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 23: SOAP 1.1 Array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns1:testType"><item xsi:type="xsd:int">123</item><item xsi:type="xsd:int">123</item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema024.phpt b/ext/soap/tests/schema/schema024.phpt
deleted file mode 100644
index af836d1ffb..0000000000
--- a/ext/soap/tests/schema/schema024.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 24: SOAP 1.1 Array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns1:testType"><x_item xsi:type="xsd:int">123</x_item><x_item xsi:type="xsd:int">123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema025.phpt b/ext/soap/tests/schema/schema025.phpt
deleted file mode 100644
index 748e45804d..0000000000
--- a/ext/soap/tests/schema/schema025.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 25: SOAP 1.2 Array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-  	    <attribute ref="enc12:itemType" wsdl:itemType="int"/>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="*"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns1:testType"><item xsi:type="xsd:int">123</item><item xsi:type="xsd:int">123</item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema026.phpt b/ext/soap/tests/schema/schema026.phpt
deleted file mode 100644
index e17b5ac60b..0000000000
--- a/ext/soap/tests/schema/schema026.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 26: SOAP 1.2 Array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2]" xsi:type="ns1:testType"><x_item xsi:type="xsd:int">123</x_item><x_item xsi:type="xsd:int">123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema027.phpt b/ext/soap/tests/schema/schema027.phpt
deleted file mode 100644
index e3b382ebe9..0000000000
--- a/ext/soap/tests/schema/schema027.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-SOAP XML Schema 27: SOAP 1.1 Multidimensional array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[,]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2,1]" xsi:type="ns1:testType"><item xsi:type="xsd:int">123</item><item xsi:type="xsd:int">123</item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema028.phpt b/ext/soap/tests/schema/schema028.phpt
deleted file mode 100644
index 7cc4ba568a..0000000000
--- a/ext/soap/tests/schema/schema028.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP XML Schema 28: SOAP 1.2 Multidimensional array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-  	    <attribute ref="enc12:itemType" wsdl:itemType="int"/>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2,1]" xsi:type="ns1:testType"><item xsi:type="xsd:int">123</item><item xsi:type="xsd:int">123</item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema029.phpt b/ext/soap/tests/schema/schema029.phpt
deleted file mode 100644
index 2081affc6d..0000000000
--- a/ext/soap/tests/schema/schema029.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP XML Schema 29: SOAP 1.2 Multidimensional array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)));
-echo "ok";
-?>
---EXPECT--
-<?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:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam SOAP-ENC:arrayType="xsd:int[2,1]" xsi:type="ns1:testType"><x_item xsi:type="xsd:int">123</x_item><x_item xsi:type="xsd:int">123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema030.phpt b/ext/soap/tests/schema/schema030.phpt
deleted file mode 100644
index e468613916..0000000000
--- a/ext/soap/tests/schema/schema030.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 30: Structure (sequence)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="str" type="string"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["str"]=>
-  string(3) "str"
-}
-ok
diff --git a/ext/soap/tests/schema/schema031.phpt b/ext/soap/tests/schema/schema031.phpt
deleted file mode 100644
index 479abfee9d..0000000000
--- a/ext/soap/tests/schema/schema031.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 31: Structure (all)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<all>
-			<element name="int" type="int"/>
-			<element name="str" type="string"/>
-		</all>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["str"]=>
-  string(3) "str"
-}
-ok
diff --git a/ext/soap/tests/schema/schema032.phpt b/ext/soap/tests/schema/schema032.phpt
deleted file mode 100644
index 47b4af121c..0000000000
--- a/ext/soap/tests/schema/schema032.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP XML Schema 32: Structure (choice)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<choice>
-			<element name="int" type="int"/>
-			<element name="str" type="string"/>
-		</choice>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (1) {
-  ["int"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema033.phpt b/ext/soap/tests/schema/schema033.phpt
deleted file mode 100644
index b504bc077a..0000000000
--- a/ext/soap/tests/schema/schema033.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP XML Schema 33: Nested complex types
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<sequence>
-			<element name="int" type="int"/>
-		</sequence>
-	</complexType>
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="nest" type="tns:testType2"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"nest"=>array("int"=>123.5)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><nest xsi:type="ns1:testType2"><int xsi:type="xsd:int">123</int></nest></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["nest"]=>
-  object(stdClass)#%d (1) {
-    ["int"]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema034.phpt b/ext/soap/tests/schema/schema034.phpt
deleted file mode 100644
index a83d6ea846..0000000000
--- a/ext/soap/tests/schema/schema034.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP XML Schema 34: Nested complex types (element ref)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<element name="testType2" type="tns:testType2"/>
-	<complexType name="testType2">
-		<sequence>
-			<element name="int" type="int"/>
-		</sequence>
-	</complexType>
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element ref="tns:testType2"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 xsi:type="ns1:testType2"><int xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["testType2"]=>
-  object(stdClass)#%d (1) {
-    ["int"]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema035.phpt b/ext/soap/tests/schema/schema035.phpt
deleted file mode 100644
index 8974ed00c5..0000000000
--- a/ext/soap/tests/schema/schema035.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP XML Schema 35: Nested complex types (element ref + anonymous type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<element name="testType2">
-		<complexType>
-			<sequence>
-				<element name="int" type="int"/>
-			</sequence>
-		</complexType>
-	</element>
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element ref="tns:testType2"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 xsi:type="ns1:testType2"><int xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["testType2"]=>
-  object(stdClass)#%d (1) {
-    ["int"]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema036.phpt b/ext/soap/tests/schema/schema036.phpt
deleted file mode 100644
index 9d6dac4534..0000000000
--- a/ext/soap/tests/schema/schema036.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP XML Schema 36: Nested complex types (inline)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="testType2">
-				<complexType>
-					<sequence>
-						<element name="int" type="int"/>
-					</sequence>
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><testType2 xsi:type="ns1:testType2"><int xsi:type="xsd:int">123</int></testType2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["testType2"]=>
-  object(stdClass)#%d (1) {
-    ["int"]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema037.phpt b/ext/soap/tests/schema/schema037.phpt
deleted file mode 100644
index 4e59981fc9..0000000000
--- a/ext/soap/tests/schema/schema037.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 37: Structure with attributes
---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));
-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 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
diff --git a/ext/soap/tests/schema/schema038.phpt b/ext/soap/tests/schema/schema038.phpt
deleted file mode 100644
index 2d37e89e0b..0000000000
--- a/ext/soap/tests/schema/schema038.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 38: Structure with attributes (ref)
---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 ref="tns:int"/>
-	</complexType>
-	<attribute name="int" type="int"/>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 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
diff --git a/ext/soap/tests/schema/schema039.phpt b/ext/soap/tests/schema/schema039.phpt
deleted file mode 100644
index 0b7ef5afc4..0000000000
--- a/ext/soap/tests/schema/schema039.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 39: Structure with attributes (attributeGroup)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="str" type="string"/>
-		</sequence>
-		<attributeGroup ref="tns:intGroup"/>
-	</complexType>
-	<attributeGroup name="intGroup">
-		<attribute name="int" type="int"/>
-	</attributeGroup>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 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
diff --git a/ext/soap/tests/schema/schema040.phpt b/ext/soap/tests/schema/schema040.phpt
deleted file mode 100644
index f7ddc04546..0000000000
--- a/ext/soap/tests/schema/schema040.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP XML Schema 40: Structure with attributes (inline types)
---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">
-			<simpleType>
-				<restriction base="int"/>
-			</simpleType>
-		</attribute>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 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
diff --git a/ext/soap/tests/schema/schema041.phpt b/ext/soap/tests/schema/schema041.phpt
deleted file mode 100644
index 1264cf5c90..0000000000
--- a/ext/soap/tests/schema/schema041.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 41: Structure (group)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<group ref="tns:testGroup"/>
-	</complexType>
-	<group name="testGroup">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="str" type="string"/>
-		</sequence>
-	</group>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><str xsi:type="xsd:string">str</str></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["str"]=>
-  string(3) "str"
-}
-ok
diff --git a/ext/soap/tests/schema/schema042.phpt b/ext/soap/tests/schema/schema042.phpt
deleted file mode 100644
index a8aa8857d9..0000000000
--- a/ext/soap/tests/schema/schema042.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 42: Extension of simple type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<simpleContent>
-			<extension base="int">
-				<attribute name="int" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5));
-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 xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["_"]=>
-  int(123)
-  ["int"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema043.phpt b/ext/soap/tests/schema/schema043.phpt
deleted file mode 100644
index 08c2996363..0000000000
--- a/ext/soap/tests/schema/schema043.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP XML Schema 43: Extension of simple type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<simpleContent>
-			<extension base="int">
-				<attribute name="int" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="testType">
-		<simpleContent>
-			<extension base="tns:testType2">
-				<attribute name="int2" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["_"]=>
-  int(123)
-  ["int"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema044.phpt b/ext/soap/tests/schema/schema044.phpt
deleted file mode 100644
index 8fc0705518..0000000000
--- a/ext/soap/tests/schema/schema044.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 44: Restriction of simple type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<simpleContent>
-			<restriction base="int">
-				<attribute name="int" type="int"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5));
-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 xsi:type="ns1:testType" int="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["_"]=>
-  int(123)
-  ["int"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema045.phpt b/ext/soap/tests/schema/schema045.phpt
deleted file mode 100644
index 346a929d85..0000000000
--- a/ext/soap/tests/schema/schema045.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP XML Schema 45: Restriction of simple type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<simpleContent>
-			<extension base="int">
-				<attribute name="int" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="testType">
-		<simpleContent>
-			<restriction base="tns:testType2">
-				<attribute name="int2" type="int"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["_"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema046.phpt b/ext/soap/tests/schema/schema046.phpt
deleted file mode 100644
index 3f9d03afad..0000000000
--- a/ext/soap/tests/schema/schema046.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP XML Schema 46: Extension of complex type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<simpleContent>
-			<extension base="int">
-				<attribute name="int" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="testType">
-		<complexContent>
-			<extension base="tns:testType2">
-				<attribute name="int2" type="int"/>
-			</extension>
-		</complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType" int="123" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["_"]=>
-  int(123)
-  ["int"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema047.phpt b/ext/soap/tests/schema/schema047.phpt
deleted file mode 100644
index 1265cfd3a3..0000000000
--- a/ext/soap/tests/schema/schema047.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP XML Schema 47: Extension of complex type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<sequence>
-			<element name="int" type="int"/>
-		</sequence>
-	</complexType>
-	<complexType name="testType">
-		<complexContent>
-			<extension base="tns:testType2">
-				<attribute name="int2" type="int"/>
-			</extension>
-		</complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 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)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema048.phpt b/ext/soap/tests/schema/schema048.phpt
deleted file mode 100644
index 98d4d4be44..0000000000
--- a/ext/soap/tests/schema/schema048.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP XML Schema 48: Restriction of complex type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<simpleContent>
-			<extension base="int">
-				<attribute name="int" type="int"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="tns:testType2">
-				<attribute name="int2" type="int"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType" int2="123">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["_"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema049.phpt b/ext/soap/tests/schema/schema049.phpt
deleted file mode 100644
index 7268a4b67a..0000000000
--- a/ext/soap/tests/schema/schema049.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-SOAP XML Schema 49: Restriction of complex type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType2">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="int2" type="int"/>
-		</sequence>
-	</complexType>
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="tns:testType2">
-				<sequence>
-					<element name="int2" type="int"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType"><int2 xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (1) {
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema050.phpt b/ext/soap/tests/schema/schema050.phpt
deleted file mode 100644
index 6c735125b7..0000000000
--- a/ext/soap/tests/schema/schema050.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 50: Array in complex type (maxOccurs > 1, one value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="int2" type="int" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>123.5));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema051.phpt b/ext/soap/tests/schema/schema051.phpt
deleted file mode 100644
index 9636399814..0000000000
--- a/ext/soap/tests/schema/schema051.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-SOAP XML Schema 51: Array in complex type (maxOccurs > 1, array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="int2" type="int" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5,456.7)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 xsi:type="xsd:int">123</int2><int2 xsi:type="xsd:int">456</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["int2"]=>
-  array(2) {
-    [0]=>
-    int(123)
-    [1]=>
-    int(456)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema052.phpt b/ext/soap/tests/schema/schema052.phpt
deleted file mode 100644
index 8e7121ae2d..0000000000
--- a/ext/soap/tests/schema/schema052.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 52: Array in complex type (maxOccurs > 1, array with one value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="int2" type="int" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5)));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int><int2 xsi:type="xsd:int">123</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["int"]=>
-  int(123)
-  ["int2"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema053.phpt b/ext/soap/tests/schema/schema053.phpt
deleted file mode 100644
index 8893bf5df3..0000000000
--- a/ext/soap/tests/schema/schema053.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP XML Schema 52: Array in complex type (maxOccurs > 1, empty array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int" type="int"/>
-			<element name="int2" type="int" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array()));
-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 xsi:type="ns1:testType"><int xsi:type="xsd:int">123</int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (1) {
-  ["int"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema054.phpt b/ext/soap/tests/schema/schema054.phpt
deleted file mode 100644
index b1ff74e419..0000000000
--- a/ext/soap/tests/schema/schema054.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP XML Schema 54: Apache Map
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = '';
-test_schema($schema,'type="apache:Map" xmlns:apache="http://xml.apache.org/xml-soap"',array('a'=>123,'b'=>123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://xml.apache.org/xml-soap" 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="ns2:Map"><item><key xsi:type="xsd:string">a</key><value xsi:type="xsd:int">123</value></item><item><key xsi:type="xsd:string">b</key><value xsi:type="xsd:float">123.5</value></item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  ["a"]=>
-  int(123)
-  ["b"]=>
-  float(123.5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema055.phpt b/ext/soap/tests/schema/schema055.phpt
deleted file mode 100644
index f6ead2f13d..0000000000
--- a/ext/soap/tests/schema/schema055.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP XML Schema 55: Apache Map (extension)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<extension base="apache:Map" xmlns:apache="http://xml.apache.org/xml-soap">
-    	</extension>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="testType"',array('a'=>123,'b'=>123.5));
-echo "ok";
-?>
---EXPECT--
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://xml.apache.org/xml-soap" 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="ns2:Map"><item><key xsi:type="xsd:string">a</key><value xsi:type="xsd:int">123</value></item><item><key xsi:type="xsd:string">b</key><value xsi:type="xsd:float">123.5</value></item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  ["a"]=>
-  int(123)
-  ["b"]=>
-  float(123.5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema056.phpt b/ext/soap/tests/schema/schema056.phpt
deleted file mode 100644
index 1ada78ea2a..0000000000
--- a/ext/soap/tests/schema/schema056.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 56: SOAP 1.1 Array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><xsd:int>123</xsd:int><xsd:int>123</xsd:int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema057.phpt b/ext/soap/tests/schema/schema057.phpt
deleted file mode 100644
index 1848b9c24a..0000000000
--- a/ext/soap/tests/schema/schema057.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 57: SOAP 1.1 Array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><x_item>123</x_item><x_item>123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema058.phpt b/ext/soap/tests/schema/schema058.phpt
deleted file mode 100644
index b96fc9fcca..0000000000
--- a/ext/soap/tests/schema/schema058.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 58: SOAP 1.2 Array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-  	    <attribute ref="enc12:itemType" wsdl:itemType="int"/>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="*"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><xsd:int>123</xsd:int><xsd:int>123</xsd:int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema059.phpt b/ext/soap/tests/schema/schema059.phpt
deleted file mode 100644
index 875bae9868..0000000000
--- a/ext/soap/tests/schema/schema059.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-SOAP XML Schema 59: SOAP 1.2 Array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><x_item>123</x_item><x_item>123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  int(123)
-  [1]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema060.phpt b/ext/soap/tests/schema/schema060.phpt
deleted file mode 100644
index 4daa83c191..0000000000
--- a/ext/soap/tests/schema/schema060.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP XML Schema 60: SOAP 1.2 Multidimensional array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-  	    <attribute ref="enc12:itemType" wsdl:itemType="int"/>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><xsd:int>123</xsd:int><xsd:int>123</xsd:int></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema061.phpt b/ext/soap/tests/schema/schema061.phpt
deleted file mode 100644
index bbd2aa6579..0000000000
--- a/ext/soap/tests/schema/schema061.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP XML Schema 61: SOAP 1.2 Multidimensional array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding">
-				<all>
-					<element name="x_item" type="int" maxOccurs="unbounded"/>
-		    </all>
-  	    <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)),'rpc','literal');
-echo "ok";
-?>
---EXPECT--
-<?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"><SOAP-ENV:Body><ns1:test><testParam><x_item>123</x_item><x_item>123</x_item></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(123)
-  }
-}
-ok
diff --git a/ext/soap/tests/schema/schema062.phpt b/ext/soap/tests/schema/schema062.phpt
deleted file mode 100644
index 60b06568ed..0000000000
--- a/ext/soap/tests/schema/schema062.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 62: NULL with attributes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<simpleContent>
-			<restriction base="int">
-				<attribute name="int" type="int"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("_"=>NULL,"int"=>123.5));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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="true" int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (2) {
-  ["_"]=>
-  NULL
-  ["int"]=>
-  int(123)
-}
-ok
diff --git a/ext/soap/tests/schema/schema063.phpt b/ext/soap/tests/schema/schema063.phpt
deleted file mode 100644
index dd60422a27..0000000000
--- a/ext/soap/tests/schema/schema063.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-SOAP XML Schema 63: standard unsignedLong type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = '';
-test_schema($schema,'type="xsd:unsignedLong"',0xffffffff);
-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 xsi:type="xsd:unsignedLong">4294967295</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-%s(4294967295)
-ok
diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt
deleted file mode 100644
index 53e1b257be..0000000000
--- a/ext/soap/tests/schema/schema064.phpt
+++ /dev/null
@@ -1,57 +0,0 @@
---TEST--
-SOAP XML Schema 64: standard date/time types
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="dateTime" type="dateTime"/>
-			<element name="time" type="time"/>
-			<element name="date" type="date"/>
-			<element name="gYearMonth" type="gYearMonth"/>
-			<element name="gYear" type="gYear"/>
-			<element name="gMonthDay" type="gMonthDay"/>
-			<element name="gDay" type="gDay"/>
-			<element name="gMonth" type="gMonth"/>
-		</sequence>
-	</complexType>
-EOF;
-$date = gmmktime(1,2,3,4,5,1976);
-putenv('TZ=GMT');
-test_schema($schema,'type="tns:testType"',array(
-	'dateTime' => $date,
-	'time' => $date,
-	'date' => $date,
-	'gYearMonth' => $date,
-	'gYear' => $date,
-	'gMonthDay' => $date,
-	'gDay' => $date,
-	'gMonth' => $date
-));
-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 xsi:type="ns1:testType"><dateTime xsi:type="xsd:dateTime">1976-04-05T01:02:03Z</dateTime><time xsi:type="xsd:time">01:02:03Z</time><date xsi:type="xsd:date">1976-04-05Z</date><gYearMonth xsi:type="xsd:gYearMonth">1976-04Z</gYearMonth><gYear xsi:type="xsd:gYear">1976Z</gYear><gMonthDay xsi:type="xsd:gMonthDay">--04-05Z</gMonthDay><gDay xsi:type="xsd:gDay">---05Z</gDay><gMonth xsi:type="xsd:gMonth">--04--Z</gMonth></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (8) {
-  ["dateTime"]=>
-  string(20) "1976-04-05T01:02:03Z"
-  ["time"]=>
-  string(9) "01:02:03Z"
-  ["date"]=>
-  string(11) "1976-04-05Z"
-  ["gYearMonth"]=>
-  string(8) "1976-04Z"
-  ["gYear"]=>
-  string(5) "1976Z"
-  ["gMonthDay"]=>
-  string(8) "--04-05Z"
-  ["gDay"]=>
-  string(6) "---05Z"
-  ["gMonth"]=>
-  string(7) "--04--Z"
-}
-ok
diff --git a/ext/soap/tests/schema/schema065.phpt b/ext/soap/tests/schema/schema065.phpt
deleted file mode 100644
index 3199a6bc8f..0000000000
--- a/ext/soap/tests/schema/schema065.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP XML Schema 65: Attribute with default value
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attribute name="int" type="int" default="5"/>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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"
-  ["int"]=>
-  int(5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema066.phpt b/ext/soap/tests/schema/schema066.phpt
deleted file mode 100644
index 7fe47bbd2c..0000000000
--- a/ext/soap/tests/schema/schema066.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP XML Schema 66: Attribute with fixed value (1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attribute name="int" type="int" fixed="5"/>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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"
-  ["int"]=>
-  int(5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema067.phpt b/ext/soap/tests/schema/schema067.phpt
deleted file mode 100644
index 5ee0036ebe..0000000000
--- a/ext/soap/tests/schema/schema067.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP XML Schema 67: Attribute with fixed value (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attribute name="int" type="int" fixed="5"/>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>5));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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"
-  ["int"]=>
-  int(5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema068.phpt b/ext/soap/tests/schema/schema068.phpt
deleted file mode 100644
index 88fdac334f..0000000000
--- a/ext/soap/tests/schema/schema068.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-SOAP XML Schema 68: Attribute with fixed value (3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attribute name="int" type="int" fixed="5"/>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>4));
-echo "ok";
-?>
---EXPECTF--
-Fatal error: SOAP-ERROR: Encoding: Attribute 'int' has fixed value '5' (value '4' is not allowed) in %stest_schema.inc on line %d
-\ No newline at end of file
diff --git a/ext/soap/tests/schema/schema069.phpt b/ext/soap/tests/schema/schema069.phpt
deleted file mode 100644
index ccaa342406..0000000000
--- a/ext/soap/tests/schema/schema069.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP XML Schema 69: Attribute with default value (reference)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attribute ref="tns:int"/>
-	</complexType>
-	<attribute name="int" type="int" default="5"/>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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"
-  ["int"]=>
-  int(5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema070.phpt b/ext/soap/tests/schema/schema070.phpt
deleted file mode 100644
index 0c1e249392..0000000000
--- a/ext/soap/tests/schema/schema070.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP XML Schema 70: Attribute with default value (attributeGroup)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="str" type="string"/>
-		<attributeGroup ref="tns:int_group"/>
-	</complexType>
-	<attributeGroup name="int_group">
-		<attribute name="int" type="int" default="5"/>
-	</attributeGroup>
-EOF;
-test_schema($schema,'type="tns:testType"',(object)array("str"=>"str"));
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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"
-  ["int"]=>
-  int(5)
-}
-ok
diff --git a/ext/soap/tests/schema/schema071.phpt b/ext/soap/tests/schema/schema071.phpt
deleted file mode 100644
index 1991f7ad8e..0000000000
--- a/ext/soap/tests/schema/schema071.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP XML Schema 71: SOAP 1.1 Array (document style)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'type="tns:testType"',array(123,123.5),'document','literal');
-echo "ok";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body><testParam><xsd:int>123</xsd:int><xsd:int>123</xsd:int></testParam></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/schema/schema072.phpt b/ext/soap/tests/schema/schema072.phpt
deleted file mode 100644
index 89a0ed3597..0000000000
--- a/ext/soap/tests/schema/schema072.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP XML Schema 72: SOAP 1.1 Array (document style, element with inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<element name="testElement">
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-	</element>
-EOF;
-test_schema($schema,'element="tns:testElement"',array(123,123.5),'document','literal');
-echo "ok";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://test-uri/"><SOAP-ENV:Body><ns1:testElement><xsd:int>123</xsd:int><xsd:int>123</xsd:int></ns1:testElement></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/schema/schema073.phpt b/ext/soap/tests/schema/schema073.phpt
deleted file mode 100644
index 22dd9e2604..0000000000
--- a/ext/soap/tests/schema/schema073.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP XML Schema 73: SOAP 1.1 Array (document style, element with type ref)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<element name="testElement" type="tns:testType"/>
-	<complexType name="testType">
-		<complexContent>
-			<restriction base="SOAP-ENC:Array">
-  	    <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/>
-    	</restriction>
-    </complexContent>
-	</complexType>
-EOF;
-test_schema($schema,'element="tns:testElement"',array(123,123.5),'document','literal');
-echo "ok";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://test-uri/"><SOAP-ENV:Body><ns1:testElement><xsd:int>123</xsd:int><xsd:int>123</xsd:int></ns1:testElement></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/schema/schema074.phpt b/ext/soap/tests/schema/schema074.phpt
deleted file mode 100644
index 3dbba0cd25..0000000000
--- a/ext/soap/tests/schema/schema074.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---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
diff --git a/ext/soap/tests/schema/schema075.phpt b/ext/soap/tests/schema/schema075.phpt
deleted file mode 100644
index 5867e55a7c..0000000000
--- a/ext/soap/tests/schema/schema075.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 75: Attributes form qualified/unqualified (attributeFormDefault="qualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="int1" type="int"/>
-		<attribute name="int2" type="int" form="qualified"/>
-		<attribute name="int3" type="int" form="unqualified"/>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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:int1="1" ns1:int2="2" int3="3" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/schema076.phpt b/ext/soap/tests/schema/schema076.phpt
deleted file mode 100644
index 3ad2eae33a..0000000000
--- a/ext/soap/tests/schema/schema076.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 76: Attributes form qualified/unqualified (attributeFormDefault="unqualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="int1" type="int"/>
-		<attribute name="int2" type="int" form="qualified"/>
-		<attribute name="int3" type="int" form="unqualified"/>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "encoded", 'attributeFormDefault="unqualified"');
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int1="1" ns1:int2="2" int3="3" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/schema077.phpt b/ext/soap/tests/schema/schema077.phpt
deleted file mode 100644
index 16057cfcf9..0000000000
--- a/ext/soap/tests/schema/schema077.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP XML Schema 77: Attributes form qualified/unqualified (attributeFormDefault - default)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<attribute name="int1" type="int"/>
-		<attribute name="int2" type="int" form="qualified"/>
-		<attribute name="int3" type="int" form="unqualified"/>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "encoded");
-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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam int1="1" ns1:int2="2" int3="3" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/schema078.phpt b/ext/soap/tests/schema/schema078.phpt
deleted file mode 100644
index 7636a78f93..0000000000
--- a/ext/soap/tests/schema/schema078.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP XML Schema 78: Element form qualified/unqualified (elementFormDefault="qualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int1" type="int"/>
-			<element name="int2" type="int" form="qualified"/>
-			<element name="int3" type="int" form="unqualified"/>
-		</sequence>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal", 'elementFormDefault="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/"><SOAP-ENV:Body><ns1:test><testParam><ns1:int1>1</ns1:int1><ns1:int2>2</ns1:int2><int3>3</int3></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/schema079.phpt b/ext/soap/tests/schema/schema079.phpt
deleted file mode 100644
index 34dcd9bee7..0000000000
--- a/ext/soap/tests/schema/schema079.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP XML Schema 79: Element form qualified/unqualified (elementFormDefault="unqualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int1" type="int"/>
-			<element name="int2" type="int" form="qualified"/>
-			<element name="int3" type="int" form="unqualified"/>
-		</sequence>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal", 'elementFormDefault="unqualified"');
-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/"><SOAP-ENV:Body><ns1:test><testParam><int1>1</int1><ns1:int2>2</ns1:int2><int3>3</int3></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/schema080.phpt b/ext/soap/tests/schema/schema080.phpt
deleted file mode 100644
index 7519d6a30d..0000000000
--- a/ext/soap/tests/schema/schema080.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP XML Schema 80: Element form qualified/unqualified (elementFormDefault - default)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "test_schema.inc";
-$schema = <<<EOF
-	<complexType name="testType">
-		<sequence>
-			<element name="int1" type="int"/>
-			<element name="int2" type="int" form="qualified"/>
-			<element name="int3" type="int" form="unqualified"/>
-		</sequence>
-	</complexType>
-EOF;
-
-test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal");
-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/"><SOAP-ENV:Body><ns1:test><testParam><int1>1</int1><ns1:int2>2</ns1:int2><int3>3</int3></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#%d (3) {
-  ["int1"]=>
-  int(1)
-  ["int2"]=>
-  int(2)
-  ["int3"]=>
-  int(3)
-}
-ok
diff --git a/ext/soap/tests/schema/skipif.inc b/ext/soap/tests/schema/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/schema/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/schema/test_schema.inc b/ext/soap/tests/schema/test_schema.inc
deleted file mode 100644
index e1d4eeb508..0000000000
--- a/ext/soap/tests/schema/test_schema.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-$val = null;
-
-function test($input) {
-	global $val;
-	$val = $input;
-}
-
-function test_schema($schema,$type,$param,$style="rpc",$use="encoded", $attributeFormDefault='') {
-  global $HTTP_RAW_POST_DATA, $val;
-$wsdl  = <<<EOF
-<definitions name="InteropTest"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-    xmlns:tns="http://test-uri/"
-    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/"
-    >
-  <types>
-  <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
-  </schema>
-  </types>
-  <message name="testMessage">
-  	<part name="testParam" $type/>
-  </message>
-	<portType name="testPortType">
-		<operation name="test">
-			<input message="testMessage"/>
-		</operation>
-	</portType>
-	<binding name="testBinding" type="testPortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="test">
-			<soap:operation soapAction="#test" style="$style"/>
-			<input>
-				<soap:body use="$use" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-		</operation>
-	</binding>
-	<service name="testService">
-   <port name="testPort" binding="tns:testBinding">
-     <soap:address location="test://" /> 
-   </port>
- </service>
-</definitions>
-EOF;
-
-  $fname = tempnam ("./", "wsdl");
-  $f = fopen($fname,"w");
-  fwrite($f,$wsdl);
-  fclose($f);
-  ini_set("soap.wsdl_cache_enabled",0);
-  $x = new SoapClient($fname, array("trace"=>1,"exceptions"=>0));
-  $y = new SoapServer($fname);
-	$y->addfunction("test");
-  unlink($fname);
-
-  $x->test($param);
-  $xml = xml_parser_create();
-  $req = $x->__getlastrequest();
-  if ($style == "rpc") {
-    $HTTP_RAW_POST_DATA = $req;
-    ob_start();
-    $y->handle();
-    ob_end_clean();
-    echo $req;
-    var_dump($val);
-  } else {
-    echo $req;
-  }
-}
-?>
diff --git a/ext/soap/tests/server001.phpt b/ext/soap/tests/server001.phpt
deleted file mode 100644
index 582759f06f..0000000000
--- a/ext/soap/tests/server001.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-SOAP Server 1: new/addfunction/handle
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-  return "Hello World";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server002.phpt b/ext/soap/tests/server002.phpt
deleted file mode 100644
index 8416f4fb08..0000000000
--- a/ext/soap/tests/server002.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 2: function with parameters and result
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("Add");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Add xmlns:ns1="http://testuri.org">
-      <x xsi:type="xsd:int">22</x>
-      <y xsi:type="xsd:int">33</y>
-    </ns1:Add>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:AddResponse><return xsi:type="xsd:int">55</return></ns1:AddResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server003.phpt b/ext/soap/tests/server003.phpt
deleted file mode 100644
index d4a15e0d69..0000000000
--- a/ext/soap/tests/server003.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP Server 3: all functions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction(SOAP_FUNCTIONS_ALL);
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:strlen xmlns:ns1="http://testuri.org">
-      <x xsi:type="xsd:string">Hello World</x>
-    </ns1:strlen>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:strlenResponse><return xsi:type="xsd:int">11</return></ns1:strlenResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server004.phpt b/ext/soap/tests/server004.phpt
deleted file mode 100644
index 5bfef4fcd4..0000000000
--- a/ext/soap/tests/server004.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-SOAP Server 4: addfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-function Sub($x,$y) {
-  return $x-$y;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction(array("Sub","Add"));
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Add xmlns:ns1="http://testuri.org">
-      <x xsi:type="xsd:int">22</x>
-      <y xsi:type="xsd:int">33</y>
-    </ns1:Add>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:AddResponse><return xsi:type="xsd:int">55</return></ns1:AddResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server005.phpt b/ext/soap/tests/server005.phpt
deleted file mode 100644
index 4aae3b2d99..0000000000
--- a/ext/soap/tests/server005.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP Server 5: setclass
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-  function test() {
-    return "Hello World";
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("Foo");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server006.phpt b/ext/soap/tests/server006.phpt
deleted file mode 100644
index f382d9f2f1..0000000000
--- a/ext/soap/tests/server006.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-SOAP Server 6: setclass with constructor
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-  private $str = "";
-
-  function Foo($str) {
-    $this->str = $str . " World";
-  }
-
-  function test() {
-    return $this->str;
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("Foo","Hello");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server007.phpt b/ext/soap/tests/server007.phpt
deleted file mode 100644
index 676aa56c44..0000000000
--- a/ext/soap/tests/server007.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP Server 7: addfunction and getfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-function Sub($x,$y) {
-  return $x-$y;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction(array("Sub","Add"));
-var_dump($server->getfunctions());
-echo "ok\n";
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(3) "Sub"
-  [1]=>
-  string(3) "Add"
-}
-ok
diff --git a/ext/soap/tests/server008.phpt b/ext/soap/tests/server008.phpt
deleted file mode 100644
index 87fb69d25f..0000000000
--- a/ext/soap/tests/server008.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP Server 8: setclass and getfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-
-  function Foo() {
-  }
-
-  function test() {
-    return $this->str;
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("Foo");
-var_dump($server->getfunctions());
-echo "ok\n";
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(3) "Foo"
-  [1]=>
-  string(4) "test"
-}
-ok
diff --git a/ext/soap/tests/server009.phpt b/ext/soap/tests/server009.phpt
deleted file mode 100644
index 0a7b30f40c..0000000000
--- a/ext/soap/tests/server009.phpt
+++ /dev/null
@@ -1,66 +0,0 @@
---TEST--
-SOAP Server 9: setclass and setpersistence(SOAP_PERSISTENCE_SESSION)
---SKIPIF--
-<?php
-	require_once('skipif.inc');
-	if (!extension_loaded('session')) {
-		die('skip this test needs session extension');
-	}
-?>
---FILE--
-<?php
-class foo {
-  private $sum = 0;
-
-  function Sum($num) {
-    return $this->sum += $num;
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("foo");
-$server->setpersistence(SOAP_PERSISTENCE_SESSION);
-
-ob_start();
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Sum xmlns:ns1="http://testuri.org">
-      <num xsi:type="xsd:int">5</num>
-    </ns1:Sum>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-ob_clean();
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Sum xmlns:ns1="http://testuri.org">
-      <num xsi:type="xsd:int">3</num>
-    </ns1:Sum>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-ob_end_flush();
-
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:SumResponse><return xsi:type="xsd:int">8</return></ns1:SumResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server010.phpt b/ext/soap/tests/server010.phpt
deleted file mode 100644
index 76cc1e6949..0000000000
--- a/ext/soap/tests/server010.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-SOAP Server 10: setclass and setpersistence(SOAP_PERSISTENCE_REQUEST)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class foo {
-  private $sum = 0;
-
-  function Sum($num) {
-    return $this->sum += $num;
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("foo");
-$server->setpersistence(SOAP_PERSISTENCE_REQUEST);
-
-
-ob_start();
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Sum xmlns:ns1="http://testuri.org">
-      <num xsi:type="xsd:int">5</num>
-    </ns1:Sum>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-ob_clean();
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Sum xmlns:ns1="http://testuri.org">
-      <num xsi:type="xsd:int">3</num>
-    </ns1:Sum>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-ob_end_flush();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:SumResponse><return xsi:type="xsd:int">3</return></ns1:SumResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt
deleted file mode 100644
index fb9aabe89c..0000000000
--- a/ext/soap/tests/server011.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP Server 11: bind
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---GET--
-wsdl
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-
-$server = new soapserver(dirname(__FILE__)."/test.wsdl");
-ob_start();
-$server->handle();
-$wsdl = ob_get_contents();
-ob_end_clean();
-if ($wsdl == file_get_contents(dirname(__FILE__)."/test.wsdl")) {
-  echo "ok\n";
-} else {
-	echo "fail\n";
-}
-?>
---EXPECT--
-ok
diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt
deleted file mode 100644
index 9a41de9d50..0000000000
--- a/ext/soap/tests/server012.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP Server 12: WSDL generation
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---GET--
-WSDL
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("Add");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>WSDL generation is not supported yet</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/server013.phpt b/ext/soap/tests/server013.phpt
deleted file mode 100644
index 4bb94c79c4..0000000000
--- a/ext/soap/tests/server013.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-SOAP Server 13: array handling
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Sum($a) {
-  $sum = 0;
-  if (is_array($a)) {
-    foreach($a as $val) {
-      $sum += $val;
-    }
-  }
-  return $sum;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("Sum");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SOAP-ENV:Body xmlns:ns1="http://linuxsrv.home/~dmitry/soap/">
-    <ns1:sum>
-      <param0 SOAP-ENC:arrayType="xsd:int[2]" xsi:type="SOAP-ENC:Array">
-        <val xsi:type="xsd:int">3</val>
-        <val xsi:type="xsd:int">5</val>
-      </param0>
-    </ns1:sum>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:sumResponse><return xsi:type="xsd:int">8</return></ns1:sumResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server014.phpt b/ext/soap/tests/server014.phpt
deleted file mode 100644
index 7375264872..0000000000
--- a/ext/soap/tests/server014.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 14: fault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Add($x,$y) {
-  undefined_function_x();
-  return $x+$y;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("Add");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:Add xmlns:ns1="http://testuri.org">
-      <x xsi:type="xsd:int">22</x>
-      <y xsi:type="xsd:int">33</y>
-    </ns1:Add>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Call to undefined function undefined_function_x()</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/server015.phpt b/ext/soap/tests/server015.phpt
deleted file mode 100644
index ea538e84eb..0000000000
--- a/ext/soap/tests/server015.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-SOAP Server 15: passing request to handle()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-  return "Hello World";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$envelope = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-$server->handle($envelope);
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server016.phpt b/ext/soap/tests/server016.phpt
deleted file mode 100644
index 77bce9fb38..0000000000
--- a/ext/soap/tests/server016.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Server 16: user fault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-	global $server;
-	$server->fault("MyFault","My fault string");
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>MyFault</faultcode><faultstring>My fault string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/server017.phpt b/ext/soap/tests/server017.phpt
deleted file mode 100644
index cc4af5e707..0000000000
--- a/ext/soap/tests/server017.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Server 17: user fault (through return)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-	return new SoapFault("MyFault","My fault string");
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>MyFault</faultcode><faultstring>My fault string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server018.phpt b/ext/soap/tests/server018.phpt
deleted file mode 100644
index 22c37a09b2..0000000000
--- a/ext/soap/tests/server018.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP Server 18: user fault (through throw)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-	throw new SoapFault("MyFault","My fault string");
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>MyFault</faultcode><faultstring>My fault string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server019.phpt b/ext/soap/tests/server019.phpt
deleted file mode 100644
index 4ad9c5ee85..0000000000
--- a/ext/soap/tests/server019.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 19: compressed request (gzip)
---SKIPIF--
-<?php require_once('skipif.inc'); 
-  if (!extension_loaded('zlib')) die('skip zlib extension not available');
-?>
---FILE--
-<?php
-function test() {
-  return "Hello World";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = gzencode(<<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF
-, 9, FORCE_GZIP);
-$_SERVER['HTTP_CONTENT_ENCODING'] = "gzip";
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server020.phpt b/ext/soap/tests/server020.phpt
deleted file mode 100644
index bacbc57849..0000000000
--- a/ext/soap/tests/server020.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 20: compressed request (deflate)
---SKIPIF--
-<?php require_once('skipif.inc'); 
-  if (!extension_loaded('zlib')) die('skip zlib extension not available');
-?>
---FILE--
-<?php
-function test() {
-  return "Hello World";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = gzcompress(<<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF
-, 9);
-$_SERVER['HTTP_CONTENT_ENCODING'] = "deflate";
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server021.phpt b/ext/soap/tests/server021.phpt
deleted file mode 100644
index 787e959fb3..0000000000
--- a/ext/soap/tests/server021.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-SOAP Server 21: SoapServer::setClass and __call()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-  function __call($name, $args) {
-    if ($name == "test") {
-      return "Hello World";
-    } else {
-      return SoapFault("Server","Function $name doesn't exist");
-    }
-  }
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setclass("Foo");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server022.phpt b/ext/soap/tests/server022.phpt
deleted file mode 100755
index 90b06d5a15..0000000000
--- a/ext/soap/tests/server022.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-SOAP Server 22: user fault (through throw of subclass)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class MyFault extends SoapFault {
-	function __construct() {
-		parent::__construct("MyFault","My fault string");
-	}
-}
-
-
-function test() {
-	throw new MyFault;
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>MyFault</faultcode><faultstring>My fault string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server023.phpt b/ext/soap/tests/server023.phpt
deleted file mode 100755
index c227204d33..0000000000
--- a/ext/soap/tests/server023.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 23: Send SOAP headers those were not received
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function test() {
-	global $server;
-	$server->addSoapHeader(new SoapHeader("http://testuri.org", "Test1", "Hello Header!"));
-	$server->addSoapHeader(new SoapHeader("http://testuri.org", "Test2", "Hello Header!"));
-	return "Hello Body!";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:Header><ns1:Test1>Hello Header!</ns1:Test1><ns1:Test2>Hello Header!</ns1:Test2></SOAP-ENV:Header><SOAP-ENV:Body><ns1:testResponse><return xsi:type="xsd:string">Hello Body!</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server024.phpt b/ext/soap/tests/server024.phpt
deleted file mode 100755
index 0ddd9cec39..0000000000
--- a/ext/soap/tests/server024.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-SOAP Server 24: Send SOAP headers those were not received
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestHeader1 extends SoapHeader {
-	function __construct($data) {
-		parent::__construct("http://testuri.org", "Test1", $data);
-	}
-}
-
-class TestHeader2 extends SoapHeader {
-	function __construct($data) {
-		parent::__construct("http://testuri.org", "Test2", $data);
-	}
-}
-
-function test() {
-	global $server;
-	$server->addSoapHeader(new TestHeader1("Hello Header!"));
-	$server->addSoapHeader(new TestHeader2("Hello Header!"));
-	return "Hello Body!";
-}
-
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:Header><ns1:Test1>Hello Header!</ns1:Test1><ns1:Test2>Hello Header!</ns1:Test2></SOAP-ENV:Header><SOAP-ENV:Body><ns1:testResponse><return xsi:type="xsd:string">Hello Body!</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server025.phpt b/ext/soap/tests/server025.phpt
deleted file mode 100755
index eb5d647eb5..0000000000
--- a/ext/soap/tests/server025.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-SOAP Server 25: One-way SOAP headers encoding using WSDL
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestHeader1 extends SoapHeader {
-	function __construct($data) {
-		parent::__construct("http://testuri.org", "Test1", $data);
-	}
-}
-
-class TestHeader2 extends SoapHeader {
-	function __construct($data) {
-		parent::__construct("http://testuri.org", "Test2", $data);
-	}
-}
-
-function test() {
-	global $server;
-	$server->addSoapHeader(new TestHeader1("Hello Header!"));
-	$server->addSoapHeader(new TestHeader2("Hello Header!"));
-	return "Hello Body!";
-}
-
-$server = new soapserver(dirname(__FILE__)."/server025.wsdl");
-$server->addfunction("test");
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org"/>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://testuri.org"><SOAP-ENV:Header><ns1:Test1 xsi:type="xsd:string">Hello Header!</ns1:Test1><ns1:Test2 xsi:type="xsd:string">Hello Header!</ns1:Test2></SOAP-ENV:Header><SOAP-ENV:Body><ns1:testResponse><result>Hello Body!</result></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server025.wsdl b/ext/soap/tests/server025.wsdl
deleted file mode 100755
index 2870f4e70d..0000000000
--- a/ext/soap/tests/server025.wsdl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<definitions
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    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/"
-    xmlns:si="http://soapinterop.org/xsd"
-    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://testuri.org">
-
-  <message name="TestHeader1">
-    <part name="Test1" type="xsd:string" />
-  </message>
-  <message name="TestHeader2">
-    <part name="Test2" type="xsd:string" />
-  </message>
-
-  <message name="TestRequest">
-  </message>
-  <message name="TestResponse">
-    <part name="result" type="xsd:string" />
-  </message>
-
-  <portType name="TestServicePortType">
-    <operation name="test">
-      <input message="tns:TestRequest" />
-      <output message="tns:TestResponse" />
-    </operation>
-  </portType>
-
-  <binding name="TestServiceBinding" type="tns:TestServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="test">
-      <soap:operation soapAction="Test" style="rpc" />
-      <input>
-        <soap:body namespace="http://testuri.org" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-      <output>
-        <soap:body namespace="http://testuri.org" use="literal" />
-        <soap:header namespace="http://testuri.org" message="tns:TestHeader1" part="Test1" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-        <soap:header namespace="http://testuri.org" message="tns:TestHeader2" part="Test2" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </output>
-    </operation>
-  </binding>
-
-  <service name="TestService">
-    <port name="TestServicePort" binding="tns:TestServiceBinding">
-      <soap:address location="http://linuxsrv.home/~dmitry/soap/soap_server.php" />
-    </port>
-  </service>
-
-</definitions>
diff --git a/ext/soap/tests/server026.phpt b/ext/soap/tests/server026.phpt
deleted file mode 100755
index a473a8540a..0000000000
--- a/ext/soap/tests/server026.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-SOAP Server 26: setObject
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-  function test() {
-    return "Hello World";
-  }
-}
-
-$foo = new Foo();
-$server = new soapserver(null,array('uri'=>"http://testuri.org"));
-$server->setObject($foo);
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/server027.phpt b/ext/soap/tests/server027.phpt
deleted file mode 100755
index 9fee4a6087..0000000000
--- a/ext/soap/tests/server027.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP Server 27: setObject and getFunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-
-  function Foo() {
-  }
-
-  function test() {
-    return $this->str;
-  }
-}
-
-$foo = new Foo();
-$server = new SoapServer(null,array('uri'=>"http://testuri.org"));
-$server->setObject($foo);
-var_dump($server->getfunctions());
-echo "ok\n";
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(3) "Foo"
-  [1]=>
-  string(4) "test"
-}
-ok
diff --git a/ext/soap/tests/server028.phpt b/ext/soap/tests/server028.phpt
deleted file mode 100755
index 17194b9e36..0000000000
--- a/ext/soap/tests/server028.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-SOAP Server 28: SoapServer::setObject and __call()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class Foo {
-  function __call($name, $args) {
-    if ($name == "test") {
-      return "Hello World";
-    } else {
-      return SoapFault("Server","Function $name doesn't exist");
-    }
-  }
-}
-
-$foo = new Foo();
-$server = new SoapServer(null,array('uri'=>"http://testuri.org"));
-$server->setObject($foo);
-
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<SOAP-ENV:Envelope
-  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:si="http://soapinterop.org/xsd">
-  <SOAP-ENV:Body>
-    <ns1:test xmlns:ns1="http://testuri.org" />
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-EOF;
-
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" 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:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/setheaders.phpt b/ext/soap/tests/setheaders.phpt
deleted file mode 100755
index cb90d372d1..0000000000
--- a/ext/soap/tests/setheaders.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-SOAP: SoapClient::__setHeaders
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$client = new SoapClient(NULL, array("location"=>"test://","uri"=>"test://",
-  "exceptions"=>0,"trace"=>1));
-$client->test();
-echo $client->__getLastRequest();
-$client->__setSoapHeaders(new SoapHeader("test://","HDR1"));
-$client->test();
-echo $client->__getLastRequest();
-$client->test();
-echo $client->__getLastRequest();
-$client->__setSoapHeaders();
-$client->test();
-echo $client->__getLastRequest();
-$client->__setSoapHeaders(array(new SoapHeader("test://","HDR1"),new SoapHeader("test://","HDR2")));
-$client->test();
-echo $client->__getLastRequest();
-$h = array(new SoapHeader("test://","HDR0"));
-$client->__soapCall("test", array(), null, $h);
-echo $client->__getLastRequest();
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:HDR1/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:HDR1/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:HDR1/><ns1:HDR2/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:HDR0/><ns1:HDR1/><ns1:HDR2/></SOAP-ENV:Header><SOAP-ENV:Body><ns1:test/></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/skipif.inc b/ext/soap/tests/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/soap12/T01.phpt b/ext/soap/tests/soap12/T01.phpt
deleted file mode 100644
index d584812d09..0000000000
--- a/ext/soap/tests/soap12/T01.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T01 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T02.phpt b/ext/soap/tests/soap12/T02.phpt
deleted file mode 100644
index db2c260684..0000000000
--- a/ext/soap/tests/soap12/T02.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T02 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://example.org/ts-tests/C">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T03.phpt b/ext/soap/tests/soap12/T03.phpt
deleted file mode 100644
index 19c29dd3dd..0000000000
--- a/ext/soap/tests/soap12/T03.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T03 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T04.phpt b/ext/soap/tests/soap12/T04.phpt
deleted file mode 100644
index 7445caedee..0000000000
--- a/ext/soap/tests/soap12/T04.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T04 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T05.phpt b/ext/soap/tests/soap12/T05.phpt
deleted file mode 100644
index 187eb2ee83..0000000000
--- a/ext/soap/tests/soap12/T05.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T05 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://example.org/ts-tests/B">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T10.phpt b/ext/soap/tests/soap12/T10.phpt
deleted file mode 100644
index 54186f6a0d..0000000000
--- a/ext/soap/tests/soap12/T10.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T10 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests" 
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T11.phpt b/ext/soap/tests/soap12/T11.phpt
deleted file mode 100644
index 3423d54329..0000000000
--- a/ext/soap/tests/soap12/T11.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T11 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver"
-          env:mustUnderstand="false">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T12.phpt b/ext/soap/tests/soap12/T12.phpt
deleted file mode 100644
index c67917f0e3..0000000000
--- a/ext/soap/tests/soap12/T12.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T12 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver"
-          env:mustUnderstand="1">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:MustUnderstand</env:Value></env:Code><env:Reason><env:Text>Header not understood</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T13.phpt b/ext/soap/tests/soap12/T13.phpt
deleted file mode 100644
index 95e1c8ad4e..0000000000
--- a/ext/soap/tests/soap12/T13.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T13 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver"
-          env:mustUnderstand="true">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:MustUnderstand</env:Value></env:Code><env:Reason><env:Text>Header not understood</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T14.phpt b/ext/soap/tests/soap12/T14.phpt
deleted file mode 100644
index dbf4e1bab5..0000000000
--- a/ext/soap/tests/soap12/T14.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T14 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver"
-          env:mustUnderstand="wrong">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>mustUnderstand value is not boolean</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T15.phpt b/ext/soap/tests/soap12/T15.phpt
deleted file mode 100644
index 546f94237f..0000000000
--- a/ext/soap/tests/soap12/T15.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T15 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:role="http://example.org/ts-tests/B"
-          env:mustUnderstand="1">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T19.phpt b/ext/soap/tests/soap12/T19.phpt
deleted file mode 100644
index 8ddb5b4f8b..0000000000
--- a/ext/soap/tests/soap12/T19.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T19 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/none"
-          env:mustUnderstand="true">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T22.phpt b/ext/soap/tests/soap12/T22.phpt
deleted file mode 100644
index 5844550ced..0000000000
--- a/ext/soap/tests/soap12/T22.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T22 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests" 
-          env:mustUnderstand = "1">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body><ns1:responseOk>foo</ns1:responseOk></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T23.phpt b/ext/soap/tests/soap12/T23.phpt
deleted file mode 100644
index c676fb176c..0000000000
--- a/ext/soap/tests/soap12/T23.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T23 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests" 
-          env:mustUnderstand="1">foo</test:Unknown>
-    <test:echoOk xmlns:test="http://example.org/ts-tests" 
-          env:mustUnderstand="wrong">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>mustUnderstand value is not boolean</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T24.phpt b/ext/soap/tests/soap12/T24.phpt
deleted file mode 100644
index ebee3b764a..0000000000
--- a/ext/soap/tests/soap12/T24.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP 1.2: T24 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://wrong-version/"> 
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:VersionMismatch</env:Value></env:Code><env:Reason><env:Text>Wrong Version</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T25.phpt b/ext/soap/tests/soap12/T25.phpt
deleted file mode 100644
index ac45e9c52d..0000000000
--- a/ext/soap/tests/soap12/T25.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T25 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<!DOCTYPE env:Envelope SYSTEM "env.dtd"[]>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>DTD are not supported by SOAP</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T26.phpt b/ext/soap/tests/soap12/T26.phpt
deleted file mode 100644
index 53c8cec495..0000000000
--- a/ext/soap/tests/soap12/T26.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-SOAP 1.2: T26 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-<?xml-stylesheet href="http://example.org/ts-tests/sub.xsl" type = "text/xsl"?>
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Body><ns1:responseOk>foo</ns1:responseOk></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T27.phpt b/ext/soap/tests/soap12/T27.phpt
deleted file mode 100644
index 6371113994..0000000000
--- a/ext/soap/tests/soap12/T27.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T27 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <env:Body>
-    <test:echoStringArray xmlns:test="http://example.org/ts-tests" 
-          xmlns:enc="http://www.w3.org/2003/05/soap-encoding"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:array enc:itemType="xs:string" enc:arraySize="1">
-        <a>
-          <b>1</b>
-        </a>
-      </test:array>		
-    </test:echoStringArray>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Violation of encoding rules</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T28.phpt b/ext/soap/tests/soap12/T28.phpt
deleted file mode 100644
index 6118b478d8..0000000000
--- a/ext/soap/tests/soap12/T28.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T28 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-    <test:echoOk xmlns:test="http://example.org/ts-tests" >
-      foo
-    </test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>encodingStyle cannot be specified on the Body</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T29.phpt b/ext/soap/tests/soap12/T29.phpt
deleted file mode 100644
index 3784da4030..0000000000
--- a/ext/soap/tests/soap12/T29.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T29 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://example.org/ts-tests/Czzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T30.phpt b/ext/soap/tests/soap12/T30.phpt
deleted file mode 100644
index c2e008ed4a..0000000000
--- a/ext/soap/tests/soap12/T30.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP 1.2: T30 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://example.org/ts-tests"><SOAP-ENV:Body><ns1:responseOk>foo</ns1:responseOk></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt
deleted file mode 100644
index 04f0353bf0..0000000000
--- a/ext/soap/tests/soap12/T31.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T31 returnVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body>
-    <test:returnVoid xmlns:test="http://example.org/ts-tests">
-    </test:returnVoid>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body><ns1:returnVoidResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"/></env:Body></env:Envelope>
-ok
-
diff --git a/ext/soap/tests/soap12/T32.phpt b/ext/soap/tests/soap12/T32.phpt
deleted file mode 100644
index 8f77873f4c..0000000000
--- a/ext/soap/tests/soap12/T32.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T32 echoHeader
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:requiredHeader xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="true">foo</test:requiredHeader>
-  </env:Header>
-  <env:Body>
-    <test:echoHeader xmlns:test="http://example.org/ts-tests">
-    </test:echoHeader>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Body><ns1:echoHeaderResponse>foo</ns1:echoHeaderResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T33.phpt b/ext/soap/tests/soap12/T33.phpt
deleted file mode 100644
index 00ded875b5..0000000000
--- a/ext/soap/tests/soap12/T33.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-SOAP 1.2: T33 nonexistentMethod
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body>
-    <test:DoesNotExist xmlns:test="http://example.org/ts-tests">
-  </test:DoesNotExist>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>rpc:ProcedureNotPresent</env:Value></env:Code><env:Reason><env:Text>Procedure not present</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T34.phpt b/ext/soap/tests/soap12/T34.phpt
deleted file mode 100644
index 39e0095d43..0000000000
--- a/ext/soap/tests/soap12/T34.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T34 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests" 
-          xmlns:env1="http://schemas.xmlsoap.org/soap/envelope/"
-          env1:mustUnderstand="true">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T35.phpt b/ext/soap/tests/soap12/T35.phpt
deleted file mode 100644
index a736010ce0..0000000000
--- a/ext/soap/tests/soap12/T35.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T35 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="1">
-      foo
-    </test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:MustUnderstand</env:Value></env:Code><env:Reason><env:Text>Header not understood</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T36.phpt b/ext/soap/tests/soap12/T36.phpt
deleted file mode 100644
index d625813942..0000000000
--- a/ext/soap/tests/soap12/T36.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T36 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="1" 
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:MustUnderstand</env:Value></env:Code><env:Reason><env:Text>Header not understood</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T37.phpt b/ext/soap/tests/soap12/T37.phpt
deleted file mode 100644
index cdce8a4429..0000000000
--- a/ext/soap/tests/soap12/T37.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T37 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T38_1.phpt b/ext/soap/tests/soap12/T38_1.phpt
deleted file mode 100644
index 30007e55ef..0000000000
--- a/ext/soap/tests/soap12/T38_1.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP 1.2: T38.1 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="false" 
-          env:role="http://example.org/ts-tests/C">foo</test:Unknown>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="0" 
-          env:role="http://example.org/ts-tests/C">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T38_2.phpt b/ext/soap/tests/soap12/T38_2.phpt
deleted file mode 100644
index efff2f4db3..0000000000
--- a/ext/soap/tests/soap12/T38_2.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP 1.2: T38.2 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="true" 
-          env:role="http://example.org/ts-tests/C">foo</test:echoOk>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="1" 
-          env:role="http://example.org/ts-tests/C">bar</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk><ns1:responseOk>bar</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T39.phpt b/ext/soap/tests/soap12/T39.phpt
deleted file mode 100644
index 2b29562aba..0000000000
--- a/ext/soap/tests/soap12/T39.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T39 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://example.org/ts-tests"
-          env:mustUnderstand="9">foo</test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>mustUnderstand value is not boolean</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T40.phpt b/ext/soap/tests/soap12/T40.phpt
deleted file mode 100644
index 27b4a21c47..0000000000
--- a/ext/soap/tests/soap12/T40.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP 1.2: T40 echoOK
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:Unknown xmlns:test="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" 
-          env:mustUnderstand="false">
-      foo
-    </test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok
-\ No newline at end of file
diff --git a/ext/soap/tests/soap12/T41.phpt b/ext/soap/tests/soap12/T41.phpt
deleted file mode 100644
index f874adc895..0000000000
--- a/ext/soap/tests/soap12/T41.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP 1.2: T41 echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStruct xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStruct xsi:type="ns1:SOAPStruct"
-                   xmlns:ns1="http://example.org/ts-tests/xsd">
-        <varInt xsi:type="xsd:int">42</varInt>
-        <varFloat xsi:type="xsd:float">0.005</varFloat>
-        <varString xsi:type="xsd:string">hello world</varString>
-      </inputStruct>
-    </test:echoStruct>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStructResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat></return></ns1:echoStructResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T42.phpt b/ext/soap/tests/soap12/T42.phpt
deleted file mode 100644
index 5b05c28962..0000000000
--- a/ext/soap/tests/soap12/T42.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-SOAP 1.2: T42 echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStructArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStructArray enc:itemType="ns1:SOAPStruct"
-                        enc:arraySize="2"
-                        xmlns:ns1="http://example.org/ts-tests/xsd"
-                        xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="ns1:SOAPStruct">
-          <varInt xsi:type="xsd:int">42</varInt>
-          <varFloat xsi:type="xsd:float">0.005</varFloat>
-          <varString xsi:type="xsd:string">hello world</varString>
-        </item>
-        <item xsi:type="ns1:SOAPStruct">
-          <varInt xsi:type="xsd:int">43</varInt>
-          <varFloat xsi:type="xsd:float">0.123</varFloat>
-          <varString xsi:type="xsd:string">bye world</varString>
-        </item>
-      </inputStructArray>
-    </test:echoStructArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStructArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="ns2:SOAPStruct" enc:arraySize="2" xsi:type="ns2:ArrayOfSOAPStruct"><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat></item><item xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">bye world</varString><varInt xsi:type="xsd:int">43</varInt><varFloat xsi:type="xsd:float">0.123</varFloat></item></return></ns1:echoStructArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T43.phpt b/ext/soap/tests/soap12/T43.phpt
deleted file mode 100644
index 7dd6316144..0000000000
--- a/ext/soap/tests/soap12/T43.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-SOAP 1.2: T43 echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStructAsSimpleTypes xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStruct xsi:type="ns1:SOAPStruct"
-                   xmlns:ns1="http://example.org/ts-tests/xsd">
-        <varInt xsi:type="xsd:int">42</varInt>
-        <varFloat xsi:type="xsd:float">0.005</varFloat>
-        <varString xsi:type="xsd:string">hello world</varString>
-      </inputStruct>
-    </test:echoStructAsSimpleTypes>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body><ns1:echoStructAsSimpleTypesResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><outputString xsi:type="xsd:string">hello world</outputString><outputInteger xsi:type="xsd:int">42</outputInteger><outputFloat xsi:type="xsd:float">0.005</outputFloat></ns1:echoStructAsSimpleTypesResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T44.phpt b/ext/soap/tests/soap12/T44.phpt
deleted file mode 100644
index 3e307c1357..0000000000
--- a/ext/soap/tests/soap12/T44.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP 1.2: T44 echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoSimpleTypesAsStruct xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputInt xsi:type="xsd:int">42</inputInt>
-      <inputFloat xsi:type="xsd:float">0.005</inputFloat>
-      <inputString xsi:type="xsd:string">hello world</inputString>
-    </test:echoSimpleTypesAsStruct>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoSimpleTypesAsStructResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat></return></ns1:echoSimpleTypesAsStructResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T45.phpt b/ext/soap/tests/soap12/T45.phpt
deleted file mode 100644
index 24db941682..0000000000
--- a/ext/soap/tests/soap12/T45.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-SOAP 1.2: T45 echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoNestedStruct xmlns:test="http://example.org/ts-tests"
-       env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStruct xsi:type="ns1:SOAPStructStruct"
-                   xmlns:ns1="http://example.org/ts-tests/xsd">
-        <varInt xsi:type="xsd:int">42</varInt>
-        <varFloat xsi:type="xsd:float">0.005</varFloat>
-        <varString xsi:type="xsd:string">hello world</varString>
-        <varStruct xsi:type="ns1:SOAPStruct">
-          <varInt xsi:type="xsd:int">99</varInt>
-          <varFloat xsi:type="xsd:float">5.5</varFloat>
-          <varString xsi:type="xsd:string">nested struct</varString>
-        </varStruct>
-      </inputStruct>
-    </test:echoNestedStruct>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoNestedStructResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPStructStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat><varStruct xsi:type="ns2:SOAPStruct"><varString xsi:type="xsd:string">nested struct</varString><varInt xsi:type="xsd:int">99</varInt><varFloat xsi:type="xsd:float">5.5</varFloat></varStruct></return></ns1:echoNestedStructResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T46.phpt b/ext/soap/tests/soap12/T46.phpt
deleted file mode 100644
index 8098ef72e7..0000000000
--- a/ext/soap/tests/soap12/T46.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP 1.2: T46 echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoNestedArray xmlns:test="http://exaple.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStruct xsi:type="ns1:SOAPArrayStruct"
-                   xmlns:ns1="http://example.org/ts-tests/xsd">
-        <varInt xsi:type="xsd:int">42</varInt>
-        <varFloat xsi:type="xsd:float">0.005</varFloat>
-        <varString xsi:type="xsd:string">hello world</varString>
-        <varArray enc:itemType="xsd:string" enc:arraySize="3"
-		          xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-          <item xsi:type="xsd:string">red</item>
-          <item xsi:type="xsd:string">blue</item>
-          <item xsi:type="xsd:string">green</item>
-        </varArray>
-      </inputStruct>
-    </test:echoNestedArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:ns2="http://example.org/ts-tests/xsd"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoNestedArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="ns2:SOAPArrayStruct"><varString xsi:type="xsd:string">hello world</varString><varInt xsi:type="xsd:int">42</varInt><varFloat xsi:type="xsd:float">0.005</varFloat><varArray enc:itemType="xsd:string" enc:arraySize="3" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">red</item><item xsi:type="xsd:string">blue</item><item xsi:type="xsd:string">green</item></varArray></return></ns1:echoNestedArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T47.phpt b/ext/soap/tests/soap12/T47.phpt
deleted file mode 100644
index 8a92f0a3c8..0000000000
--- a/ext/soap/tests/soap12/T47.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T47 echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoFloatArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputFloatArray enc:itemType="xsd:float" enc:arraySize="2"
-                       xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="xsd:float">5.5</item>
-        <item xsi:type="xsd:float">12999.9</item>
-      </inputFloatArray>
-    </test:echoFloatArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoFloatArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:float" enc:arraySize="2" xsi:type="ns2:ArrayOffloat"><item xsi:type="xsd:float">5.5</item><item xsi:type="xsd:float">12999.9</item></return></ns1:echoFloatArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T48.phpt b/ext/soap/tests/soap12/T48.phpt
deleted file mode 100644
index f7cf0fe3b8..0000000000
--- a/ext/soap/tests/soap12/T48.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T48 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStringArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStringArray enc:itemType="xsd:string" enc:arraySize="2"
-                        xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="xsd:string">hello</item>
-        <item xsi:type="xsd:string">world</item>
-      </inputStringArray>
-    </test:echoStringArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:string" enc:arraySize="2" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">hello</item><item xsi:type="xsd:string">world</item></return></ns1:echoStringArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T49.phpt b/ext/soap/tests/soap12/T49.phpt
deleted file mode 100644
index 9687d03b94..0000000000
--- a/ext/soap/tests/soap12/T49.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T49 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStringArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStringArray enc:arraySize="2"
-                        xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="xsd:string">hello</item>
-        <item xsi:type="xsd:string">world</item>
-      </inputStringArray>
-    </test:echoStringArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:string" enc:arraySize="2" xsi:type="ns2:ArrayOfstring"><item xsi:type="xsd:string">hello</item><item xsi:type="xsd:string">world</item></return></ns1:echoStringArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T50.phpt b/ext/soap/tests/soap12/T50.phpt
deleted file mode 100644
index e3fcc0c316..0000000000
--- a/ext/soap/tests/soap12/T50.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T50 echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoIntegerArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputIntegerArray enc:itemType="xsd:int" enc:arraySize="2"
-                         xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item xsi:type="xsd:int">100</item>
-        <item xsi:type="xsd:int">200</item>
-      </inputIntegerArray>
-    </test:echoIntegerArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://example.org/ts-tests/xsd"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoIntegerArrayResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return enc:itemType="xsd:int" enc:arraySize="2" xsi:type="ns2:ArrayOfint"><item xsi:type="xsd:int">100</item><item xsi:type="xsd:int">200</item></return></ns1:echoIntegerArrayResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T51.phpt b/ext/soap/tests/soap12/T51.phpt
deleted file mode 100644
index 97765763c1..0000000000
--- a/ext/soap/tests/soap12/T51.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP 1.2: T51 echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <env:Body>
-    <test:echoBase64 xmlns:test="http://example.org/ts-tests"
-       env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputBase64 xsi:type="xsd:base64Binary">
-        YUdWc2JHOGdkMjl5YkdRPQ==
-      </inputBase64>
-    </test:echoBase64>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoBase64Response env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:base64Binary">YUdWc2JHOGdkMjl5YkdRPQ==</return></ns1:echoBase64Response></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T52.phpt b/ext/soap/tests/soap12/T52.phpt
deleted file mode 100644
index 9d75fb9823..0000000000
--- a/ext/soap/tests/soap12/T52.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T52 echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoBoolean xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputBoolean xsi:type="xsd:boolean">1</inputBoolean>
-    </test:echoBoolean>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoBooleanResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:boolean">true</return></ns1:echoBooleanResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T53.phpt b/ext/soap/tests/soap12/T53.phpt
deleted file mode 100644
index c1c8fe63aa..0000000000
--- a/ext/soap/tests/soap12/T53.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T53 echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoDate xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputDate xsi:type="xsd:date">1956-10-18T22:20:00-07:00</inputDate>
-    </test:echoDate>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoDateResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:dateTime">1956-10-18T22:20:00-07:00</return></ns1:echoDateResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T54.phpt b/ext/soap/tests/soap12/T54.phpt
deleted file mode 100644
index ba3ed35526..0000000000
--- a/ext/soap/tests/soap12/T54.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T54 echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoDecimal xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputDecimal xsi:type="xsd:decimal">123.45678901234567890</inputDecimal>
-    </test:echoDecimal>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoDecimalResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:decimal">123.45678901234567890</return></ns1:echoDecimalResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T55.phpt b/ext/soap/tests/soap12/T55.phpt
deleted file mode 100644
index 1c12e504f2..0000000000
--- a/ext/soap/tests/soap12/T55.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T55 echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoFloat xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputFloat xsi:type="xsd:float">0.005</inputFloat>
-    </test:echoFloat>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoFloatResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:float">0.005</return></ns1:echoFloatResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T56.phpt b/ext/soap/tests/soap12/T56.phpt
deleted file mode 100644
index ca134270a3..0000000000
--- a/ext/soap/tests/soap12/T56.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-SOAP 1.2: T56 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-  <env:Header>
-    <test:DataHolder xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:Data enc:id="data-1" xsi:type="xsd:string">
-        hello world
-      </test:Data>
-    </test:DataHolder>
-  </env:Header>
-  <env:Body>
-    <test:echoString xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputString enc:ref="#data-2" xsi:type="xsd:string" />
-    </test:echoString>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Unresolved reference '#data-2'</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T57.phpt b/ext/soap/tests/soap12/T57.phpt
deleted file mode 100644
index ad3e9ef50f..0000000000
--- a/ext/soap/tests/soap12/T57.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP 1.2: T57 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-  <env:Header>
-    <test:DataHolder xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:Data enc:id="data" xsi:type="xsd:string">hello world</test:Data>
-    </test:DataHolder>
-  </env:Header>
-  <env:Body>
-    <test:echoString xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:inputString enc:ref="#data" xsi:type="xsd:string" />
-    </test:echoString>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:string">hello world</return></ns1:echoStringResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T58.phpt b/ext/soap/tests/soap12/T58.phpt
deleted file mode 100644
index 1c3e8ba7f5..0000000000
--- a/ext/soap/tests/soap12/T58.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP 1.2: T58 echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoIntegerArray xmlns:test="http://example.org/ts-tests" 
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputIntegerArray enc:itemType="xsd:int" enc:arraySize="1"
-                   xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <a><b>1</b></a>
-      </inputIntegerArray>		
-    </test:echoIntegerArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Violation of encoding rules</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T59.phpt b/ext/soap/tests/soap12/T59.phpt
deleted file mode 100644
index 2ceef325bb..0000000000
--- a/ext/soap/tests/soap12/T59.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP 1.2: T59 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoStringArray xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStringArray enc:itemType="xsd:string" 
-                        xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-        <item enc:id="data" xsi:type="xsd:string" enc:ref="#data">hello</item>
-        <item>world</item>
-      </inputStringArray>
-    </test:echoStringArray>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Violation of id and ref information items '#data'</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T60.phpt b/ext/soap/tests/soap12/T60.phpt
deleted file mode 100644
index 234ef4ccd4..0000000000
--- a/ext/soap/tests/soap12/T60.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-SOAP 1.2: T60 countItems
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:countItems xmlns:test="http://example.org/ts-tests"
-          xmlns:enc="http://www.w3.org/2003/05/soap-encoding"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStringArray enc:itemType="xsd:string" enc:arraySize="*">
-        <item xsi:type="xsd:string">hello</item>
-        <item xsi:type="xsd:string">world</item>
-      </inputStringArray>
-    </test:countItems>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:countItemsResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:int">2</return></ns1:countItemsResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T61.phpt b/ext/soap/tests/soap12/T61.phpt
deleted file mode 100644
index b688a794ff..0000000000
--- a/ext/soap/tests/soap12/T61.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP 1.2: T61 countItems
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:countItems xmlns:test="http://example.org/ts-tests"
-          xmlns:enc="http://www.w3.org/2003/05/soap-encoding"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputStringArray enc:itemType="xsd:string" enc:arraySize="2 *">
-        <item xsi:type="xsd:string">hello</item>
-        <item xsi:type="xsd:string">world</item>
-      </inputStringArray>
-    </test:countItems>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: '*' may only be first arraySize value in list</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T63.phpt b/ext/soap/tests/soap12/T63.phpt
deleted file mode 100644
index 5a41ef0109..0000000000
--- a/ext/soap/tests/soap12/T63.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T63 validateCountryCode
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:validateCountryCode xmlns:test="http://example.org/ts-tests"
-          env:role="http://example.org/ts-tests/C"
-          env:mustUnderstand="1">ABCD</test:validateCountryCode>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:validateCountryCodeFault>Country code must be 2 letters.</ns1:validateCountryCodeFault></env:Header><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>Not a valid country code</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T64.phpt b/ext/soap/tests/soap12/T64.phpt
deleted file mode 100644
index 24e62ecb6b..0000000000
--- a/ext/soap/tests/soap12/T64.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T64 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<!DOCTYPE DOC [
-<!NOTATION application_xml SYSTEM 'http://www.isi.edu/in-notes/iana/assignments/media-types/application/xml'>
-]>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
- <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>DTD are not supported by SOAP</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T65.phpt b/ext/soap/tests/soap12/T65.phpt
deleted file mode 100644
index cd96d4a82f..0000000000
--- a/ext/soap/tests/soap12/T65.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP 1.2: T65 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<!DOCTYPE DOC [
-<!ELEMENT Envelope (Body) >
-<!ELEMENT Body (echoOk) >
-<!ELEMENT echoOk (#PCDATA) >
-]>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>DTD are not supported by SOAP</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T66.phpt b/ext/soap/tests/soap12/T66.phpt
deleted file mode 100644
index cc7cc2e3e3..0000000000
--- a/ext/soap/tests/soap12/T66.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T66 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' encoding='UTF8'?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T67.phpt b/ext/soap/tests/soap12/T67.phpt
deleted file mode 100644
index ddc527a6ec..0000000000
--- a/ext/soap/tests/soap12/T67.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T67 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' standalone='yes'?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
- <env:Header>
-  <test:echoOk xmlns:test="http://example.org/ts-tests"
-        env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk>
- </env:Header>
- <env:Body>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T68.phpt b/ext/soap/tests/soap12/T68.phpt
deleted file mode 100644
index a7915196cb..0000000000
--- a/ext/soap/tests/soap12/T68.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP 1.2: T68 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-
-
- <env:Header           >
-
-                          <test:echoOk xmlns:test="http://example.org/ts-tests"
-        env:role="http://www.w3.org/2003/05/soap-envelope/role/next"  >foo</test:echoOk>
-  
-
- </env:Header>
- <env:Body>
- 
-            
- </env:Body>
- 
- 
-
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T69.phpt b/ext/soap/tests/soap12/T69.phpt
deleted file mode 100644
index 0fb02dec06..0000000000
--- a/ext/soap/tests/soap12/T69.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP 1.2: T69 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
- <env:Header>
-	<test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
- </env:Header>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>Body must be present in a SOAP envelope</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T70.phpt b/ext/soap/tests/soap12/T70.phpt
deleted file mode 100644
index 3622c320e7..0000000000
--- a/ext/soap/tests/soap12/T70.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T70 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
-  <env:Header>
-	<test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-  <Trailer>
-  </Trailer>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>A SOAP 1.2 envelope can contain only Header and Body</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T71.phpt b/ext/soap/tests/soap12/T71.phpt
deleted file mode 100644
index fdb5b8d460..0000000000
--- a/ext/soap/tests/soap12/T71.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T71 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-     attr1="a-value">
-  <env:Header>
-	<test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>A SOAP Envelope element cannot have non Namespace qualified attributes</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T72.phpt b/ext/soap/tests/soap12/T72.phpt
deleted file mode 100644
index b8f5060c6b..0000000000
--- a/ext/soap/tests/soap12/T72.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-SOAP 1.2: T72 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests">
-      foo
-    </test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>encodingStyle cannot be specified on the Envelope</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/T73.phpt b/ext/soap/tests/soap12/T73.phpt
deleted file mode 100644
index 9143e58179..0000000000
--- a/ext/soap/tests/soap12/T73.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-SOAP 1.2: T73 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoString xmlns:test="http://example.org/ts-tests"
-                     env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:inputString xsi:type="xsd:string"
-            env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">hello world</test:inputString>
-    </test:echoString>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:string">hello world</return></ns1:echoStringResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T74.phpt b/ext/soap/tests/soap12/T74.phpt
deleted file mode 100644
index 703e1870a6..0000000000
--- a/ext/soap/tests/soap12/T74.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP 1.2: T74 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Header>
-    <test:echoOk xmlns:test="http://example.org/ts-tests"
-          env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk>
-    <test:Unknown xmlns:test="http://example.org/ts-tests">
-      <test:raiseFault env:mustUnderstand="1" 
-            env:role="http://www.w3.org/2003/05/soap-envelope/role/next">
-      </test:raiseFault>
-    </test:Unknown>
-  </env:Header>
-  <env:Body>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T75.phpt b/ext/soap/tests/soap12/T75.phpt
deleted file mode 100644
index 3e2166d957..0000000000
--- a/ext/soap/tests/soap12/T75.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-SOAP 1.2: T75 echoResolvedRef
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
- <env:Header>
-  <test:echoResolvedRef xmlns:test="http://example.org/ts-tests"
-        env:role="http://www.w3.org/2003/05/soap-envelope/role/next"
-        env:mustUnderstand="1">
-    <test:RelativeReference xml:base="http://example.org/today/"
-          xlink:href="new.xml"
-          xmlns:xlink="http://www.w3.org/1999/xlink" />
-  </test:echoResolvedRef>
- </env:Header>
- <env:Body>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseResolvedRef>http://example.org/today/new.xml</ns1:responseResolvedRef></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T76_1.phpt b/ext/soap/tests/soap12/T76_1.phpt
deleted file mode 100644
index e97c179768..0000000000
--- a/ext/soap/tests/soap12/T76_1.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T76.1 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:echoString xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputString xsi:type="xsd:string">hello world</inputString>
-    </test:echoString>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:string">hello world</return></ns1:echoStringResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T76_2.phpt b/ext/soap/tests/soap12/T76_2.phpt
deleted file mode 100644
index cc6ea0df95..0000000000
--- a/ext/soap/tests/soap12/T76_2.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-SOAP 1.2: T76.2 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:enc="http://www.w3.org/2003/05/soap-encoding">
-  <env:Header>
-    <test:DataHolder xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <test:Data enc:id="data" xsi:type="xsd:string">hello world</test:Data>
-    </test:DataHolder>
-  </env:Header>
-  <env:Body>
-    <test:echoString xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputString enc:ref="data" xsi:type="xsd:string" />
-    </test:echoString>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:echoStringResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:string">hello world</return></ns1:echoStringResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T77_1.phpt b/ext/soap/tests/soap12/T77_1.phpt
deleted file mode 100644
index d847b6cfd8..0000000000
--- a/ext/soap/tests/soap12/T77_1.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-SOAP 1.2: T77.1 isNil
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:isNil xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputString xsi:nil="1" />
-    </test:isNil>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:isNilResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:boolean">true</return></ns1:isNilResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T77_2.phpt b/ext/soap/tests/soap12/T77_2.phpt
deleted file mode 100644
index c829b57892..0000000000
--- a/ext/soap/tests/soap12/T77_2.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-SOAP 1.2: T77.2 isNil
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:isNil xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-    </test:isNil>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:isNilResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:boolean">true</return></ns1:isNilResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T77_3.phpt b/ext/soap/tests/soap12/T77_3.phpt
deleted file mode 100644
index 0e1355a5a2..0000000000
--- a/ext/soap/tests/soap12/T77_3.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-SOAP 1.2: T77.3 isNul
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
-              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <test:isNil xmlns:test="http://example.org/ts-tests"
-          env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputString xsi:type="xsd:string">
-        This is a string
-      </inputString>
-    </test:isNil>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body xmlns:rpc="http://www.w3.org/2003/05/soap-rpc"><ns1:isNilResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"><rpc:result>return</rpc:result><return xsi:type="xsd:boolean">false</return></ns1:isNilResponse></env:Body></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T78.phpt b/ext/soap/tests/soap12/T78.phpt
deleted file mode 100644
index 63d13c7cae..0000000000
--- a/ext/soap/tests/soap12/T78.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-SOAP 1.2: T78 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version='1.0' ?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
- <env:Header>
-  <test:echoOk xmlns:test="http://example.org/ts-tests"
-        env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:echoOk>
- </env:Header>
- <env:Body>
- </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests"><env:Header><ns1:responseOk>foo</ns1:responseOk></env:Header><env:Body/></env:Envelope>
-ok
diff --git a/ext/soap/tests/soap12/T80.phpt b/ext/soap/tests/soap12/T80.phpt
deleted file mode 100644
index 1ac114ba32..0000000000
--- a/ext/soap/tests/soap12/T80.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-SOAP 1.2: T80 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$HTTP_RAW_POST_DATA = <<<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> 
-  <env:Body>
-    <test:echoOk xmlns:test="http://example.org/ts-tests" env:encodingStyle="http://example.org/PoisonEncoding">foo</test:echoOk>
-  </env:Body>
-</env:Envelope>
-EOF;
-include "soap12-test.inc";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:DataEncodingUnknown</env:Value></env:Code><env:Reason><env:Text>Unknown Data Encoding Style</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
diff --git a/ext/soap/tests/soap12/skipif.inc b/ext/soap/tests/soap12/skipif.inc
deleted file mode 100644
index fa8574e6a2..0000000000
--- a/ext/soap/tests/soap12/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/soap12/soap12-test.inc b/ext/soap/tests/soap12/soap12-test.inc
deleted file mode 100644
index 9774729d29..0000000000
--- a/ext/soap/tests/soap12/soap12-test.inc
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-class Soap12test {
-	public $header;
-
-	function echoOk($x) {
-  	return $x;
-	}
-
-	function echoString($inputString) {
-		return $inputString;
-	}
-
-	function echoStringArray($inputStringArray) {
-		return $inputStringArray;
-	}
-
-	function echoInteger($inputInteger) {
-		return $inputInteger;
-	}
-
-	function echoIntegerArray($inputIntegerArray) {
-		return $inputIntegerArray;
-	}
-
-	function echoFloat($inputFloat) {
-		return $inputFloat;
-	}
-
-	function echoFloatArray($inputFloatArray) {
-		return $inputFloatArray;
-  }
-
-	function echoStruct($x) {
-  	return $x;
-	}
-
-	function echoStructArray($x) {
-  	return $x;
-	}
-
-	function echoVoid() {
-		return NULL;
-	}
-
-	function echoBase64($b_encoded) {
-		return $b_encoded;
-  }
-
-	function echoDate($timeInstant) {
-		return $timeInstant;
-	}
-
-	function echoHexBinary($hb) {
-		return $hb;
-	}
-
-	function echoDecimal($dec) {
-		return $dec;
-	}
-
-	function echoBoolean($boolean) {
-		return $boolean;
-	}
-
-	function echoStructAsSimpleTypes ($struct) {
-		 return array('outputString'  => $struct->varString,
-		              'outputInteger' => $struct->varInt,
-		              'outputFloat'   => $struct->varFloat);
-	}
-
-	function echoSimpleTypesAsStruct($string, $int, $float) {
-		return (object)array("varString" => $string,
-		 										 "varInt"    => $int,
-	  										 "varFloat"  => $float);
-	}
-
-	function echoNestedStruct($struct) {
-		return $struct;
-	}
-
-	function echo2DStringArray($ary) {
-		return $ary;
-	}
-
-	function echoNestedArray($ary) {
-		return $ary;
-	}
-
-	function countItems($input) {
-		return count($input);
-	}
-
-	function isNil($input) {
-		return is_null($input);
-	}
-
-	function returnVoid() {
-	}
-
-	function emptyBody() {
-	}
-
-	function requiredHeader($x) {
-		$this->header = $x;
-	}
-
-	function echoHeader() {
-	  return $this->header;
-	}
-
-	function echoResolvedRef($ref) {
-	  return $ref->RelativeReference->base.$ref->RelativeReference->href;
-	}
-
-	function validateCountryCode($code) {
-		if (strlen($code) != 2) {
-		  return new SoapFault("Client", "Not a valid country code", NULL, NULL, NULL, new SoapHeader("http://example.org/ts-tests", "validateCountryCodeFault", "Country code must be 2 letters."));
-		} else {
-			return "OK";
-		}
-	}
-
-}
-
-$server = new soapserver(dirname(__FILE__)."/soap12-test.wsdl", array('soap_version'=>SOAP_1_2,'actor'=>"http://example.org/ts-tests/C"));
-$server->setClass("Soap12test");
-
-$server->handle();
-echo "ok\n";
-?>
diff --git a/ext/soap/tests/soap12/soap12-test.wsdl b/ext/soap/tests/soap12/soap12-test.wsdl
deleted file mode 100644
index d1679b475d..0000000000
--- a/ext/soap/tests/soap12/soap12-test.wsdl
+++ /dev/null
@@ -1,771 +0,0 @@
-<?xml version="1.0"?>
-
-<definitions name="SOAP-12-TestDefinitions"
-	targetNamespace="http://whitemesa.net/wsdl/soap12-test"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:enc="http://www.w3.org/2003/05/soap-encoding"
-	xmlns:tns="http://whitemesa.net/wsdl/soap12-test"
-	xmlns:types="http://example.org/ts-tests/xsd"
-	xmlns:test="http://example.org/ts-tests"
-	xmlns:xlink="http://www.w3.org/1999/xlink"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:enc11="http://schemas.xmlsoap.org/soap/encoding/">
-	<types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://example.org/ts-tests/xsd">
-
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-
-			<complexType name="ArrayOfstring">
-				<complexContent>
-					<restriction base="enc11:Array">
-						<attribute ref="enc11:arrayType" wsdl:arrayType="xsd:string[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="ArrayOfint">
-				<complexContent>
-					<restriction base="enc11:Array">
-						<attribute ref="enc11:arrayType" wsdl:arrayType="xsd:int[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="ArrayOffloat">
-				<complexContent>
-					<restriction base="enc11:Array">
-						<attribute ref="enc11:arrayType" wsdl:arrayType="xsd:float[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="ArrayOfSOAPStruct">
-				<complexContent>
-					<restriction base="enc11:Array">
-						<attribute ref="enc11:arrayType" wsdl:arrayType="types:SOAPStruct[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="SOAPStruct">
-				<all>
-					<element name="varString" type="xsd:string"/>
-					<element name="varInt" type="xsd:int"/>
-					<element name="varFloat" type="xsd:float"/>
-				</all>
-			</complexType>
-			<complexType name="SOAPStructStruct">
-				<all>
-					<element name="varString" type="xsd:string"/>
-					<element name="varInt" type="xsd:int"/>
-					<element name="varFloat" type="xsd:float"/>
-					<element name="varStruct" type="types:SOAPStruct"/>
-				</all>
-			</complexType>
-
-			<complexType name="SOAPArrayStruct">
-				<all>
-					<element name="varString" type="xsd:string"/>
-					<element name="varInt" type="xsd:int"/>
-					<element name="varFloat" type="xsd:float"/>
-					<element name="varArray" type="types:ArrayOfstring"/>
-				</all>
-			</complexType>
-
-			<!-- unknown header block type -->
-			<complexType name="UnknownType">
-					<sequence>
-						<element minOccurs="0" maxOccurs="1" name="stringValue" type="xsd:string" />
-					</sequence>
-			</complexType>
-
-		</schema>
-
-    	<schema xmlns="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://example.org/ts-tests">
-
-			<import namespace="http://www.w3.org/1999/xlink" />
-			<import namespace="http://example.org/ts-tests/xsd" />
-
-			<!-- 3.2.1 echoOk -->
-			<element name="echoOk" type="xsd:string"/>
-
-			<!-- 3.2.2 responseOk -->
-			<element name="responseOk" type="xsd:string"/>
-
-			<!-- 3.2.3 Ignore -->
-			<element name="Ignore" type="xsd:string"/>
-
-			<!-- 3.2.4 requiredHeader -->
-			<element name="requiredHeader" type="xsd:string"/>
-
-			<element name="echoHeader" type="xsd:string"/>
-			<element name="echoHeaderResponse" type="xsd:string"/>
-
-			<!-- 3.2.5 DataHolder -->
-			<element name="DataHolder" type="test:DataHolder_t"/>
-			<complexType name="DataHolder_t">
-				<sequence>
-					<element name="Data" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/>
-				</sequence>
-			</complexType>
-
-			<!-- 3.2.6 concatAndForwardEchoOk -->
-			<element name="concatAndForwardEchoOk"/>
-
-			<!-- 3.2.7 concatAndForwardEchoOkArg1 -->
-			<element name="concatAndForwardEchoOkArg1" type="xsd:string"/>
-
-			<!-- 3.2.8 concatAndForwardEchoOkArg2 -->
-			<element name="concatAndForwardEchoOkArg2" type="xsd:string"/>
-
-			<!-- 3.2.9 validateCountryCode -->
-			<element name="validateCountryCode" type="xsd:string"/>
-
-			<element name="validateCountryCodeResponse" type="xsd:string"/>
-
-			<!-- 3.2.10 validateCountryCodeFault -->
-			<element name="validateCountryCodeFault" type="xsd:string"/>
-
-			<!-- 3.2.11 echoResolvedRef -->
-			<element name="RelativeReference" type="test:RelativeReference_t"/>
-			<complexType name="RelativeReference_t">
-				<attribute ref="xml:base"/>
- 				<attribute ref="xlink:href"/>
-			</complexType>
-
-			<element name="echoResolvedRef" type="test:echoResolvedRef_t"/>
-			<complexType name="echoResolvedRef_t">
-				<sequence>
-					<element ref="test:RelativeReference" minOccurs="1" maxOccurs="1"/>
-				</sequence>
-			</complexType>
-
-			<!-- 3.2.12 responseResolvedRef -->
-			<element name="responseResolvedRef" type="xsd:string"/>
-
-			<!-- echoOkUltimateReceiver added to support testing of "relay" -->
-			<element name="echoOkUltimateReceiver" type="xsd:string"/>
-
-			<!-- responseOkUltimateReceiver added to support testing of "relay" -->
-			<element name="responseOkUltimateReceiver" type="xsd:string"/>
-
-			<element name="Unknown" type="types:UnknownType" />
-
-		</schema>
-
-	</types>
-
-	<!-- 3.4.1 returnVoid rpc operation -->
-	<message name="returnVoidRequest"/>
-	<message name="returnVoidResponse"/>
-
-	<!-- 3.4.2 echoStruct rpc operation -->
-	<message name="echoStructRequest">
-		<part name="inputStruct" type="types:SOAPStruct"/>
-	</message>
-	<message name="echoStructResponse">
-		<part name="return" type="types:SOAPStruct"/>
-	</message>
-
-	<!-- 3.4.3 echoStructArray rpc operation -->
-	<message name="echoStructArrayRequest">
-		<part name="inputStructArray" type="types:ArrayOfSOAPStruct"/>
-	</message>
-	<message name="echoStructArrayResponse">
-		<part name="return" type="types:ArrayOfSOAPStruct"/>
-	</message>
-
-	<!-- 3.4.4 echoStructAsSimpleTypes rpc operation -->
-	<message name="echoStructAsSimpleTypesRequest">
-		<part name="inputStruct" type="types:SOAPStruct"/>
-	</message>
-	<message name="echoStructAsSimpleTypesResponse">
-		<part name="outputString" type="xsd:string"/>
-		<part name="outputInteger" type="xsd:int"/>
-		<part name="outputFloat" type="xsd:float"/>
-	</message>
-
-	<!-- 3.4.5 echoSimpleTypesAsStruct rpc operation -->
-	<message name="echoSimpleTypesAsStructRequest">
-		<part name="inputString" type="xsd:string"/>
-		<part name="inputInt" type="xsd:int"/>
-		<part name="inputFloat" type="xsd:float"/>
-	</message>
-	<message name="echoSimpleTypesAsStructResponse">
-		<part name="return" type="types:SOAPStruct"/>
-	</message>
-
-	<!-- 3.4.6 echoNestedStruct rpc operation -->
-	<message name="echoNestedStructRequest">
-		<part name="inputStruct" type="types:SOAPStructStruct"/>
-	</message>
-	<message name="echoNestedStructResponse">
-		<part name="return" type="types:SOAPStructStruct"/>
-	</message>
-
-	<!-- 3.4.7 echoNestedArray rpc operation -->
-	<message name="echoNestedArrayRequest">
-		<part name="inputStruct" type="types:SOAPArrayStruct"/>
-	</message>
-	<message name="echoNestedArrayResponse">
-		<part name="return" type="types:SOAPArrayStruct"/>
-	</message>
-
-	<!-- 3.4.8 echoFloatArray rpc operation -->
-	<message name="echoFloatArrayRequest">
-		<part name="inputFloatArray" type="types:ArrayOffloat"/>
-	</message>
-	<message name="echoFloatArrayResponse">
-		<part name="return" type="types:ArrayOffloat"/>
-	</message>
-
-	<!-- 3.4.9 echoStringArray rpc operation -->
-	<message name="echoStringArrayRequest">
-		<part name="inputStringArray" type="types:ArrayOfstring"/>
-	</message>
-	<message name="echoStringArrayResponse">
-		<part name="return" type="types:ArrayOfstring"/>
-	</message>
-
-	<!-- 3.4.10 echoIntegerArray rpc operation -->
-	<message name="echoIntegerArrayRequest">
-		<part name="inputIntegerArray" type="types:ArrayOfint"/>
-	</message>
-	<message name="echoIntegerArrayResponse">
-		<part name="return" type="types:ArrayOfint"/>
-	</message>
-
-	<!-- 3.4.11 echoBase64 rpc operation -->
-	<message name="echoBase64Request">
-		<part name="inputBase64" type="xsd:base64Binary"/>
-	</message>
-	<message name="echoBase64Response">
-		<part name="return" type="xsd:base64Binary"/>
-	</message>
-
-	<!-- 3.4.12 echoBoolean rpc operation -->
-	<message name="echoBooleanRequest">
-		<part name="inputBoolean" type="xsd:boolean"/>
-	</message>
-	<message name="echoBooleanResponse">
-		<part name="return" type="xsd:boolean"/>
-	</message>
-
-	<!-- 3.4.13 echoDate rpc operation -->
-	<message name="echoDateRequest">
-		<part name="inputDate" type="xsd:dateTime"/>
-	</message>
-	<message name="echoDateResponse">
-		<part name="return" type="xsd:dateTime"/>
-	</message>
-
-	<!-- 3.4.14 echoDecimal rpc operation -->
-	<message name="echoDecimalRequest">
-		<part name="inputDecimal" type="xsd:decimal"/>
-	</message>
-	<message name="echoDecimalResponse">
-		<part name="return" type="xsd:decimal"/>
-	</message>
-
-	<!-- 3.4.15 echoFloat rpc operation -->
-	<message name="echoFloatRequest">
-		<part name="inputFloat" type="xsd:float"/>
-	</message>
-	<message name="echoFloatResponse">
-		<part name="return" type="xsd:float"/>
-	</message>
-
-	<!-- 3.4.16 echoString rpc operation -->
-	<message name="echoStringRequest">
-		<part name="inputString" type="xsd:string"/>
-	</message>
-	<message name="echoStringResponse">
-		<part name="return" type="xsd:string"/>
-	</message>
-
-	<!-- 3.4.17 countItems rpc operation -->
-	<message name="countItemsRequest">
-		<part name="inputStringArray" type="types:ArrayOfstring"/>
-	</message>
-	<message name="countItemsResponse">
-		<part name="return" type="xsd:int"/>
-	</message>
-
-	<!-- 3.4.18 isNil rpc operation -->
-	<message name="isNilRequest">
-		<part name="inputString" type="xsd:string"/>
-	</message>
-	<message name="isNilResponse">
-		<part name="return" type="xsd:boolean"/>
-	</message>
-
-	<!-- DataHolder header block -->
-	<message name="DataHolderRequest">
-		<part name="DataHolder" type="test:DataHolder_t"/>
-	</message>
-	<message name="DataHolderResponse">
-		<part name="DataHolder" type="test:DataHolder_t"/>
-	</message>
-
-	<!-- empty message for doc/literal testing -->
-	<message name="emptyBodyRequest"/>
-	<message name="emptyBodyResponse"/>
-
-	<!-- echoOk body/header block -->
-	<message name="echoOkRequest">
-		<part name="echoOk" element="test:echoOk"/>
-	</message>
-	<message name="echoOkResponse">
-		<part name="responseOk" element="test:responseOk"/>
-	</message>
-
-	<message name="requiredHeaderRequest">
-		<part name="requiredHeader" element="test:requiredHeader"/>
-	</message>
-	<message name="echoHeaderRequest">
-		<part name="responseHeader" element="test:echoHeader"/>
-	</message>
-	<message name="echoHeaderResponse">
-		<part name="responseHeader" element="test:echoHeaderResponse"/>
-	</message>
-
-	<message name="echoResolvedRefRequest">
-		<part name="responseHeader" element="test:echoResolvedRef"/>
-	</message>
-	<message name="echoResolvedRefResponse">
-		<part name="responseHeader" element="test:responseResolvedRef"/>
-	</message>
-
-	<!-- "unknown" header block -->
-	<message name="UnknownHdrBlockLit">
-		<part name="Unknown" element="test:Unknown" />
-	</message>
-	<message name="UnknownHdrBlockEnc">
-		<part name="Unknown" type="types:UnknownType" />
-	</message>
-
-	<message name="validateCountryCodeRequest">
-		<part name="validateCountryCode" element="test:validateCountryCode" />
-	</message>
-	<message name="validateCountryCodeFault">
-		<part name="validateCountryCodeFault" element="test:validateCountryCodeFault" />
-	</message>
-	<message name="validateCountryCodeResponse">
-		<part name="validateCountryCodeResponse" element="test:validateCountryCodeResponse" />
-	</message>
-
-
-  	<portType name="Soap12TestPortTypeDoc">
-    		<operation name="emptyBody">
-      			<input message="tns:emptyBodyRequest" />
-      			<output message="tns:emptyBodyResponse" />
-    		</operation>
-    		<operation name="echoOk">
-      			<input message="tns:echoOkRequest" />
-      			<output message="tns:echoOkResponse" />
-    		</operation>
-    		<operation name="requiredHeader">
-      			<input message="tns:requiredHeaderRequest" />
-    		</operation>
-    		<operation name="echoHeader">
-      			<input message="tns:echoHeaderRequest" />
-      			<output message="tns:echoHeaderResponse" />
-    		</operation>
-    		<operation name="echoResolvedRef">
-      			<input message="tns:echoResolvedRefRequest" />
-      			<output message="tns:echoResolvedRefResponse" />
-    		</operation>
-	</portType>
-
-	<portType name="Soap12TestPortTypeRpc">
-
-		<!-- 3.4.1 returnVoid rpc operation -->
-		<operation name="returnVoid">
-			<input message="tns:returnVoidRequest"/>
-			<output message="tns:returnVoidResponse"/>
-		</operation>
-
-		<!-- 3.4.2 echoStruct rpc operation -->
-		<operation name="echoStruct" parameterOrder="inputStruct">
-			<input message="tns:echoStructRequest"/>
-			<output message="tns:echoStructResponse"/>
-		</operation>
-
-		<!-- 3.4.3 echoStructArray rpc operation -->
-		<operation name="echoStructArray" parameterOrder="inputStructArray">
-			<input message="tns:echoStructArrayRequest"/>
-			<output message="tns:echoStructArrayResponse"/>
-		</operation>
-
-		<!-- 3.4.4 echoStructAsSimpleTypes rpc operation -->
-		<operation name="echoStructAsSimpleTypes" parameterOrder="inputStruct outputString outputInteger outputFloat">
-			<input message="tns:echoStructAsSimpleTypesRequest"/>
-			<output message="tns:echoStructAsSimpleTypesResponse"/>
-		</operation>
-
-		<!-- 3.4.5 echoSimpleTypesAsStruct rpc operation -->
-		<operation name="echoSimpleTypesAsStruct" parameterOrder="inputString inputInteger inputFloat">
-			<input message="tns:echoSimpleTypesAsStructRequest"/>
-			<output message="tns:echoSimpleTypesAsStructResponse"/>
-		</operation>
-
-		<!-- 3.4.6 echoNestedStruct rpc operation -->
-		<operation name="echoNestedStruct" parameterOrder="inputStruct">
-			<input message="tns:echoNestedStructRequest"/>
-			<output message="tns:echoNestedStructResponse"/>
-		</operation>
-
-		<!-- 3.4.7 echoNestedArray rpc operation -->
-		<operation name="echoNestedArray" parameterOrder="inputStruct">
-			<input message="tns:echoNestedArrayRequest"/>
-			<output message="tns:echoNestedArrayResponse"/>
-		</operation>
-
-		<!-- 3.4.8 echoFloatArray rpc operation -->
-		<operation name="echoFloatArray" parameterOrder="inputFloatArray">
-			<input message="tns:echoFloatArrayRequest"/>
-			<output message="tns:echoFloatArrayResponse"/>
-		</operation>
-
-		<!-- 3.4.9 echoStringArray rpc operation -->
-		<operation name="echoStringArray" parameterOrder="inputStringArray">
-			<input message="tns:echoStringArrayRequest"/>
-			<output message="tns:echoStringArrayResponse"/>
-		</operation>
-
-		<!-- 3.4.10 echoIntegerArray rpc operation -->
-		<operation name="echoIntegerArray" parameterOrder="inputIntegerArray">
-			<input message="tns:echoIntegerArrayRequest"/>
-			<output message="tns:echoIntegerArrayResponse"/>
-		</operation>
-
-		<!-- 3.4.11 echoBase64 rpc operation -->
-		<operation name="echoBase64" parameterOrder="inputBase64">
-			<input message="tns:echoBase64Request"/>
-			<output message="tns:echoBase64Response"/>
-		</operation>
-
-		<!-- 3.4.12 echoBoolean rpc operation -->
-		<operation name="echoBoolean" parameterOrder="inputBoolean">
-			<input message="tns:echoBooleanRequest"/>
-			<output message="tns:echoBooleanResponse"/>
-		</operation>
-
-		<!-- 3.4.13 echoDate rpc operation -->
-		<operation name="echoDate" parameterOrder="inputDate">
-			<input message="tns:echoDateRequest"/>
-			<output message="tns:echoDateResponse"/>
-		</operation>
-
-		<!-- 3.4.14 echoDecimal rpc operation -->
-		<operation name="echoDecimal" parameterOrder="inputDecimal">
-			<input message="tns:echoDecimalRequest"/>
-			<output message="tns:echoDecimalResponse"/>
-		</operation>
-
-		<!-- 3.4.15 echoFloat rpc operation -->
-		<operation name="echoFloat" parameterOrder="inputFloat">
-			<input message="tns:echoFloatRequest"/>
-			<output message="tns:echoFloatResponse"/>
-		</operation>
-
-		<!-- 3.4.16 echoString rpc operation -->
-		<operation name="echoString" parameterOrder="inputString">
-			<input message="tns:echoStringRequest"/>
-			<output message="tns:echoStringResponse"/>
-		</operation>
-
-		<!-- 3.4.17 countItems rpc operation -->
-		<operation name="countItems" parameterOrder="inputStringArray">
-			<input message="tns:countItemsRequest"/>
-			<output message="tns:countItemsResponse"/>
-		</operation>
-
-		<!-- 3.4.18 isNil rpc operation -->
-		<operation name="isNil" parameterOrder="inputString">
-			<input message="tns:isNilRequest"/>
-			<output message="tns:isNilResponse"/>
-		</operation>
-
-	</portType>
-
-  	<binding name="Soap12TestDocBinding" type="tns:Soap12TestPortTypeDoc">
-    		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    		<operation name="emptyBody">
-      			<soap12:operation/>
-      			<input>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkRequest" part="echoOk" use="literal" />
-        			<soap12:header message="tns:UnknownHdrBlockLit" part="Unknown" use="literal" />
-        			<soap12:header message="tns:validateCountryCodeRequest" part="validateCountryCode" use="literal">
-        			  <soap12:headerfault message="tns:validateCountryCodeFault" part="validateCountryCodeFault" use="literal"/>
-        			</soap12:header>
-      			</input>
-      			<output>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkResponse" part="responseOk" use="literal" />
-        			<soap12:header message="tns:validateCountryCodeResponse" part="validateCountryCodeResponse" use="literal"/>
-      			</output>
-    		</operation>
-    		<operation name="echoOk">
-      			<soap12:operation/>
-      			<input>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkRequest" part="echoOk" use="literal" />
-				<soap12:header message="tns:UnknownHdrBlockLit" part="Unknown" use="literal" />
-      			</input>
-      			<output>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkResponse" part="responseOk" use="literal" />
-      			</output>
-    		</operation>
-    		<operation name="requiredHeader">
-      			<soap12:operation/>
-      			<input>
-        			<soap12:body use="literal" />
-      			</input>
-    		</operation>
-    		<operation name="echoHeader">
-      			<soap12:operation/>
-      			<input>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkRequest" part="echoOk" use="literal" />
-				<soap12:header message="tns:UnknownHdrBlockLit" part="Unknown" use="literal" />
-      			</input>
-      			<output>
-        			<soap12:body use="literal" />
-        			<soap12:header message="tns:echoOkResponse" part="responseOk" use="literal" />
-      			</output>
-    		</operation>
-    		<operation name="echoResolvedRef">
-      			<soap12:operation/>
-      			<input>
-        			<soap12:body use="literal" />
-      			</input>
-      			<output>
-        			<soap12:body use="literal" />
-      			</output>
-    		</operation>
-	</binding>
-
-	<binding name="Soap12TestRpcBinding" type="tns:Soap12TestPortTypeRpc">
-		<soap12:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<!-- 3.4.1 returnVoid rpc operation -->
-		<operation name="returnVoid">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.2 echoStruct rpc operation -->
-		<operation name="echoStruct">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.3 echoStructArray rpc operation -->
-		<operation name="echoStructArray">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.4 echoStructAsSimpleTypes rpc operation -->
-		<operation name="echoStructAsSimpleTypes">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.5 echoSimpleTypesAsStruct rpc operation -->
-		<operation name="echoSimpleTypesAsStruct">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.6 echoNestedStruct rpc operation -->
-		<operation name="echoNestedStruct">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.7 echoNestedArray rpc operation -->
-		<operation name="echoNestedArray">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.8 echoFloatArray rpc operation -->
-		<operation name="echoFloatArray">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.9 echoStringArray rpc operation -->
-		<operation name="echoStringArray">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.10 echoIntegerArray rpc operation -->
-		<operation name="echoIntegerArray">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.11 echoBase64 rpc operation -->
-		<operation name="echoBase64">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.12 echoBoolean rpc operation -->
-		<operation name="echoBoolean">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.13 echoDate rpc operation -->
-		<operation name="echoDate">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.14 echoDecimal rpc operation -->
-		<operation name="echoDecimal">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.15 echoFloat rpc operation -->
-		<operation name="echoFloat">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.16 echoString rpc operation -->
-		<operation name="echoString">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-				<soap12:header use="encoded" message="tns:DataHolderRequest" part="DataHolder" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-				<soap12:header use="encoded" message="tns:DataHolderResponse" part="DataHolder" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.17 countItems rpc operation -->
-		<operation name="countItems">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-		<!-- 3.4.18 isNil rpc operation -->
-		<operation name="isNil">
-			<soap12:operation/>
-			<input>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</input>
-			<output>
-				<soap12:body use="encoded" namespace="http://example.org/ts-tests" encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
-			</output>
-		</operation>
-
-	</binding>
-
-
-	<service name="WhiteMesaSoap12TestSvc">
-  		<port name="Soap12TestDocPort" binding="tns:Soap12TestDocBinding">
-    			<soap12:address location="http://localhost/soap12/test-doc"/>
-  		</port>
-  		<port name="Soap12TestRpcPort" binding="tns:Soap12TestRpcBinding">
-    			<soap12:address location="http://localhost/soap12/test-rpc"/>
-  		</port>
-
-	</service>
-
-</definitions>
diff --git a/ext/soap/tests/test.wsdl b/ext/soap/tests/test.wsdl
deleted file mode 100644
index 0740b7db62..0000000000
--- a/ext/soap/tests/test.wsdl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<definitions
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    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/"
-    xmlns:si="http://soapinterop.org/xsd"
-    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-
-  <types>
-    <xsd:schema targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
-      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" />
-    </xsd:schema>
-  </types>
-
-  <message name="AddRequest">
-    <part name="x" type="xsd:double" />
-    <part name="y" type="xsd:double" />
-  </message>
-  <message name="AddResponse">
-    <part name="result" type="xsd:double" />
-  </message>
-
-  <portType name="TestServicePortType">
-    <operation name="Add">
-      <input message="tns:AddRequest" />
-      <output message="tns:AddResponse" />
-    </operation>
-  </portType>
-
-  <binding name="TestServiceBinding" type="tns:TestServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-    <operation name="Add">
-      <soap:operation soapAction="Add" style="rpc" />
-      <input>
-        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </input>
-      <output>
-        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </output>
-    </operation>
-  </binding>
-
-  <service name="TestService">
-    <port name="TestServicePort" binding="tns:TestServiceBinding">
-      <soap:address location="http://linuxsrv.home/~dmitry/soap/soap_server.php" />
-    </port>
-  </service>
-
-</definitions>
diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt
deleted file mode 100644
index 9134d3d7fb..0000000000
--- a/ext/soap/tests/transport001.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-SOAP Transport 1: Local transport using SoapClient::__doRequest
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-function Add($x,$y) {
-  return $x+$y;
-}
-
-class LocalSoapClient extends SoapClient {
-
-  function __construct($wsdl, $options) {
-    parent::__construct($wsdl, $options);
-    $this->server = new SoapServer($wsdl, $options);
-    $this->server->addFunction('Add');
-  }
-
-  function __doRequest($request, $location, $action, $version) {
-    ob_start();
-    $this->server->handle($request);
-    $response = ob_get_contents();
-    ob_end_clean();
-    return $response;
-  }
-
-}
-
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
-                                   'uri'=>'http://testuri.org')); 
-var_dump($x->Add(3,4));
-echo "ok\n";
-?>
---EXPECT--
-int(7)
-ok
diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt
deleted file mode 100755
index d76170a748..0000000000
--- a/ext/soap/tests/typemap001.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-SOAP typemap 1: SoapServer support for typemap's from_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
- <ns1:dotest>
-  <book xsi:type=\"ns1:book\">
-    <a xsi:type=\"xsd:string\">foo</a>
-    <b xsi:type=\"xsd:string\">bar</b>
-</book>
-</ns1:dotest>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_from_xml($xml) {
-	$sxe = simplexml_load_string($xml);
-	$obj = new book;
-	$obj->a = (string)$sxe->a;
-	$obj->b = (string)$sxe->b;
-	return $obj;
-}
-
-class test{
-	function dotest($book){
-		$classname=get_class($book);
-		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-$options=Array(
-		'actor'   =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "from_xml"  => "book_from_xml"))
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotestResponse><res xsi:type="xsd:string">Object: book(foo,bar)</res></ns1:dotestResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt
deleted file mode 100755
index ee80c5981c..0000000000
--- a/ext/soap/tests/typemap002.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-SOAP typemap 2: SoapServer support for typemap's to_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
-<ns1:dotest2>
-<dotest2 xsi:type=\"xsd:string\">???</dotest2>
-</ns1:dotest2>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_to_xml($book) {
-	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
-}
-
-class test{
-	function dotest2($str){
-		$book = new book;
-		$book->a = "foo";
-		$book->b = "bar";
-		return $book;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-$options=Array(
-		'actor'   =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"    => "book_to_xml"))
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest2Response><book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns1:book"><a xsi:type="xsd:string">foo!</a><b xsi:type="xsd:string">bar!</b></book></ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt
deleted file mode 100755
index 17bd6c16e3..0000000000
--- a/ext/soap/tests/typemap003.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-SOAP Typemap 3: SoapClient support for typemap's from_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-		return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotest2Response><res xsi:type="ns1:book">
-  <a xsi:type="xsd:string">foo</a>
-  <b xsi:type="xsd:string">bar</b>
-</res>
-</ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_from_xml($xml) {
-	$sxe = simplexml_load_string($xml);
-	$obj = new book;
-	$obj->a = (string)$sxe->a;
-	$obj->b = (string)$sxe->b;
-	return $obj;
-}
-
-$options=Array(
-		'actor' =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "from_xml"  => "book_from_xml"))
-		);
-
-$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options);
-$ret = $client->dotest2("???");
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECTF--
-object(book)#%d (2) {
-  ["a"]=>
-  string(3) "foo"
-  ["b"]=>
-  string(3) "bar"
-}
-ok
diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt
deleted file mode 100755
index f94af49900..0000000000
--- a/ext/soap/tests/typemap004.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-SOAP Typemap 4: SoapClient support for typemap's to_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-  		echo $request;
-  		exit;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_to_xml($book) {
-	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
-}
-
-$options=Array(
-		'actor' =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"  => "book_to_xml"))
-		);
-
-$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options);
-$book = new book();
-$book->a = "foo";
-$book->b = "bar";
-$ret = $client->dotest($book);
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest><book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns1:book"><a xsi:type="xsd:string">foo!</a><b xsi:type="xsd:string">bar!</b></book></ns1:dotest></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/typemap005.phpt b/ext/soap/tests/typemap005.phpt
deleted file mode 100755
index b016519a75..0000000000
--- a/ext/soap/tests/typemap005.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-SOAP typemap 5: SoapServer support for typemap's from_xml() (without WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
- <ns1:dotest>
-  <book xsi:type=\"ns1:book\">
-    <a xsi:type=\"xsd:string\">foo</a>
-    <b xsi:type=\"xsd:string\">bar</b>
-</book>
-</ns1:dotest>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_from_xml($xml) {
-	$sxe = simplexml_load_string($xml);
-	$obj = new book;
-	$obj->a = (string)$sxe->a;
-	$obj->b = (string)$sxe->b;
-	return $obj;
-}
-
-class test{
-	function dotest($book){
-		$classname=get_class($book);
-		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-$options=Array(
-		'uri'     => "http://schemas.nothing.com",
-		'actor'   => 'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "from_xml"  => "book_from_xml"))
-		);
-
-$server = new SoapServer(NULL,$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotestResponse><return xsi:type="xsd:string">Object: book(foo,bar)</return></ns1:dotestResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap006.phpt b/ext/soap/tests/typemap006.phpt
deleted file mode 100755
index 1e3609a8bc..0000000000
--- a/ext/soap/tests/typemap006.phpt
+++ /dev/null
@@ -1,57 +0,0 @@
---TEST--
-SOAP typemap 6: SoapServer support for typemap's to_xml() (without WSDL, using SoapVar)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
-<ns1:dotest2>
-<dotest2 xsi:type=\"xsd:string\">???</dotest2>
-</ns1:dotest2>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_to_xml($book) {
-	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
-}
-
-class test{
-	function dotest2($str){
-		$book = new book;
-		$book->a = "foo";
-		$book->b = "bar";
-		return new SoapVar($book, null, "book", "http://schemas.nothing.com");
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-$options=Array(
-		'uri'     => "http://schemas.nothing.com",
-		'actor'   => 'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"    => "book_to_xml"))
-		);
-
-$server = new SoapServer(NULL,$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest2Response><book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns1:book"><a xsi:type="xsd:string">foo!</a><b xsi:type="xsd:string">bar!</b></book></ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt
deleted file mode 100755
index 8e2880b58e..0000000000
--- a/ext/soap/tests/typemap007.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-SOAP Typemap 7: SoapClient support for typemap's from_xml() (without WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-		return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotest2Response><res xsi:type="ns1:book">
-  <a xsi:type="xsd:string">foo</a>
-  <b xsi:type="xsd:string">bar</b>
-</res>
-</ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_from_xml($xml) {
-	$sxe = simplexml_load_string($xml);
-	$obj = new book;
-	$obj->a = (string)$sxe->a;
-	$obj->b = (string)$sxe->b;
-	return $obj;
-}
-
-$options=Array(
-        'uri'      => 'http://schemas.nothing.com',
-        'location' => 'test://',
-		'actor'    => 'http://schemas.nothing.com',
-		'typemap'  => array(array("type_ns"   => "http://schemas.nothing.com",
-		                          "type_name" => "book",
-		                          "from_xml"  => "book_from_xml"))
-		);
-
-$client = new TestSoapClient(NULL, $options);
-$ret = $client->dotest2("???");
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECTF--
-object(book)#%d (2) {
-  ["a"]=>
-  string(3) "foo"
-  ["b"]=>
-  string(3) "bar"
-}
-ok
diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt
deleted file mode 100755
index aaaa715d67..0000000000
--- a/ext/soap/tests/typemap008.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-SOAP Typemap 8: SoapClient support for typemap's to_xml() (without WSDL, using SoapVar)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-  		echo $request;
-  		exit;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_to_xml($book) {
-	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
-}
-
-$options=Array(
-        'uri'      => 'http://schemas.nothing.com',
-        'location' => 'test://',
-		'actor'    => 'http://schemas.nothing.com',
-		'typemap'  => array(array("type_ns"   => "http://schemas.nothing.com",
-		                          "type_name" => "book",
-		                          "to_xml"  => "book_to_xml"))
-		);
-
-$client = new TestSoapClient(NULL, $options);
-$book = new book();
-$book->a = "foo";
-$book->b = "bar";
-$ret = $client->dotest(new SoapVar($book, null, "book", "http://schemas.nothing.com"));
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest><book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns1:book"><a xsi:type="xsd:string">foo!</a><b xsi:type="xsd:string">bar!</b></book></ns1:dotest></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt
deleted file mode 100755
index 337aea65cc..0000000000
--- a/ext/soap/tests/typemap009.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-SOAP typemap 9: SoapServer support for typemap's from_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
- <ns1:dotest>
-  <book xsi:type=\"ns1:book\">
-    <a xsi:type=\"xsd:string\">foo</a>
-    <b xsi:type=\"xsd:string\">bar</b>
-</book>
-</ns1:dotest>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_from_xml($xml) {
-	throw new SoapFault("Server", "Conversion Failed");
-}
-
-class test{
-	function dotest($book){
-		$classname=get_class($book);
-		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-$options=Array(
-		'actor'   =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "from_xml"  => "book_from_xml"))
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Conversion Failed</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt
deleted file mode 100755
index 44d2746bdd..0000000000
--- a/ext/soap/tests/typemap010.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-SOAP typemap 10: SoapServer support for typemap's to_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
-<ns1:dotest2>
-<dotest2 xsi:type=\"xsd:string\">???</dotest2>
-</ns1:dotest2>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_to_xml($book) {
-	throw new SoapFault("Server", "Conversion Fault");
-}
-
-class test{
-	function dotest2($str){
-		$book = new book;
-		$book->a = "foo";
-		$book->b = "bar";
-		return $book;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-$options=Array(
-		'actor'   =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"    => "book_to_xml"))
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Conversion Fault</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok
diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt
deleted file mode 100755
index 52acde28d9..0000000000
--- a/ext/soap/tests/typemap011.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-SOAP Typemap 11: SoapClient support for typemap's from_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-		return <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" 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:dotest2Response><res xsi:type="ns1:book">
-  <a xsi:type="xsd:string">foo</a>
-  <b xsi:type="xsd:string">bar</b>
-</res>
-</ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-EOF;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_from_xml($xml) {
-	throw new SoapFault("Client", "Conversion Error");
-}
-
-$options=Array(
-		'actor' =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "from_xml"  => "book_from_xml"))
-		);
-
-$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options);
-try {
-	$ret = $client->dotest2("???");
-} catch (SoapFault $e) {
-	$ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring;
-}
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECT--
-string(37) "SoapFault = Client - Conversion Error"
-ok
diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt
deleted file mode 100755
index aa06215fe3..0000000000
--- a/ext/soap/tests/typemap012.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-SOAP Typemap 12: SoapClient support for typemap's to_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-class TestSoapClient extends SoapClient{
-  function __doRequest($request, $location, $action, $version) {
-  		echo $request;
-  		exit;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-function book_to_xml($book) {
-	throw new SoapFault("Client", "Conversion Error");
-}
-
-$options=Array(
-		'actor' =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"  => "book_to_xml"))
-		);
-
-$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options);
-$book = new book();
-$book->a = "foo";
-$book->b = "bar";
-try {
-	$ret = $client->dotest($book);
-} catch (SoapFault $e) {
-	$ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring;
-}
-var_dump($ret);
-echo "ok\n";
-?>
---EXPECT--
-string(37) "SoapFault = Client - Conversion Error"
-ok
diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt
deleted file mode 100755
index 99003c8dc1..0000000000
--- a/ext/soap/tests/typemap013.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-SOAP typemap 13: SoapServer support for typemap's to_xml() with default ns
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-$GLOBALS['HTTP_RAW_POST_DATA']="
-<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" 
-	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-	xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-	xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
-	xmlns:ns1=\"http://schemas.nothing.com\"
->
-  <env:Body>
-<ns1:dotest2>
-<dotest2 xsi:type=\"xsd:string\">???</dotest2>
-</ns1:dotest2>
- </env:Body>
-<env:Header/>
-</env:Envelope>";	
-
-function book_to_xml($book) {
-	return '<book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
-}
-
-class test{
-	function dotest2($str){
-		$book = new book;
-		$book->a = "foo";
-		$book->b = "bar";
-		return $book;
-	}	
-}
-
-class book{
-	public $a="a";
-	public $b="c";
-		
-}
-
-$options=Array(
-		'actor'   =>'http://schemas.nothing.com',
-		'typemap' => array(array("type_ns"   => "http://schemas.nothing.com",
-		                         "type_name" => "book",
-		                         "to_xml"    => "book_to_xml"))
-		);
-
-$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options);
-$server->setClass("test");
-$server->handle();
-echo "ok\n";
-?>
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest2Response><book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns1:book"><a xsi:type="xsd:string">foo!</a><b xsi:type="xsd:string">bar!</b></book></ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok