cvs: php-src(PHP_5_0) / NEWS /ext/soap php_encoding.c /ext/soap/tests/schema schema062.phpt

dmitry Sun Oct 9 07:05:09 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/soap php_encoding.c /php-src/ext/soap/tests/schema schema062.phpt Log: Fixed bug #34787 (SOAP Client not handling boolean types correctly) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.491&r2=1.1760.2.492&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.491 php-src/NEWS:1.1760.2.492 --- php-src/NEWS:1.1760.2.491 Thu Oct 6 16:36:42 2005 +++ php-src/NEWS Sun Oct 9 07:05:05 2005 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 5.0.6 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry) - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony) - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry) - Fixed bug #34643 (wsdl default value has no effect). (Dmitry) http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.27&r2=1.71.2.28&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.71.2.27 php-src/ext/soap/php_encoding.c:1.71.2.28 --- php-src/ext/soap/php_encoding.c:1.71.2.27 Thu Sep 29 06:08:16 2005 +++ php-src/ext/soap/php_encoding.c Sun Oct 9 07:05:08 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.71.2.27 2005/09/29 10:08:16 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.71.2.28 2005/10/09 11:05:08 dmitry Exp $ */ #include <time.h> @@ -110,7 +110,7 @@ { \ if (!zval || Z_TYPE_P(zval) == IS_NULL) { \ if (style == SOAP_ENCODED) {\ - xmlSetProp(xml, "xsi:nil", "1"); \ + xmlSetProp(xml, "xsi:nil", "true"); \ } \ return xml; \ } \ @@ -866,7 +866,7 @@ ret = xmlNewNode(NULL,"BOGUS"); xmlAddChild(parent, ret); if (style == SOAP_ENCODED) { - xmlSetProp(ret, "xsi:nil", "1"); + xmlSetProp(ret, "xsi:nil", "true"); } return ret; } @@ -1237,10 +1237,10 @@ property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(node, property); if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "1"); + xmlSetProp(property, "xsi:nil", "true"); } else { xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "1"); + xmlSetNsProp(property, xsi, "nil", "true"); } } else { property = master_to_xml(enc, *val, style, node); @@ -1263,10 +1263,10 @@ property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(node, property); if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "1"); + xmlSetProp(property, "xsi:nil", "true"); } else { xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "1"); + xmlSetNsProp(property, xsi, "nil", "true"); } } else { property = master_to_xml(enc, data, style, node); @@ -1288,10 +1288,10 @@ property = xmlNewNode(NULL,model->u.element->name); xmlAddChild(node, property); if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "1"); + xmlSetProp(property, "xsi:nil", "true"); } else { xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "1"); + xmlSetNsProp(property, xsi, "nil", "true"); } return 1; } else if (model->min_occurs == 0) { @@ -1421,7 +1421,7 @@ xmlParam = xmlNewNode(NULL,"BOGUS"); xmlAddChild(parent, xmlParam); if (style == SOAP_ENCODED) { - xmlSetProp(xmlParam, "xsi:nil", "1"); + xmlSetProp(xmlParam, "xsi:nil", "true"); } return xmlParam; } @@ -1500,10 +1500,10 @@ property = xmlNewNode(NULL,"BOGUS"); xmlAddChild(xmlParam, property); if (style == SOAP_ENCODED) { - xmlSetProp(property, "xsi:nil", "1"); + xmlSetProp(property, "xsi:nil", "true"); } else { xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); - xmlSetNsProp(property, xsi, "nil", "1"); + xmlSetNsProp(property, xsi, "nil", "true"); } } else { property = master_to_xml(array_el->encode, *val, style, xmlParam); http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema062.phpt?r1=1.1.2.3&r2=1.1.2.4&ty=u Index: php-src/ext/soap/tests/schema/schema062.phpt diff -u php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.3 php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.4 --- php-src/ext/soap/tests/schema/schema062.phpt:1.1.2.3 Fri Apr 15 02:53:07 2005 +++ php-src/ext/soap/tests/schema/schema062.phpt Sun Oct 9 07:05:09 2005 @@ -19,7 +19,7 @@ ?> --EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" 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/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="1" int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" 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/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:nil="true" int="123" xsi:type="ns1:testType"/></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> object(stdClass)#%d (2) { ["_"]=> NULL