Imported Upstream version 5.2.5upstream/5.2.5

9 files changed, 493 insertions, 0 deletions

diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt
new file mode 100755
index 000000000..6edc06f87
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42086.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+$request = <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><firstFunctionWithoutParam/></SOAP-ENV:Body></SOAP-ENV:Envelope>
+EOF;
+
+class firstFunctionWithoutParamResponse {
+	public $param;
+}
+
+function firstFunctionWithoutParam() {
+	$ret = new firstFunctionWithoutParamResponse();
+	$ret->param	=	"firstFunctionWithoutParam";
+	return $ret;
+}
+	
+$server = new SoapServer(dirname(__FILE__).'/bug42086.wsdl',
+	array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS));
+$server->addFunction('firstFunctionWithoutParam');
+$server->handle($request);
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><firstFunctionWithoutParamReturn><param>firstFunctionWithoutParam</param></firstFunctionWithoutParamReturn></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug42086.wsdl b/ext/soap/tests/bugs/bug42086.wsdl
new file mode 100755
index 000000000..5ec3d956c
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42086.wsdl
@@ -0,0 +1,141 @@
+<?xml version='1.0' encoding='UTF-8'?>

+

+<!-- WSDL file generated by Zend Studio. -->

+

+<definitions name="LBAService" targetNamespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" xmlns:typens="http://xml.avaya.com/ws/device-management/distributed-enterprise" 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="http://xml.avaya.com/ws/device-management/distributed-enterprise">

+			<xsd:complexType name="firstFunctionClassParam">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+					<xsd:element name="vectparam" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

+				</xsd:all>

+			</xsd:complexType>

+			<xsd:complexType name="firstFunctionClassParamResponse">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+				</xsd:all>

+			</xsd:complexType>

+			<xsd:complexType name="firstFunctionWithoutParamResponse">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+				</xsd:all>

+			</xsd:complexType>

+			<xsd:complexType name="secondFunctionClassParam">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+					<xsd:element name="vectparam" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

+				</xsd:all>

+			</xsd:complexType>

+			<xsd:complexType name="secondFunctionClassParamResponse">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+				</xsd:all>

+			</xsd:complexType>

+			<xsd:complexType name="secondFunctionWithoutParamResponse">

+				<xsd:all>

+					<xsd:element name="param" type="xsd:string"/>

+				</xsd:all>

+			</xsd:complexType>

+		</xsd:schema>

+	</types>

+	<message name="firstFunctionClassParam">

+		<part name="firstFunctionClassParam" type="typens:firstFunctionClassParam"/>

+	</message>

+	<message name="firstFunctionClassParamResponse">

+		<part name="firstFunctionClassParamReturn" type="typens:firstFunctionClassParamResponse"/>

+	</message>

+	<message name="firstFunctionWithoutParam"/>

+<!--

+	<message name="firstFunctionWithoutParam">

+		<part name="firstFunctionWithoutParam"/>

+	</message>

+-->

+	<message name="firstFunctionWithoutParamResponse">

+		<part name="firstFunctionWithoutParamReturn" type="typens:firstFunctionWithoutParamResponse"/>

+	</message>

+	<message name="secondFunctionClassParam">

+		<part name="secondFunctionClassParam" type="typens:secondFunctionClassParam"/>

+	</message>

+	<message name="secondFunctionClassParamResponse">

+		<part name="secondFunctionClassParamReturn" type="typens:secondFunctionClassParamResponse"/>

+	</message>

+	<message name="secondFunctionWithoutParam"/>

+	<message name="secondFunctionWithoutParamResponse">

+		<part name="secondFunctionWithoutParamReturn" type="typens:secondFunctionWithoutParamResponse"/>

+	</message>

+	<portType name="wsImpPortType">

+		<operation name="firstFunctionClassParam">

+			<documentation>

+				Enter description here...

+			</documentation>

+			<input message="typens:firstFunctionClassParam"/>

+			<output message="typens:firstFunctionClassParamResponse"/>

+		</operation>

+		<operation name="firstFunctionWithoutParam">

+			<documentation>

+				Enter description here...

+			</documentation>

+			<input message="typens:firstFunctionWithoutParam"/>

