fix: XMLSchema <choice> support was improved to support elements with minOccurs=0

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 88a447a7126da3b96e71f51436368331c91e8a56..9487336a569362bc421c43430f9d0a5dac920a89 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1056,7 +1056,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, HashTa
                                }
                                return 1;
                        } else if (model->min_occurs == 0) {
-                               return 1;
+                               return 2;
                        } else {
                                if (strict) {
                                        php_error(E_ERROR, "SOAP-ERROR: Encoding: object hasn't '%s' property",model->u.element->name);
@@ -1080,15 +1080,19 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, HashTa
                }
                case XSD_CONTENT_CHOICE: {
                        sdlContentModelPtr *tmp;
+                       int ret = 0;
 
                        zend_hash_internal_pointer_reset(model->u.content);
                        while (zend_hash_get_current_data(model->u.content, (void**)&tmp) == SUCCESS) {
-                               if (model_to_xml_object(node, *tmp, prop, style, 0)) {
+                               int tmp_ret = model_to_xml_object(node, *tmp, prop, style, 0);
+                               if (tmp_ret == 1) {
                                        return 1;
+                               } else if (tmp_ret != 0) {
+                                       ret = 1;
                                }
                                zend_hash_move_forward(model->u.content);
                        }
-                       return 0;
+                       return ret;
                }
                case XSD_CONTENT_GROUP: {
                        return model_to_xml_object(node, model->u.group->model, prop, style, model->min_occurs > 0);