Imported Upstream version 5.2.3upstream/5.2.3

24 files changed, 214 insertions, 22 deletions

diff --git a/ext/soap/tests/bugs/bug28751.phpt b/ext/soap/tests/bugs/bug28751.phpt
index e850b7f75..1f382f39f 100644
--- a/ext/soap/tests/bugs/bug28751.phpt
+++ b/ext/soap/tests/bugs/bug28751.phpt
@@ -29,7 +29,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
 </SOAP-ENV:Envelope>

 EOF;

 

-$server->handle();

+$server->handle($HTTP_RAW_POST_DATA);

 echo "ok\n";

 ?>

 --EXPECT--

diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
index fb75b8be2..f14866954 100644
--- a/ext/soap/tests/bugs/bug29839.phpt
+++ b/ext/soap/tests/bugs/bug29839.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #29839 incorrect convert (xml:lang to lang)

+Bug #29839 (incorrect convert (xml:lang to lang))

 --SKIPIF--

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

 --FILE--

@@ -38,4 +38,4 @@ echo "ok\n";
 <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
+ok

diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
index a17aa1768..1745f5698 100644
--- a/ext/soap/tests/bugs/bug30106.phpt
+++ b/ext/soap/tests/bugs/bug30106.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #30106 SOAP cannot not parse 'ref' element. Causes Uncaught SoapFault exception.

+Bug #30106 (SOAP cannot not parse 'ref' element. Causes Uncaught SoapFault exception)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt
index 3e902bfb2..c478c7372 100644
--- a/ext/soap/tests/bugs/bug30799.phpt
+++ b/ext/soap/tests/bugs/bug30799.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #30799 SoapServer doesn't handle private or protected properties 

+Bug #30799 (SoapServer doesn't handle private or protected properties)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
index 2a013aed5..a4873af1c 100644
--- a/ext/soap/tests/bugs/bug30928.phpt
+++ b/ext/soap/tests/bugs/bug30928.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #30928 When Using WSDL, SoapServer doesn't handle private or protected properties 

+Bug #30928 (When Using WSDL, SoapServer doesn't handle private or protected properties)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt
index 0b9f3a281..4d0d933d1 100644
--- a/ext/soap/tests/bugs/bug30994.phpt
+++ b/ext/soap/tests/bugs/bug30994.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #30994 SOAP server unable to handle request with references 

+Bug #30994 (SOAP server unable to handle request with references)

 --SKIPIF--

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

 --FILE--

