Fixed (ICE-5835) - Scope of operation parameters

2 files changed, 42 insertions, 0 deletions

diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php
index 8d6f5d4cd36..85e4fa5bf7f 100644
--- a/php/test/Ice/operations/Client.php
+++ b/php/test/Ice/operations/Client.php
@@ -898,6 +898,18 @@ function twoways($communicator, $p)
     {
         $p->opNonmutating();
     }
+    
+    test($p->opByte1(0xFF) == 0xFF);
+    test($p->opShort1(0x7FFF) == 0x7FFF);
+    test($p->opInt1(0x7FFFFFFF) == 0x7FFFFFFF);
+    test($p->opLong1(0x7FFFFFFFFFFFFFFF) == 0x7FFFFFFFFFFFFFFF);
+    test($p->opFloat1(1.0) == 1.0);
+    test($p->opDouble1(1.0) == 1.0);
+    test($p->opString1("opString1") == "opString1");
+    test(count($p->opStringS1(null)) == 0);
+    test(count($p->opByteBoolD1(null)) == 0);
+    test(count($p->opStringS2(null)) == 0);
+    test(count($p->opByteBoolD2(null)) == 0);
 }
 
 function allTests($communicator)
diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice
index b6086c24ef2..fb142c63b11 100644
--- a/php/test/Ice/operations/Test.ice
+++ b/php/test/Ice/operations/Test.ice
@@ -212,11 +212,41 @@ class MyClass
     idempotent void opIdempotent();
 
     ["nonmutating"] idempotent void opNonmutating();
+    
+    byte opByte1(byte opByte1);
+    short opShort1(short opShort1);
+    int opInt1(int opInt1);
+    long opLong1(long opLong1);
+    float opFloat1(float opFloat1);
+    double opDouble1(double opDouble1);
+    string opString1(string opString1);
+    StringS opStringS1(StringS opStringS1);
+    ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1);
+    StringS opStringS2(StringS stringS);
+    ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
+};
+
+// Test data member with same name as class
+
+struct MyStruct1
+{
+    string tesT; // Same name as the enclosing module
+    MyClass myClass; // Same name as an already defined class
+    string myStruct1; // Same name as the enclosing struct
+};
+
+class MyClass1
+{
+    string tesT; // Same name as the enclosing module
+    MyClass myClass; // Same name as an already defined class
+    string myClass1; // Same name as the enclosing class
 };
 
 class MyDerivedClass extends MyClass
 {
     void opDerived();
+    MyStruct1 opMyStruct1(MyStruct1 s);
+    MyClass1 opMyClass1(MyClass1 c);
 };
 
 };