cvs: php-src /ext/soap soap.c

felipe Mon Sep 15 18:04:18 2008 UTC Modified files: /php-src/ext/soap soap.c Log: - Added E_ERROR in constructors http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.250&r2=1.251&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.250 php-src/ext/soap/soap.c:1.251 --- php-src/ext/soap/soap.c:1.250 Mon Sep 8 19:34:48 2008 +++ php-src/ext/soap/soap.c Mon Sep 15 18:04:18 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.250 2008/09/08 19:34:48 felipe Exp $ */ +/* $Id: soap.c,v 1.251 2008/09/15 18:04:18 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1545,8 +1545,8 @@ SOAP_SERVER_BEGIN_CODE(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t!|a", &zwsdl, &zwsdl_len, &zwsdl_type, &options) == FAILURE) { - return; + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "t!|a", &zwsdl, &zwsdl_len, &zwsdl_type, &options) == FAILURE) { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters"); } if (zwsdl.v) { @@ -1601,8 +1601,7 @@ } encoding = xmlFindCharEncodingHandler(str); if (encoding == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); } else { service->encoding = encoding; } @@ -1643,8 +1642,7 @@ } if (wsdl == NULL && service->uri == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments. 'uri' option is required in nonWSDL mode"); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "'uri' option is required in nonWSDL mode"); } @@ -2847,7 +2845,7 @@ client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t!|a", &zwsdl, &zwsdl_len, &zwsdl_type, &options) == FAILURE) { - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters"); } if (zwsdl.v) { @@ -2874,8 +2872,7 @@ client->uri = soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'uri' option is required in nonWSDL mode"); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "'uri' option is required in nonWSDL mode"); } if (zend_ascii_hash_find(ht, "style", sizeof("style"), (void**)&tmp) == SUCCESS && @@ -2904,8 +2901,7 @@ client->location = soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC); } } else if (wsdl == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'location' option is required in nonWSDL mode"); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "'location' option is required in nonWSDL mode"); } if (zend_ascii_hash_find(ht, "soap_version", sizeof("soap_version"), (void**)&tmp) == SUCCESS) { @@ -3005,8 +3001,7 @@ } encoding = xmlFindCharEncodingHandler(str); if (encoding == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); } else { client->encoding = encoding; } @@ -3060,8 +3055,7 @@ } } else if (wsdl == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'location' and 'uri' options are required in nonWSDL mode"); - return; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "'location' and 'uri' options are required in nonWSDL mode"); } client->version = soap_version;