summaryrefslogtreecommitdiff
path: root/php/src/php7/Communicator.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-10-20 21:03:44 -0400
committerBernard Normier <bernard@zeroc.com>2016-10-20 21:03:44 -0400
commit3cb9c15995b828c52dba34d0a222f572d5bbc41b (patch)
tree87bad249c2ee04972be5f3c7635880cb0c556128 /php/src/php7/Communicator.cpp
parentupdating IceBT to BlueZ 5 (diff)
downloadice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.tar.bz2
ice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.tar.xz
ice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.zip
Added support for non-ASCII characters and universal character names
to stringified identities and proxies. This includes a new Ice.ToStringMode property.
Diffstat (limited to 'php/src/php7/Communicator.cpp')
-rw-r--r--php/src/php7/Communicator.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/php/src/php7/Communicator.cpp b/php/src/php7/Communicator.cpp
index b7943d07907..4f8ffabd945 100644
--- a/php/src/php7/Communicator.cpp
+++ b/php/src/php7/Communicator.cpp
@@ -1368,7 +1368,9 @@ ZEND_FUNCTION(Ice_identityToString)
assert(identityClass);
zval* zv;
- if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("O"), &zv, identityClass) != SUCCESS)
+ long mode = 0;
+
+ if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("O|l"), &zv, identityClass, &mode) != SUCCESS)
{
RETURN_NULL();
}
@@ -1380,7 +1382,7 @@ ZEND_FUNCTION(Ice_identityToString)
try
{
- string str = Ice::identityToString(id);
+ string str = Ice::identityToString(id, static_cast<Ice::ToStringMode>(mode));
RETURN_STRINGL(STRCAST(str.c_str()), static_cast<int>(str.length()));
}
catch(const IceUtil::Exception& ex)