+			<output message="typens:firstFunctionWithoutParamResponse"/>

+		</operation>

+		<operation name="secondFunctionClassParam">

+			<documentation>

+				Enter description here...

+			</documentation>

+			<input message="typens:secondFunctionClassParam"/>

+			<output message="typens:secondFunctionClassParamResponse"/>

+		</operation>

+		<operation name="secondFunctionWithoutParam">

+			<documentation>

+				Enter description here...

+			</documentation>

+			<input message="typens:secondFunctionWithoutParam"/>

+			<output message="typens:secondFunctionWithoutParamResponse"/>

+		</operation>

+	</portType>

+	<binding name="wsImpBinding" type="typens:wsImpPortType">

+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

+		<operation name="firstFunctionClassParam">

+			<soap:operation soapAction="urn:wsImpAction"/>

+			<input>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</input>

+			<output>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</output>

+		</operation>

+		<operation name="firstFunctionWithoutParam">

+			<soap:operation soapAction="urn:wsImpAction"/>

+			<input>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</input>

+			<output>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</output>

+		</operation>

+		<operation name="secondFunctionClassParam">

+			<soap:operation soapAction="urn:wsImpAction"/>

+			<input>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</input>

+			<output>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</output>

+		</operation>

+		<operation name="secondFunctionWithoutParam">

+			<soap:operation soapAction="urn:wsImpAction"/>

+			<input>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</input>

+			<output>

+				<soap:body namespace="http://xml.avaya.com/ws/device-management/distributed-enterprise" use="literal"/>

+			</output>

+		</operation>

+	</binding>

+	<service name="LBAService">

+		<port name="wsImpPort" binding="typens:wsImpBinding">

+			<soap:address location="test://"/>

+		</port>

+	</service>

+</definitions>

diff --git a/ext/soap/tests/bugs/bug42214.phpt b/ext/soap/tests/bugs/bug42214.phpt
new file mode 100755
index 000000000..aaad3a14f
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42214.phpt
@@ -0,0 +1,24 @@
+--TEST--

+Bug #42214 SoapServer sends clients internal PHP errors

+--SKIPIF--

+<?php require_once('skipif.inc'); ?>

+--FILE--

+<?php

+$request = <<<EOF

+<?xml version="1.0" encoding="UTF-8"?>

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://localhost/server.php" 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>

+EOF;

+

+function test() {

+	$a = $b;

+	obvious_error(); // will cause an error

+}

+

+$server = new SoapServer(NULL, array('uri' =>'http://localhost/server.php',

+	'send_errors'=>0));

+$server->addFunction('test');

+$server->handle($request);

+?>

+--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>Internal Error</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>

diff --git a/ext/soap/tests/bugs/bug42326.phpt b/ext/soap/tests/bugs/bug42326.phpt
new file mode 100755
index 000000000..02ba9d01e
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42326.phpt
@@ -0,0 +1,49 @@
+--TEST--

+Bug #42326 (SoapServer crash)

+--SKIPIF--

+<?php require_once('skipif.inc'); ?>

+--INI--

+soap.wsdl_cache_enabled=0

+--FILE--

+<?php

+$request = <<<EOF

+<?xml version="1.0" encoding="UTF-8"?>

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://www.example.com/"><SOAP-ENV:Body><ns1:GetProductsRequest><time></time></ns1:GetProductsRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>

+EOF;

+

+

+$soap_admin_classmap = array('productDetailsType' => 'SOAP_productDetailsType',

+                             'GetProductsRequest' => 'SOAP_GetProductsRequest',

+                             'GetProductsResponse' => 'SOAP_GetProductsResponse');

+

+class SOAP_productDetailsType {

+    public $id = 0;

+}

+

+class SOAP_GetProductsRequest {

+    public $time = '';

+}

+

+class SOAP_GetProductsResponse {

+    public $products;

+    function __construct(){

+        $this->products = new SOAP_productDetailsType();

+        

+    }

+}

+

+class SOAP_Admin {

+    public function GetProducts($time){

+        return new SOAP_GetProductsResponse();

+    }

+}

+

