PHP port; misc. fixes

4 files changed, 68 insertions, 14 deletions

diff --git a/php/lib/Ice.php b/php/lib/Ice.php
index 4171c91f6f9..c146f96a503 100644
--- a/php/lib/Ice.php
+++ b/php/lib/Ice.php
@@ -87,9 +87,9 @@ abstract class Ice_ObjectImpl implements Ice_Object
     }
 }
 
-$Ice__t_Object = IcePHP_defineClass('::Ice::Object', "Ice_Object", true, null, null, null);
+$Ice__t_Object = IcePHP_defineClass('::Ice::Object', "Ice_Object", true, false, null, null, null);
 $Ice__t_ObjectSeq = IcePHP_defineSequence('::Ice::ObjectSeq', $Ice__t_Object);
-$Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "Ice_LocalObject", true, null, null, null);
+$Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "Ice_LocalObject", true, false, null, null, null);
 $Ice__t_ObjectPrx = IcePHP_defineProxy($Ice__t_Object);
 $Ice__t_ObjectProxySeq = IcePHP_defineSequence('::Ice::ObjectProxySeq', $Ice__t_ObjectPrx);
 
@@ -111,6 +111,25 @@ class Ice_InitializationData
     public $logger;
 }
 
+class Ice_SlicedData
+{
+    public $slices;
+}
+
+class Ice_SliceInfo
+{
+    public $typeId;
+    public $bytes;
+    public $objects;
+}
+
+class Ice_FormatType
+{
+    const DefaultFormat = 0;
+    const CompactFormat = 1;
+    const SlicedFormat = 2;
+}
+
 $Ice_sliceChecksums = array();
 
 //
@@ -124,11 +143,16 @@ require_once 'Ice/Locator.php';
 require_once 'Ice/ObjectFactory.php';
 require_once 'Ice/Process.php';
 require_once 'Ice/Router.php';
+require_once 'Ice/Version.php';
+
+$Ice_Protocol_1_0 = new Ice_ProtocolVersion(1, 0);
+$Ice_Encoding_1_0 = new Ice_EncodingVersion(1, 0);
+$Ice_Encoding_1_1 = new Ice_EncodingVersion(1, 1);
 
-IcePHP_defineOperation($Ice__t_Object, 'ice_isA', 2, 1, array($IcePHP__t_string), null, $IcePHP__t_bool, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_ping', 2, 1, null, null, null, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_id', 2, 1, null, null, $IcePHP__t_string, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_ids', 2, 1, null, null, $Ice__t_StringSeq, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_isA', 2, 1, 0, array($IcePHP__t_string), null, $IcePHP__t_bool, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_ping', 2, 1, 0, null, null, null, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_id', 2, 1, 0, null, null, $IcePHP__t_string, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_ids', 2, 1, 0, null, null, $Ice__t_StringSeq, null);
 
 //
 // Proxy comparison functions.
diff --git a/php/lib/Ice_ns.php b/php/lib/Ice_ns.php
index b3bfd9f2384..f1229986f9d 100644
--- a/php/lib/Ice_ns.php
+++ b/php/lib/Ice_ns.php
@@ -92,9 +92,9 @@ namespace Ice
         }
     }
 
-    $Ice__t_Object = IcePHP_defineClass('::Ice::Object', "\\Ice\\Object", true, null, null, null);
+    $Ice__t_Object = IcePHP_defineClass('::Ice::Object', "\\Ice\\Object", true, false, null, null, null);
     $Ice__t_ObjectSeq = IcePHP_defineSequence('::Ice::ObjectSeq', $Ice__t_Object);
-    $Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "\\Ice\\LocalObject", true, null, null, null);
+    $Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "\\Ice\\LocalObject", true, false, null, null, null);
     $Ice__t_ObjectPrx = IcePHP_defineProxy($Ice__t_Object);
     $Ice__t_ObjectProxySeq = IcePHP_defineSequence('::Ice::ObjectProxySeq', $Ice__t_ObjectPrx);
 
@@ -116,6 +116,25 @@ namespace Ice
         public $logger;
     }
 
+    class SlicedData
+    {
+        public $slices;
+    }
+
+    class SliceInfo
+    {
+        public $typeId;
+        public $bytes;
+        public $objects;
+    }
+
+    class FormatType
+    {
+        const DefaultFormat = 0;
+        const CompactFormat = 1;
+        const SlicedFormat = 2;
+    }
+
     $Ice_sliceChecksums = array();
 }
 
@@ -132,15 +151,24 @@ require_once 'Ice/Locator.php';
 require_once 'Ice/ObjectFactory.php';
 require_once 'Ice/Process.php';
 require_once 'Ice/Router.php';
+require_once 'Ice/Version.php';
 
-IcePHP_defineOperation($Ice__t_Object, 'ice_isA', 2, 1, array($IcePHP__t_string), array(), $IcePHP__t_bool, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_ping', 2, 1, null, null, null, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_id', 2, 1, null, null, $IcePHP__t_string, null);
-IcePHP_defineOperation($Ice__t_Object, 'ice_ids', 2, 1, null, null, $Ice__t_StringSeq, null);
+$Ice_Protocol_1_0 = new Ice\ProtocolVersion(1, 0);
+$Ice_Encoding_1_0 = new Ice\EncodingVersion(1, 0);
+$Ice_Encoding_1_1 = new Ice\EncodingVersion(1, 1);
+
+IcePHP_defineOperation($Ice__t_Object, 'ice_isA', 2, 1, 0, array($IcePHP__t_string), array(), $IcePHP__t_bool, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_ping', 2, 1, 0, null, null, null, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_id', 2, 1, 0, null, null, $IcePHP__t_string, null);
+IcePHP_defineOperation($Ice__t_Object, 'ice_ids', 2, 1, 0, null, null, $Ice__t_StringSeq, null);
 }
 
 namespace Ice
 {
+    $Protocol_1_0 = new ProtocolVersion(1, 0);
+    $Encoding_1_0 = new EncodingVersion(1, 0);
+    $Encoding_1_1 = new EncodingVersion(1, 1);
+
     //
     // Proxy comparison functions.
     //
diff --git a/php/lib/Makefile b/php/lib/Makefile
index 076c6e98589..ac86bb0f68e 100644
--- a/php/lib/Makefile
+++ b/php/lib/Makefile
@@ -45,7 +45,8 @@ ICE_SRCS	= Ice/LocalException.php \
 		  Ice/SliceChecksumDict.php \
 		  Ice/Endpoint.php \
 		  Ice/EndpointF.php \
-		  Ice/EndpointTypes.php
+		  Ice/EndpointTypes.php \
+		  Ice/Version.php
 
 #
 # IMPORTANT: If you add or remove Slice files, you also need to check Glacier2.php!
diff --git a/php/lib/Makefile.mak b/php/lib/Makefile.mak
index c5a81e40d6f..2b5e267e684 100644
--- a/php/lib/Makefile.mak
+++ b/php/lib/Makefile.mak
@@ -45,7 +45,8 @@ ICE_SRCS	= Ice\LocalException.php \
 		  Ice\SliceChecksumDict.php \

 		  Ice\Endpoint.php \

 		  Ice\EndpointF.php \

-		  Ice\EndpointTypes.php

+		  Ice\EndpointTypes.php \

+		  Ice\Version.php

 

 #

 # IMPORTANT: If you add or remove Slice files, you also need to check Glacier2.php!