diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
| commit | c2ce37b7b0f6fc033cac4d52d460ee2f389d7737 (patch) | |
| tree | dab204bc1dfd9298c7acb13b9493a210f8c4e978 /php | |
| parent | Add jquery-cookie to bower dependency (diff) | |
| download | ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.bz2 ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.xz ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.zip | |
Fixed ICE-7115 - unmarshalling bug with optional parameters
Diffstat (limited to 'php')
| -rw-r--r-- | php/test/Ice/optional/Client.php | 4 | ||||
| -rw-r--r-- | php/test/Ice/optional/ClientPrivate.ice | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php index 85afef6f086..79076dd10ec 100644 --- a/php/test/Ice/optional/Client.php +++ b/php/test/Ice/optional/Client.php @@ -355,6 +355,10 @@ function allTests($communicator) test($r->gg2Opt->a == 20); test($r->gg1->a == "gg1"); + $initial2 = $NS ? eval("return Test\\Initial2PrxHelper::uncheckedCast(\$base);") : + eval("return Test_Initial2PrxHelper::uncheckedCast(\$base);"); + $initial2->opVoid(15, "test"); + echo "ok\n"; echo "testing marshaling of large containers with fixed size elements... "; diff --git a/php/test/Ice/optional/ClientPrivate.ice b/php/test/Ice/optional/ClientPrivate.ice index 9a173d452e1..5dd08613b9a 100644 --- a/php/test/Ice/optional/ClientPrivate.ice +++ b/php/test/Ice/optional/ClientPrivate.ice @@ -32,6 +32,8 @@ class D extends B class Initial2 { void opClassAndUnknownOptional(A p, optional(1) Object o); + + void opVoid(optional(1) int a, optional(2) string v); }; }; |