[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug30799.phpt

[Dmitry Stogov]

dmitry          Tue Nov 16 08:04:39 2004 EDT

  Added files:                 
    /php-src/ext/soap/tests/bugs        bug30799.phpt 

  Modified files:              
    /php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #30799 (SoapServer doesn't handle private or protected properties)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.82&r2=1.83&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.82 
php-src/ext/soap/php_encoding.c:1.83
--- php-src/ext/soap/php_encoding.c:1.82        Tue Nov 16 07:07:29 2004
+++ php-src/ext/soap/php_encoding.c     Tue Nov 16 08:04:39 2004
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.82 2004/11/16 12:07:29 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.83 2004/11/16 13:04:39 dmitry Exp $ */
 
 #include <time.h>
 
@@ -1424,7 +1424,18 @@
                                property = 
master_to_xml(get_conversion((*zprop)->type), (*zprop), style, xmlParam);
 
                                if (key_type == HASH_KEY_IS_STRING) {
-                                       xmlNodeSetName(property, str_key);
+                               char *prop_name;
+
+                                       if (Z_TYPE_P(data) == IS_OBJECT) {
+                                         char *class_name;
+
+                                               
zend_unmangle_property_name(str_key, &class_name, &prop_name);
+                                 } else {
+                                   prop_name = str_key;
+                                       }
+                                       if (prop_name) {
+                                               xmlNodeSetName(property, 
prop_name);
+                                       }
                                }
                                zend_hash_move_forward(prop);
                        }

http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug30799.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug30799.phpt
+++ php-src/ext/soap/tests/bugs/bug30799.phpt
--TEST--
Bug #30799 SoapServer doesn't handle private or protected properties 
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
class foo {
        public    $a="a";
        private   $b="b";
        protected $c="c";
                
}

$x = new SoapClient(NULL,array("location"=>"test://",
                               "uri" => "test://",
                               "exceptions" => 0,
                               "trace" => 1 ));
$x->test(new foo());
echo $x->__getLastRequest();
echo "ok\n";
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="test://" xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:test><param0
 xsi:type="SOAP-ENC:Struct"><a xsi:type="xsd:string">a</a><b 
xsi:type="xsd:string">b</b><c 
xsi:type="xsd:string">c</c></param0></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
ok

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php