@@ -40,7 +40,7 @@ function bassCall() {
 

 $x = new SoapServer(NULL, array("uri"=>"http://spock/kunta/kunta"));

 $x->addFunction("bassCall");

-$x->handle();

+$x->handle($HTTP_RAW_POST_DATA);

 ?>

 --EXPECT--

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

diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt
index 4103d05f3..b10f4ecc4 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #31422 No Error-Logging on SoapServer-Side

+Bug #31422 (No Error-Logging on SoapServer-Side)

 --SKIPIF--

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

 --INI--

@@ -32,7 +32,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
 </SOAP-ENV:Envelope>

 EOF;

 

-$server->handle();

+$server->handle($HTTP_RAW_POST_DATA);

 echo "ok\n";

 ?>

 --EXPECTF--

diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
index 8277ce623..0779e3db4 100644
--- a/ext/soap/tests/bugs/bug31695.phpt
+++ b/ext/soap/tests/bugs/bug31695.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #31695 Cannot redefine endpoint when using WSDL

+Bug #31695 (Cannot redefine endpoint when using WSDL)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug31755.phpt b/ext/soap/tests/bugs/bug31755.phpt
index 7901d6e0b..a0f8a4c48 100644
--- a/ext/soap/tests/bugs/bug31755.phpt
+++ b/ext/soap/tests/bugs/bug31755.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #31422 No Error-Logging on SoapServer-Side

+Bug #31422 (No Error-Logging on SoapServer-Side)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
index fd6dcdf42..6736fb4be 100644
--- a/ext/soap/tests/bugs/bug32776.phpt
+++ b/ext/soap/tests/bugs/bug32776.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #32776 SOAP doesn't support one-way operations

+Bug #32776 (SOAP doesn't support one-way operations)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
index 60277ca72..8e2501761 100755
--- a/ext/soap/tests/bugs/bug34453.phpt
+++ b/ext/soap/tests/bugs/bug34453.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #29839 incorrect convert (xml:lang to lang)

+Bug #29839 (incorrect convert (xml:lang to lang))

 --SKIPIF--

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

 --FILE--

@@ -38,4 +38,4 @@ echo "ok\n";
 <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
+ok

diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
index 7ab49430c..8d366c8f3 100755
--- a/ext/soap/tests/bugs/bug35142.phpt
+++ b/ext/soap/tests/bugs/bug35142.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #35142 SOAP Client/Server Complex Object Support 

+Bug #35142 (SOAP Client/Server Complex Object Support)

 --SKIPIF--

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

 --INI--

diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt
index 9c33d891c..cd238bad1 100755
--- a/ext/soap/tests/bugs/bug35273.phpt
+++ b/ext/soap/tests/bugs/bug35273.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #35273 Error in mapping soap - java types 
+Bug #35273 (Error in mapping soap - java types)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
index 2d3461d61..8d3d42b89 100755
--- a/ext/soap/tests/bugs/bug36226.phpt
+++ b/ext/soap/tests/bugs/bug36226.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #36226 SOAP Inconsistent handling when passing potential arrays.

+Bug #36226 (SOAP Inconsistent handling when passing potential arrays)

 --SKIPIF--

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

 --INI--

diff --git a/ext/soap/tests/bugs/bug36629.phpt b/ext/soap/tests/bugs/bug36629.phpt
index 7982cfa6b..b22345363 100755
--- a/ext/soap/tests/bugs/bug36629.phpt
+++ b/ext/soap/tests/bugs/bug36629.phpt
@@ -27,7 +27,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
   </SOAP-ENV:Body>

 </SOAP-ENV:Envelope>

 EOF;

-$server->handle();

+$server->handle($HTTP_RAW_POST_DATA);

 

 $HTTP_RAW_POST_DATA = <<<EOF

 <?xml version="1.0" encoding="ISO-8859-1"?>

@@ -42,7 +42,7 @@ $HTTP_RAW_POST_DATA = <<<EOF
   </SOAP-ENV:Body>

 </SOAP-ENV:Envelope>

 EOF;

-$server->handle();

+$server->handle($HTTP_RAW_POST_DATA);

 echo "ok\n";

 ?>

 --EXPECT--

diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt
index ced64cddf..1bc49b1f9 100755
--- a/ext/soap/tests/bugs/bug39815.phpt
+++ b/ext/soap/tests/bugs/bug39815.phpt
@@ -7,6 +7,8 @@ if (!function_exists('setlocale')) die('skip setlocale() not available');
 if (!@setlocale(LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE locale not available');

 if (!@setlocale(LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US locale not available');

 ?>

+--INI--

+precision=14

 --FILE--

 <?php

 function test(){

diff --git a/ext/soap/tests/bugs/bug39832.phpt b/ext/soap/tests/bugs/bug39832.phpt
index b8510f32c..527ca897b 100755
--- a/ext/soap/tests/bugs/bug39832.phpt
+++ b/ext/soap/tests/bugs/bug39832.phpt
@@ -22,7 +22,7 @@ function Test($x) {
 

 $x = new SoapServer(dirname(__FILE__)."/bug39832.wsdl");

 $x->addFunction("Test");

-$x->handle();

+$x->handle($HTTP_RAW_POST_DATA);

 ?>

 --EXPECT--

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

diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt
index 7359ead38..743ae9d3f 100755
--- a/ext/soap/tests/bugs/bug41004.phpt
+++ b/ext/soap/tests/bugs/bug41004.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #41004 minOccurs="0" and null class member variable 

+Bug #41004 (minOccurs="0" and null class member variable)

 --SKIPIF--

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

 --FILE--

diff --git a/ext/soap/tests/bugs/bug41337.phpt b/ext/soap/tests/bugs/bug41337.phpt
new file mode 100755
index 000000000..8f44e2781
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41337.phpt
@@ -0,0 +1,12 @@
+--TEST--

+Bug #41337 (WSDL parsing doesn't ignore non soap bindings)

+--SKIPIF--

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

+--FILE--

+<?php

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

+$client = new SoapClient(dirname(__FILE__)."/bug41337.wsdl");

+echo "ok\n";

+?>

+--EXPECT--

+ok

diff --git a/ext/soap/tests/bugs/bug41337.wsdl b/ext/soap/tests/bugs/bug41337.wsdl
new file mode 100755
index 000000000..14e5dc4b4
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41337.wsdl
@@ -0,0 +1,63 @@
+<?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="TestServiceBinding2" type="tns:TestServicePortType">
+    <operation name="Add">
+      <input/>
+      <output/>
+    </operation>
+  </binding>
+
+  <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="TestServicePort2" binding="tns:TestServiceBinding"/>
+    <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/bug41337_2.phpt b/ext/soap/tests/bugs/bug41337_2.phpt
new file mode 100755
index 000000000..0e4504e73
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41337_2.phpt
@@ -0,0 +1,12 @@
+--TEST--

+Bug #41337 (WSDL parsing doesn't ignore non soap bindings)

+--SKIPIF--

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

+--FILE--

+<?php

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

+$client = new SoapClient(dirname(__FILE__)."/bug41337_2.wsdl");

+echo "ok\n";

+?>

+--EXPECT--

+ok

diff --git a/ext/soap/tests/bugs/bug41337_2.wsdl b/ext/soap/tests/bugs/bug41337_2.wsdl
new file mode 100755
index 000000000..46c078a0e
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41337_2.wsdl
@@ -0,0 +1,36 @@
+<?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">
+
+  <import namespace="http://linuxsrv.home/~dmitry/soap/test.wsdl"
+		location="bug41337_2_1.wsdl" />
+
+  <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/bugs/bug41337_2_1.wsdl b/ext/soap/tests/bugs/bug41337_2_1.wsdl
new file mode 100755
index 000000000..857dc6ccf
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41337_2_1.wsdl
@@ -0,0 +1,47 @@
+<?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="TestServiceBinding2" type="tns:TestServicePortType">
+    <operation name="Add">
+      <input/>
+      <output/>
+    </operation>
+  </binding>
+
+  <service name="TestService2">
+    <port name="TestServicePort2" binding="tns:TestServiceBinding"/>
+  </service>
+
+</definitions>
diff --git a/ext/soap/tests/bugs/bug41477.phpt b/ext/soap/tests/bugs/bug41477.phpt
new file mode 100644
index 000000000..a103e6920
--- /dev/null
+++ b/ext/soap/tests/bugs/bug41477.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #41477 (no arginfo about SoapClient::__soapCall())
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$objRfClass = new ReflectionClass('SoapClient');
+$objRfMethod = $objRfClass->getMethod('__soapCall');
+$arrParams = $objRfMethod->getParameters();
+foreach($arrParams as $objRfParam)
+{
+        var_dump($objRfParam->getName());
+}
+?>
+--EXPECT--
+string(13) "function_name"
+string(9) "arguments"
+string(7) "options"
+string(13) "input_headers"
+string(14) "output_headers"