+$soap = new SoapServer(dirname(__FILE__).'/bug42326.wsdl', array('classmap' => $soap_admin_classmap));

+$soap->setClass('SOAP_Admin');

+ob_start();

+$soap->handle($request);

+ob_end_clean();

+echo "ok\n";

+?>

+--EXPECT--

+ok

diff --git a/ext/soap/tests/bugs/bug42326.wsdl b/ext/soap/tests/bugs/bug42326.wsdl
new file mode 100755
index 000000000..a125ed8cd
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42326.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>

+<wsdl:definitions name="OSCAdmin.wsdl"

+targetNamespace="http://www.example.com/"

+xmlns:tns="http://www.example.com/"

+xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

+xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">          

+    <wsdl:types>

+

+       <xsd:schema targetNamespace="http://www.example.com/"

+              xmlns="http://www.w3.org/2000/10/XMLSchema">

+              <xsd:element name="productDetailsType">

+              <xsd:complexType>

+              <xsd:all>

+              <xsd:element name="id" type="xsd:integer"/>

+              

+              </xsd:all>

+              </xsd:complexType>

+              </xsd:element>

+       </xsd:schema>

+

+

+       <xsd:schema targetNamespace="http://www.example.com/"

+              xmlns="http://www.w3.org/2000/10/XMLSchema">

+              <xsd:element name="GetProductsRequest">

+              <xsd:complexType>

+              <xsd:all>

+              <xsd:element name="time" type="xsd:string"/>

+              </xsd:all>

+              </xsd:complexType>

+              </xsd:element>

+       </xsd:schema>

+

+       <xsd:schema targetNamespace="http://www.example.com/"

+              xmlns="http://www.w3.org/2000/10/XMLSchema">

+              <xsd:element name="GetProductsResponse">

+              <xsd:complexType>

+              <xsd:all>

+              <xsd:element name="products" type="tns:productDetailsType"/>

+              </xsd:all>

+              </xsd:complexType>

+              </xsd:element>

+       </xsd:schema>

+

+       

+    </wsdl:types>

+

+    <wsdl:message name="GetProductsRequest">

+        <wsdl:part name="in" element="tns:GetProductsRequest"/>

+    </wsdl:message>

+

+    <wsdl:message name="GetProductsResponse">

+        <wsdl:part name="out" element="tns:GetProductsResponse"/>

+    </wsdl:message>

+

+    <wsdl:portType name="OSCAdminPortType">

+        <wsdl:operation name="GetProducts">

+           <wsdl:input message="tns:GetProductsRequest"/>

+           <wsdl:output message="tns:GetProductsResponse"/>

+        </wsdl:operation>

+    </wsdl:portType>

+

+    <wsdl:binding name="OSCAdminSoapBinding" type="tns:OSCAdminPortType">

+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

+        <wsdl:operation name="GetProducts">

+           <soap:operation soapAction=""/>

+           <wsdl:input name="in">

+               <soap:body use="literal"/>

+           </wsdl:input>

+           <wsdl:output name="out">

+               <soap:body use="literal"/>

+           </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+

+    <wsdl:service name="OSCAdminService">

+        <wsdl:port name="OSCAdminPort" binding="tns:OSCAdminSoapBinding">

+           <soap:address location="test://"/>

+        </wsdl:port>

+    </wsdl:service>

+

+</wsdl:definitions>
\ No newline at end of file
diff --git a/ext/soap/tests/bugs/bug42359.phpt b/ext/soap/tests/bugs/bug42359.phpt
new file mode 100755
index 000000000..27cb42d49
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42359.phpt
@@ -0,0 +1,20 @@
+--TEST--

+Bug #42326 (SoapServer crash)

+--SKIPIF--

+<?php require_once('skipif.inc'); ?>

+--INI--

+soap.wsdl_cache_enabled=0

+--FILE--

+<?php

+$soap = new SoapClient(dirname(__FILE__)."/bug42359.wsdl");

+print_r($soap->__getTypes());

+?>

+--EXPECT--

+Array

+(

+    [0] => list listItem {anonymous1}

+    [1] => string anonymous1

+    [2] => string enumItem

+    [3] => list listItem2 {enumItem}

+)

+

