ICE-5692 - PHP type objects should be global

3 files changed, 20 insertions, 9 deletions

diff --git a/php/test/Ice/checksum/Makefile b/php/test/Ice/checksum/Makefile
index 54e7f279f55..3e17597d23a 100644
--- a/php/test/Ice/checksum/Makefile
+++ b/php/test/Ice/checksum/Makefile
@@ -9,6 +9,8 @@
 
 top_srcdir	= ../../..
 
+SLICE2PHPFLAGS  = --checksum
+
 SLICE_SRCS	= Test.ice \
 		  CTypes.ice
 
diff --git a/php/test/Ice/checksum/Makefile.mak b/php/test/Ice/checksum/Makefile.mak
index d4475beaab8..e8a98c5f482 100644
--- a/php/test/Ice/checksum/Makefile.mak
+++ b/php/test/Ice/checksum/Makefile.mak
@@ -9,8 +9,8 @@
 
 top_srcdir	= ..\..\..
 
-SLICE2PHPFLAGS = --checksum
+SLICE2PHPFLAGS  = --checksum
 
-SLICE_SRCS		= Test.ice CTypes.ice
+SLICE_SRCS	= Test.ice CTypes.ice
 
 !include $(top_srcdir)\config\Make.rules.mak.php
diff --git a/php/test/Ice/info/Client.php b/php/test/Ice/info/Client.php
index 58a8fe0c6e0..b39a7250f3c 100644
--- a/php/test/Ice/info/Client.php
+++ b/php/test/Ice/info/Client.php
@@ -39,15 +39,18 @@ function allTests($communicator)
     $udpEndpointType = $NS ? constant("Ice\\UDPEndpointType") : constant("Ice_UDPEndpointType");
     $udpEndpointInfoClass = $NS ? "Ice\\UDPEndpointInfo" : "Ice_UDPEndpointInfo";
     $sslEndpointType = 2;
+    $wsEndpointType = $NS ? constant("Ice\\WSEndpointType") : constant("Ice_WSEndpointType");
+    $wssEndpointType = $NS ? constant("Ice\\WSSEndpointType") : constant("Ice_WSSEndpointType");
     $protocolVersionClass = $NS ? "Ice\\ProtocolVersion" : "Ice_ProtocolVersion";
     $encodingVersionClass = $NS ? "Ice\\EncodingVersion" : "Ice_EncodingVersion";
 
     echo "testing proxy endpoint information... ";
     flush();
     {
-        $p1 = $communicator->stringToProxy("test -t:default -h tcphost -p 10000 -t 1200 -z:" .
-                                           "udp -h udphost -p 10001 --interface eth0 --ttl 5:" .
-                                           "opaque -e 1.8 -t 100 -v ABCD");
+        $p1 = $communicator->stringToProxy(
+                "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:" .
+                "udp -h udphost -p 10001 --interface eth0 --ttl 5 --sourceAddress 10.10.10.10:" .
+                "opaque -e 1.8 -t 100 -v ABCD");
 
         $endps = $p1->ice_getEndpoints();
 
@@ -56,17 +59,23 @@ function allTests($communicator)
         test($ipEndpoint->host == "tcphost");
         test($ipEndpoint->port == 10000);
         test($ipEndpoint->timeout == 1200);
+        test($ipEndpoint->sourceAddress == "10.10.10.10");
         test($ipEndpoint->compress);
         test(!$ipEndpoint->datagram());
-        test($ipEndpoint->type() == $tcpEndpointType && !$ipEndpoint->secure() ||
-             $ipEndpoint->type() == $sslEndpointType && $ipEndpoint->secure());
-        test($ipEndpoint->type() == $tcpEndpointType && ($ipEndpoint instanceof $tcpEndpointInfoClass)  ||
-             $ipEndpoint->type() == $sslEndpointType);
+        test(($ipEndpoint->type() == $tcpEndpointType && !$ipEndpoint->secure()) ||
+             ($ipEndpoint->type() == $sslEndpointType && $ipEndpoint->secure()) ||
+             ($ipEndpoint->type() == $wsEndpointType && !$ipEndpoint->secure()) ||
+             ($ipEndpoint->type() == $wssEndpointType && $ipEndpoint->secure()));
+        test(($ipEndpoint->type() == $tcpEndpointType && ($ipEndpoint instanceof $tcpEndpointInfoClass)) ||
+             ($ipEndpoint->type() == $sslEndpointType && ($ipEndpoint instanceof $ipEndpointInfoClass)) ||
+             ($ipEndpoint->type() == $wsEndpointType && ($ipEndpoint instanceof $ipEndpointInfoClass)) ||
+             ($ipEndpoint->type() == $wssEndpointType && ($ipEndpoint instanceof $ipEndpointInfoClass)));
 
         $udpEndpoint = $endps[1]->getInfo();
         test($udpEndpoint instanceof $udpEndpointInfoClass);
         test($udpEndpoint->host == "udphost");
         test($udpEndpoint->port == 10001);
+        test($udpEndpoint->sourceAddress == "10.10.10.10");
         test($udpEndpoint->mcastInterface == "eth0");
         test($udpEndpoint->mcastTtl == 5);
         test($udpEndpoint->timeout == -1);