Imported Upstream version 5.4.8upstream/5.4.8

3 files changed, 74 insertions, 3 deletions

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 84d603b59..5addec4ff 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1818,11 +1818,12 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
 
 			zend_hash_internal_pointer_reset_ex(model->u.content, &pos);
 			while (zend_hash_get_current_data_ex(model->u.content, (void**)&tmp, &pos) == SUCCESS) {
-				if (!model_to_xml_object(node, *tmp, object, style, (*tmp)->min_occurs > 0 TSRMLS_CC)) {
-					if ((*tmp)->min_occurs > 0) {
+				if (!model_to_xml_object(node, *tmp, object, style, strict && ((*tmp)->min_occurs > 0) TSRMLS_CC)) {
+					if (!strict || (*tmp)->min_occurs > 0) {
 						return 0;
 					}
 				}
+				strict = 1;
 				zend_hash_move_forward_ex(model->u.content, &pos);
 			}
 			return 1;
@@ -1845,7 +1846,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
 			return ret;
 		}
 		case XSD_CONTENT_GROUP: {
-			return model_to_xml_object(node, model->u.group->model, object, style, model->min_occurs > 0 TSRMLS_CC);
+			return model_to_xml_object(node, model->u.group->model, object, style, strict && model->min_occurs > 0 TSRMLS_CC);
 		}
 		default:
 		  break;
diff --git a/ext/soap/tests/bugs/bug50997.phpt b/ext/soap/tests/bugs/bug50997.phpt
new file mode 100644
index 000000000..0508aaccd
--- /dev/null
+++ b/ext/soap/tests/bugs/bug50997.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+$soapClient = new SoapClient(__DIR__ . '/bug50997.wsdl', array('trace' => 1, 'exceptions'=>0));
+$params = array('code'=>'foo');
+$soapClient->newOperation($params);
+echo $soapClient->__getLastRequest();
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://www.example.org/service2/"><SOAP-ENV:Body><ns1:NewOperation><code>foo</code></ns1:NewOperation></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug50997.wsdl b/ext/soap/tests/bugs/bug50997.wsdl
new file mode 100644
index 000000000..16c6d3675
--- /dev/null
+++ b/ext/soap/tests/bugs/bug50997.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/service2/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="service2" targetNamespace="http://www.example.org/service2/">
+      <wsdl:types>
+        <xsd:schema targetNamespace="http://www.example.org/service2/">
+          <xsd:element name="NewOperation">
+            <xsd:complexType>
+              <xsd:choice>
+                                  <xsd:sequence>
+                                    <xsd:element name="firstName" type="xsd:string"> </xsd:element>
+                                    <xsd:element name="surName" type="xsd:string"/>
+                                  </xsd:sequence>
+                                  <xsd:element name="code" type="xsd:string"/>
+                                </xsd:choice>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="NewOperationResponse">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="out" type="xsd:string"/>
+              </xsd:sequence>
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:schema>
+      </wsdl:types>
+      <wsdl:message name="NewOperationRequest">
+        <wsdl:part element="tns:NewOperation" name="parameters"/>
+      </wsdl:message>
+      <wsdl:message name="NewOperationResponse">
+        <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
+      </wsdl:message>
+      <wsdl:portType name="service2">
+        <wsdl:operation name="NewOperation">
+          <wsdl:input message="tns:NewOperationRequest"/>
+          <wsdl:output message="tns:NewOperationResponse"/>
+        </wsdl:operation>
+      </wsdl:portType>
+      <wsdl:binding name="service2SOAP" type="tns:service2">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="NewOperation">
+          <soap:operation soapAction="http://www.example.org/service2/NewOperation"/>
+          <wsdl:input>
+            <soap:body use="literal"/>
+          </wsdl:input>
+          <wsdl:output>
+            <soap:body use="literal"/>
+          </wsdl:output>
+        </wsdl:operation>
+      </wsdl:binding>
+      <wsdl:service name="service2">
+        <wsdl:port binding="tns:service2SOAP" name="service2SOAP">
+          <soap:address location="test://"/>
+        </wsdl:port>
+      </wsdl:service>
+    </wsdl:definitions>