diff --git a/ext/soap/tests/bugs/bug42359.wsdl b/ext/soap/tests/bugs/bug42359.wsdl
new file mode 100755
index 000000000..bc73adaec
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42359.wsdl
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<definitions name="listTest" targetNamespace="urn:listTest" xmlns:typens="urn:listTest" 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:listTest">

+      <xsd:simpleType name="listItem">

+          <xsd:list>

+              <xsd:simpleType>

+            <xsd:restriction base="xsd:string">

+              <xsd:enumeration value="test1" />

+              <xsd:enumeration value="test2" />

+            </xsd:restriction>

+          </xsd:simpleType>

+        </xsd:list>

+      </xsd:simpleType>

+      <xsd:simpleType name="enumItem">

+        <xsd:restriction base="xsd:string">

+          <xsd:enumeration value="test1" />

+          <xsd:enumeration value="test2" />

+        </xsd:restriction>

+      </xsd:simpleType>

+      <xsd:simpleType name="listItem2">

+        <xsd:list itemType="typens:enumItem"/>

+      </xsd:simpleType>

+    </xsd:schema>

+  </types>

+  <message name="testRequest">

+    <part name="item" type="typens:listItem"/>

+  </message>

+  <message name="testRequestResponse">

+    <part name="testRequestReturn" type="xsd:integer"/>

+  </message>

+  <portType name="listTestPortType">

+    <operation name="testRequest">

+      <documentation>

+        Test request

+      </documentation>

+      <input message="typens:testRequest"/>

+      <output message="typens:testRequestResponse"/>

+    </operation>

+  </portType>

+  <binding name="listTestBinding" type="typens:listTestPortType">

+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>

+    <operation name="testRequest">

+      <soap:operation soapAction="urn:listTestAction"/>

+      <input>

+        <soap:body namespace="urn:listTest" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>

+      </input>

+      <output>

+        <soap:body namespace="urn:listTest" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>

+      </output>

+    </operation>

+  </binding>

+  <service name="listTestService">

+    <port name="listTestPort" binding="typens:listTestBinding">

+      <soap:address location="http://test/service"/>

+    </port>

+  </service>

+</definitions>

diff --git a/ext/soap/tests/bugs/bug42488.phpt b/ext/soap/tests/bugs/bug42488.phpt
new file mode 100755
index 000000000..83120abec
--- /dev/null
+++ b/ext/soap/tests/bugs/bug42488.phpt
@@ -0,0 +1,22 @@
+--TEST--

+Bug #42488 (SoapServer reports an encoding error and the error itself breaks)

+--SKIPIF--

+<?php require_once('skipif.inc'); ?>

+--INI--

+soap.wsdl_cache_enabled=0

+--FILE--

+<?php

+$request = <<<EOF

+<?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:getBadUTF/></SOAP-ENV:Body></SOAP-ENV:Envelope>

+EOF;

+$soap = new SoapServer(NULL, array('uri'=>'test://'));

+function getBadUTF(){

+    return "stuff\x93thing";

+}

+$soap->addFunction('getBadUTF');

+$soap->handle($request);

+?>

+--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>SOAP-ERROR: Encoding: string 'stuff\x93...' is not a valid utf-8 string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
diff --git a/ext/soap/tests/classmap004.phpt b/ext/soap/tests/classmap004.phpt
new file mode 100755
index 000000000..58f29f488
--- /dev/null
+++ b/ext/soap/tests/classmap004.phpt
@@ -0,0 +1,66 @@
+--TEST--

+SOAP Classmap 4: encoding of objects with __get()

+--SKIPIF--

+<?php require_once('skipif.inc'); ?>

+--FILE--

+<?php

+ini_set("soap.wsdl_cache_enabled",0);

+

+class A {

+  public $a;

+  function __construct($a){

+    $this->x = $a;

+  }

+  function __get($name) {

+    return @$this->a[$name];

+  }

+  function __set($name, $val) {

+    $this->a[$name] = $val;

+  }

+  function __unset($name) {

+    unset($this->a[$name]);

+  }

+}

+

+class B extends A {

+  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

+(

+    [a] => Array

+        (

+            [x] => 5

+            [y] => 6

+        )

+

+)