diff options
| author | Jose <jose@zeroc.com> | 2017-02-13 13:21:45 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-02-13 13:21:45 +0100 |
| commit | 1867f2d70b4b5d88db97153a94f67756521f5b7b (patch) | |
| tree | 5fc38fef8551bde262ffd48102799a98daae1f40 /php/src | |
| parent | Fix (ICE-7527) - No timeout test for PHP (diff) | |
| download | ice-1867f2d70b4b5d88db97153a94f67756521f5b7b.tar.bz2 ice-1867f2d70b4b5d88db97153a94f67756521f5b7b.tar.xz ice-1867f2d70b4b5d88db97153a94f67756521f5b7b.zip | |
Fixed (ICE-7578) - ice_invocationTimeout missing in PHP mapping
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php5/Proxy.cpp | 26 | ||||
| -rw-r--r-- | php/src/php7/Proxy.cpp | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/php/src/php5/Proxy.cpp b/php/src/php5/Proxy.cpp index d9f60b79d2a..f65e3fd96d3 100644 --- a/php/src/php5/Proxy.cpp +++ b/php/src/php5/Proxy.cpp @@ -1192,6 +1192,31 @@ ZEND_METHOD(Ice_ObjectPrx, ice_timeout) } } +ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout) +{ + ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis() TSRMLS_CC); + assert(_this); + + try + { + long l; + if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("l"), &l) != SUCCESS) + { + RETURN_NULL(); + } + // TODO: range check? + if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout(l) TSRMLS_CC)) + { + RETURN_NULL(); + } + } + catch(const IceUtil::Exception& ex) + { + throwException(ex TSRMLS_CC); + RETURN_NULL(); + } +} + ZEND_METHOD(Ice_ObjectPrx, ice_connectionId) { ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis() TSRMLS_CC); @@ -1652,6 +1677,7 @@ static zend_function_entry _proxyMethods[] = ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_compress, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_invocationTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_connectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_getConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) diff --git a/php/src/php7/Proxy.cpp b/php/src/php7/Proxy.cpp index c3675f89f47..1532aaec823 100644 --- a/php/src/php7/Proxy.cpp +++ b/php/src/php7/Proxy.cpp @@ -1179,6 +1179,31 @@ ZEND_METHOD(Ice_ObjectPrx, ice_timeout) } } +ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout ) +{ + ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis()); + assert(_this); + + try + { + long l; + if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS) + { + RETURN_NULL(); + } + // TODO: range check? + if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout (l))) + { + RETURN_NULL(); + } + } + catch(const IceUtil::Exception& ex) + { + throwException(ex); + RETURN_NULL(); + } +} + ZEND_METHOD(Ice_ObjectPrx, ice_connectionId) { ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis()); @@ -1605,6 +1630,7 @@ static zend_function_entry _proxyMethods[] = ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_compress, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_invocationTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_connectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_getConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) |