Fix ICE-7163

- Printing types is more forgiving and will not throw an exception if
  there is bogus data.
- Fix several print statements to print the correct class name.

7 files changed, 222 insertions, 127 deletions

diff --git a/php/src/php5/Operation.cpp b/php/src/php5/Operation.cpp
index 164f6003011..6257494386c 100644
--- a/php/src/php5/Operation.cpp
+++ b/php/src/php5/Operation.cpp
@@ -460,7 +460,7 @@ IcePHP::TypedInvocation::TypedInvocation(const Ice::ObjectPrx& prx, const Commun
 }
 
 bool
-IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStreamPtr& os, 
+IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStreamPtr& os,
                                         pair<const Ice::Byte*, const Ice::Byte*>& params TSRMLS_DC)
 {
     //
@@ -501,7 +501,7 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream
             {
                 ParamInfoPtr info = *p;
                 zval* arg = args[info->pos];
-                if((!info->optional || !isUnset(arg TSRMLS_CC)) && !info->type->validate(arg TSRMLS_CC))
+                if((!info->optional || !isUnset(arg TSRMLS_CC)) && !info->type->validate(arg, false TSRMLS_CC))
                 {
                     invalidArgument("invalid value for argument %d in operation `%s'" TSRMLS_CC, info->pos + 1,
                                     _op->name.c_str());
@@ -770,7 +770,7 @@ IcePHP::SyncTypedInvocation::invoke(INTERNAL_FUNCTION_PARAMETERS)
         runtimeError("unable to get arguments" TSRMLS_CC);
         return;
     }
-    
+
     Ice::OutputStreamPtr os;
     pair<const Ice::Byte*, const Ice::Byte*> params;
     if(!prepareRequest(ZEND_NUM_ARGS(), *args, os, params TSRMLS_CC))
diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp
index 94b7cfd4e2a..563aabba5fb 100644
--- a/php/src/php5/Types.cpp
+++ b/php/src/php5/Types.cpp
@@ -658,7 +658,7 @@ IcePHP::PrimitiveInfo::getId() const
 }
 
 bool
-IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException TSRMLS_DC)
 {
     switch(kind)
     {
@@ -666,8 +666,11 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
     {
         if(Z_TYPE_P(zv) != IS_BOOL)
         {
-            string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected boolean value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                string s = zendTypeToString(Z_TYPE_P(zv));
+                invalidArgument("expected boolean value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         break;
@@ -677,13 +680,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected byte value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected byte value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         long val = Z_LVAL_P(zv);
         if(val < 0 || val > 255)
         {
-            invalidArgument("value %ld is out of range for a byte" TSRMLS_CC, val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for a byte" TSRMLS_CC, val);
+            }
             return false;
         }
         break;
@@ -693,13 +702,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected short value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected short value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         long val = Z_LVAL_P(zv);
         if(val < SHRT_MIN || val > SHRT_MAX)
         {
-            invalidArgument("value %ld is out of range for a short" TSRMLS_CC, val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for a short" TSRMLS_CC, val);
+            }
             return false;
         }
         break;
@@ -709,13 +724,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected int value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected int value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         long val = Z_LVAL_P(zv);
         if(val < INT_MIN || val > INT_MAX)
         {
-            invalidArgument("value %ld is out of range for an int" TSRMLS_CC, val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for an int" TSRMLS_CC, val);
+            }
             return false;
         }
         break;
@@ -729,7 +750,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_LONG && Z_TYPE_P(zv) != IS_STRING)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected long value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected long value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         Ice::Long val;
@@ -742,7 +766,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
             string sval(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
             if(!IceUtilInternal::stringToInt64(sval, val))
             {
-                invalidArgument("invalid long value `%s'" TSRMLS_CC, Z_STRVAL_P(zv));
+                if(throwException)
+                {
+                    invalidArgument("invalid long value `%s'" TSRMLS_CC, Z_STRVAL_P(zv));
+                }
                 return false;
             }
         }
@@ -753,13 +780,16 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_DOUBLE && Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected float value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected float value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         if(Z_TYPE_P(zv) == IS_DOUBLE)
         {
             double val = Z_DVAL_P(zv);
-            return (val <= numeric_limits<float>::max() && val >= -numeric_limits<float>::max()) || 
+            return (val <= numeric_limits<float>::max() && val >= -numeric_limits<float>::max()) ||
 #if defined(_MSC_VER) && (_MSC_VER <= 1700)
                 !_finite(val);
 #else
@@ -773,7 +803,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_DOUBLE && Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected double value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected double value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         break;
@@ -783,7 +816,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv TSRMLS_DC)
         if(Z_TYPE_P(zv) != IS_STRING && Z_TYPE_P(zv) != IS_NULL)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected string value but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected string value but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
         break;
@@ -1045,7 +1081,7 @@ IcePHP::PrimitiveInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalC
 void
 IcePHP::PrimitiveInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << getId() << ">";
         return;
@@ -1100,7 +1136,7 @@ IcePHP::EnumInfo::getId() const
 }
 
 bool
-IcePHP::EnumInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::EnumInfo::validate(zval* zv, bool TSRMLS_DC)
 {
     if(Z_TYPE_P(zv) == IS_LONG)
     {
@@ -1161,7 +1197,7 @@ IcePHP::EnumInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallba
 void
 IcePHP::EnumInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1309,7 +1345,7 @@ IcePHP::StructInfo::getId() const
 }
 
 bool
-IcePHP::StructInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::StructInfo::validate(zval* zv, bool throwException TSRMLS_DC)
 {
     if(Z_TYPE_P(zv) == IS_NULL)
     {
@@ -1317,8 +1353,11 @@ IcePHP::StructInfo::validate(zval* zv TSRMLS_DC)
     }
     else if(Z_TYPE_P(zv) != IS_OBJECT)
     {
-        string s = zendTypeToString(Z_TYPE_P(zv));
-        invalidArgument("expected struct value of type %s but received %s" TSRMLS_CC, zce->name, s.c_str());
+        if(throwException)
+        {
+            string s = zendTypeToString(Z_TYPE_P(zv));
+            invalidArgument("expected struct value of type %s but received %s" TSRMLS_CC, zce->name, s.c_str());
+        }
         return false;
     }
 
@@ -1328,7 +1367,10 @@ IcePHP::StructInfo::validate(zval* zv TSRMLS_DC)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != zce)
     {
-        invalidArgument("expected struct value of type %s but received %s" TSRMLS_CC, zce->name, ce->name);
+        if(throwException)
+        {
+            invalidArgument("expected struct value of type %s but received %s" TSRMLS_CC, zce->name, ce->name);
+        }
         return false;
     }
 
@@ -1416,7 +1458,7 @@ IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*
         }
 
         zval** val = reinterpret_cast<zval**>(data);
-        if(!member->type->validate(*val TSRMLS_CC))
+        if(!member->type->validate(*val, false TSRMLS_CC))
         {
             invalidArgument("invalid value for %s member `%s'" TSRMLS_CC, id.c_str(), member->name.c_str());
             throw AbortMarshaling();
@@ -1469,7 +1511,7 @@ IcePHP::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCall
 void
 IcePHP::StructInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1534,7 +1576,7 @@ IcePHP::SequenceInfo::getId() const
 }
 
 bool
-IcePHP::SequenceInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::SequenceInfo::validate(zval* zv, bool TSRMLS_DC)
 {
     return Z_TYPE_P(zv) == IS_NULL || Z_TYPE_P(zv) == IS_ARRAY;
 }
@@ -1611,7 +1653,7 @@ IcePHP::SequenceInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMa
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!elementType->validate(*val TSRMLS_CC))
+            if(!elementType->validate(*val, false TSRMLS_CC))
             {
                 invalidArgument("invalid value for sequence element `%s'" TSRMLS_CC, id.c_str());
                 throw AbortMarshaling();
@@ -1668,7 +1710,7 @@ IcePHP::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCa
 void
 IcePHP::SequenceInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1745,7 +1787,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1767,7 +1809,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1787,7 +1829,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1807,7 +1849,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1827,7 +1869,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1860,7 +1902,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1891,7 +1933,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -1922,7 +1964,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         while(zend_hash_get_current_data_ex(arr, &data, &pos) != FAILURE)
         {
             zval** val = reinterpret_cast<zval**>(data);
-            if(!pi->validate(*val TSRMLS_CC))
+            if(!pi->validate(*val, true TSRMLS_CC))
             {
                 throw AbortMarshaling();
             }
@@ -2094,7 +2136,7 @@ IcePHP::DictionaryInfo::getId() const
 }
 
 bool
-IcePHP::DictionaryInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::DictionaryInfo::validate(zval* zv, bool TSRMLS_DC)
 {
     return Z_TYPE_P(zv) == IS_NULL || Z_TYPE_P(zv) == IS_ARRAY;
 }
@@ -2243,7 +2285,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object
             //
             // Marshal the key.
             //
-            if(!keyType->validate(zkey TSRMLS_CC))
+            if(!keyType->validate(zkey, false TSRMLS_CC))
             {
                 invalidArgument("invalid key in `%s' element" TSRMLS_CC, id.c_str());
                 throw AbortMarshaling();
@@ -2253,7 +2295,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object
             //
             // Marshal the value.
             //
-            if(!valueType->validate(*val TSRMLS_CC))
+            if(!valueType->validate(*val, false TSRMLS_CC))
             {
                 invalidArgument("invalid value in `%s' element" TSRMLS_CC, id.c_str());
                 throw AbortMarshaling();
@@ -2328,7 +2370,7 @@ IcePHP::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const Unmarshal
 void
 IcePHP::DictionaryInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -2519,7 +2561,7 @@ IcePHP::ClassInfo::getId() const
 }
 
 bool
-IcePHP::ClassInfo::validate(zval* val TSRMLS_DC)
+IcePHP::ClassInfo::validate(zval* val, bool TSRMLS_DC)
 {
     if(Z_TYPE_P(val) == IS_OBJECT)
     {
@@ -2568,7 +2610,7 @@ IcePHP::ClassInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*
     }
 
     assert(Z_TYPE_P(zv) == IS_OBJECT); // validate() should have caught this.
-    assert(checkClass(Z_OBJCE_P(zv), zce)); // validate() should have caught this.
+    assert(checkClass(Z_OBJCE_P(zv), const_cast<zend_class_entry*>(zce))); // validate() should have caught this.
 
     //
     // Ice::ObjectWriter is a subclass of Ice::Object that wraps a PHP object for marshaling.
@@ -2611,7 +2653,7 @@ IcePHP::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallb
 void
 IcePHP::ClassInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -2783,14 +2825,17 @@ IcePHP::ProxyInfo::getId() const
 }
 
 bool
-IcePHP::ProxyInfo::validate(zval* zv TSRMLS_DC)
+IcePHP::ProxyInfo::validate(zval* zv, bool throwException TSRMLS_DC)
 {
     if(Z_TYPE_P(zv) != IS_NULL)
     {
         if(Z_TYPE_P(zv) != IS_OBJECT || (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) != proxyClassEntry))
         {
-            string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected proxy value or null but received %s" TSRMLS_CC, s.c_str());
+            if(throwException)
+            {
+                string s = zendTypeToString(Z_TYPE_P(zv));
+                invalidArgument("expected proxy value or null but received %s" TSRMLS_CC, s.c_str());
+            }
             return false;
         }
     }
@@ -2891,7 +2936,7 @@ IcePHP::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallb
 void
 IcePHP::ProxyInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* TSRMLS_DC)
 {
-    if(!validate(zv TSRMLS_CC))
+    if(!validate(zv, false TSRMLS_CC))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -3019,7 +3064,7 @@ IcePHP::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMem
             continue;
         }
 
-        if(!member->type->validate(*val TSRMLS_CC))
+        if(!member->type->validate(*val, false TSRMLS_CC))
         {
             invalidArgument("invalid value for %s member `%s'" TSRMLS_CC, _info->id.c_str(),
                             member->name.c_str());
@@ -3280,10 +3325,14 @@ IcePHP::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is, const Communicat
 void
 IcePHP::ExceptionInfo::print(zval* zv, IceUtilInternal::Output& out TSRMLS_DC)
 {
+    out << "exception " << id;
+    out.sb();
+
     if(Z_TYPE_P(zv) != IS_OBJECT)
     {
         string s = zendTypeToString(Z_TYPE_P(zv));
-        invalidArgument("expected exception value of type %s but received %s" TSRMLS_CC, zce->name, s.c_str());
+        out << nl << "expected exception value of type " << zce->name << " but received " << s;
+        out.eb();
         return;
     }
 
@@ -3293,7 +3342,8 @@ IcePHP::ExceptionInfo::print(zval* zv, IceUtilInternal::Output& out TSRMLS_DC)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != zce)
     {
-        invalidArgument("expected exception value of type %s but received %s" TSRMLS_CC, zce->name, ce->name);
+        out << nl << "expected exception value of type " << zce->name << " but received " << ce->name;
+        out.eb();
         return;
     }
 
diff --git a/php/src/php5/Types.h b/php/src/php5/Types.h
index e540d49ae01..4968b26a160 100644
--- a/php/src/php5/Types.h
+++ b/php/src/php5/Types.h
@@ -111,7 +111,7 @@ public:
 
     virtual std::string getId() const = 0;
 
-    virtual bool validate(zval* TSRMLS_DC) = 0;
+    virtual bool validate(zval*, bool TSRMLS_DC) = 0;
 
     virtual bool variableLength() const = 0;
     virtual int wireSize() const = 0;
@@ -150,7 +150,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -189,7 +189,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -235,7 +235,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -275,7 +275,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -315,7 +315,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -388,7 +388,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -440,7 +440,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval* TSRMLS_DC);
+    virtual bool validate(zval*, bool TSRMLS_DC);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
diff --git a/php/src/php7/Operation.cpp b/php/src/php7/Operation.cpp
index 62e9ae4c30c..73ee697c470 100644
--- a/php/src/php7/Operation.cpp
+++ b/php/src/php7/Operation.cpp
@@ -463,7 +463,7 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval* args, Ice::OutputStreamP
                 zval* arg = &args[info->pos];
                 assert(!Z_ISREF_P(arg));
 
-                if((!info->optional || !isUnset(arg)) && !info->type->validate(arg))
+                if((!info->optional || !isUnset(arg)) && !info->type->validate(arg, false))
                 {
                     invalidArgument("invalid value for argument %d in operation `%s'", info->pos + 1,
                                     _op->name.c_str());
diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp
index 6fa993d360c..a29dade9b50 100644
--- a/php/src/php7/Types.cpp
+++ b/php/src/php7/Types.cpp
@@ -614,7 +614,7 @@ IcePHP::PrimitiveInfo::getId() const
 }
 
 bool
-IcePHP::PrimitiveInfo::validate(zval* zv)
+IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
 {
     switch(kind)
     {
@@ -623,7 +623,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(!(Z_TYPE_P(zv) == IS_TRUE || Z_TYPE_P(zv) == IS_FALSE))
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected boolean value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected boolean value but received %s", s.c_str());
+            }
             return false;
         }
         break;
@@ -633,13 +636,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected byte value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected byte value but received %s", s.c_str());
+            }
             return false;
         }
         long val = static_cast<long>(Z_LVAL_P(zv));
         if(val < 0 || val > 255)
         {
-            invalidArgument("value %ld is out of range for a byte", val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for a byte", val);
+            }
             return false;
         }
         break;
@@ -649,13 +658,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected short value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected short value but received %s", s.c_str());
+            }
             return false;
         }
         zend_long val = Z_LVAL_P(zv);
         if(val < SHRT_MIN || val > SHRT_MAX)
         {
-            invalidArgument("value %ld is out of range for a short", val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for a short", val);
+            }
             return false;
         }
         break;
@@ -665,13 +680,19 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected int value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected int value but received %s", s.c_str());
+            }
             return false;
         }
         zend_long val = Z_LVAL_P(zv);
         if(val < INT_MIN || val > INT_MAX)
         {
-            invalidArgument("value %ld is out of range for an int", val);
+            if(throwException)
+            {
+                invalidArgument("value %ld is out of range for an int", val);
+            }
             return false;
         }
         break;
@@ -685,7 +706,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_LONG && Z_TYPE_P(zv) != IS_STRING)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected long value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected long value but received %s", s.c_str());
+            }
             return false;
         }
 
@@ -695,7 +719,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
             string sval(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
             if(!IceUtilInternal::stringToInt64(sval, val))
             {
-                invalidArgument("invalid long value `%s'", Z_STRVAL_P(zv));
+                if(throwException)
+                {
+                    invalidArgument("invalid long value `%s'", Z_STRVAL_P(zv));
+                }
                 return false;
             }
         }
@@ -706,7 +733,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_DOUBLE && Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected float value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected float value but received %s", s.c_str());
+            }
             return false;
         }
         if(Z_TYPE_P(zv) == IS_DOUBLE)
@@ -726,7 +756,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_DOUBLE && Z_TYPE_P(zv) != IS_LONG)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected double value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected double value but received %s", s.c_str());
+            }
             return false;
         }
         break;
@@ -736,7 +769,10 @@ IcePHP::PrimitiveInfo::validate(zval* zv)
         if(Z_TYPE_P(zv) != IS_STRING && Z_TYPE_P(zv) != IS_NULL)
         {
             string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected string value but received %s", s.c_str());
+            if(throwException)
+            {
+                invalidArgument("expected string value but received %s", s.c_str());
+            }
             return false;
         }
         break;
@@ -996,7 +1032,7 @@ IcePHP::PrimitiveInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalC
 void
 IcePHP::PrimitiveInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory*)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << getId() << ">";
         return;
@@ -1045,7 +1081,7 @@ IcePHP::EnumInfo::getId() const
 }
 
 bool
-IcePHP::EnumInfo::validate(zval* zv)
+IcePHP::EnumInfo::validate(zval* zv, bool)
 {
     if(Z_TYPE_P(zv) == IS_LONG)
     {
@@ -1105,7 +1141,7 @@ IcePHP::EnumInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallba
 void
 IcePHP::EnumInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory*)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1255,7 +1291,7 @@ IcePHP::StructInfo::getId() const
 }
 
 bool
-IcePHP::StructInfo::validate(zval* zv)
+IcePHP::StructInfo::validate(zval* zv, bool throwException)
 {
     if(Z_TYPE_P(zv) == IS_NULL)
     {
@@ -1263,8 +1299,11 @@ IcePHP::StructInfo::validate(zval* zv)
     }
     else if(Z_TYPE_P(zv) != IS_OBJECT)
     {
-        string s = zendTypeToString(Z_TYPE_P(zv));
-        invalidArgument("expected struct value of type %s but received %s", zce->name, s.c_str());
+        if(throwException)
+        {
+            string s = zendTypeToString(Z_TYPE_P(zv));
+            invalidArgument("expected struct value of type %s but received %s", zce->name->val, s.c_str());
+        }
         return false;
     }
 
@@ -1274,7 +1313,7 @@ IcePHP::StructInfo::validate(zval* zv)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != zce)
     {
-        invalidArgument("expected struct value of type %s but received %s", zce->name, ce->name);
+        invalidArgument("expected struct value of type %s but received %s", zce->name->val, ce->name->val);
         return false;
     }
 
@@ -1324,7 +1363,7 @@ IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*
         {
             if(object_init_ex(&_nullMarshalValue, const_cast<zend_class_entry*>(zce)) != SUCCESS)
             {
-                runtimeError("unable to initialize object of type %s", zce->name);
+                runtimeError("unable to initialize object of type %s", zce->name->val);
                 throw AbortMarshaling();
             }
 
@@ -1366,7 +1405,7 @@ IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*
             val = Z_INDIRECT_P(val);
         }
 
-        if(!member->type->validate(val))
+        if(!member->type->validate(val, false))
         {
             invalidArgument("invalid value for %s member `%s'", id.c_str(), member->name.c_str());
             throw AbortMarshaling();
@@ -1389,7 +1428,7 @@ IcePHP::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCall
     AutoDestroy destroy(&zv);
     if(object_init_ex(&zv, const_cast<zend_class_entry*>(zce)) != SUCCESS)
     {
-        runtimeError("unable to initialize object of type %s", zce->name);
+        runtimeError("unable to initialize object of type %s", zce->name->val);
         throw AbortMarshaling();
     }
 
@@ -1417,7 +1456,7 @@ IcePHP::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCall
 void
 IcePHP::StructInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1481,7 +1520,7 @@ IcePHP::SequenceInfo::getId() const
 }
 
 bool
-IcePHP::SequenceInfo::validate(zval* zv)
+IcePHP::SequenceInfo::validate(zval* zv, bool)
 {
     return Z_TYPE_P(zv) == IS_NULL || Z_TYPE_P(zv) == IS_ARRAY;
 }
@@ -1554,7 +1593,7 @@ IcePHP::SequenceInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMa
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!elementType->validate(val))
+            if(!elementType->validate(val, false))
             {
                 invalidArgument("invalid value for sequence element `%s'", id.c_str());
                 throw AbortMarshaling();
@@ -1619,7 +1658,7 @@ IcePHP::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCa
 void
 IcePHP::SequenceInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -1701,7 +1740,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1723,7 +1762,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1743,7 +1782,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1763,7 +1802,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1783,7 +1822,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1816,7 +1855,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1847,7 +1886,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -1878,7 +1917,7 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval*
         zval* val;
         ZEND_HASH_FOREACH_VAL(arr, val)
         {
-            if(!pi->validate(val))
+            if(!pi->validate(val, true))
             {
                 throw AbortMarshaling();
             }
@@ -2046,7 +2085,7 @@ IcePHP::DictionaryInfo::getId() const
 }
 
 bool
-IcePHP::DictionaryInfo::validate(zval* zv)
+IcePHP::DictionaryInfo::validate(zval* zv, bool)
 {
     return Z_TYPE_P(zv) == IS_NULL || Z_TYPE_P(zv) == IS_ARRAY;
 }
@@ -2184,7 +2223,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object
             //
             // Marshal the key.
             //
-            if(!keyType->validate(&zkey))
+            if(!keyType->validate(&zkey, false))
             {
                 invalidArgument("invalid key in `%s' element", id.c_str());
                 throw AbortMarshaling();
@@ -2194,7 +2233,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object
             //
             // Marshal the value.
             //
-            if(!valueType->validate(val))
+            if(!valueType->validate(val, false))
             {
                 invalidArgument("invalid value in `%s' element", id.c_str());
                 throw AbortMarshaling();
@@ -2266,7 +2305,7 @@ IcePHP::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const Unmarshal
 void
 IcePHP::DictionaryInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -2439,7 +2478,7 @@ IcePHP::ClassInfo::getId() const
 }
 
 bool
-IcePHP::ClassInfo::validate(zval* val)
+IcePHP::ClassInfo::validate(zval* val, bool)
 {
     if(Z_TYPE_P(val) == IS_OBJECT)
     {
@@ -2531,7 +2570,7 @@ IcePHP::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallb
 void
 IcePHP::ClassInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory* history)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -2705,14 +2744,17 @@ IcePHP::ProxyInfo::getId() const
 }
 
 bool
-IcePHP::ProxyInfo::validate(zval* zv)
+IcePHP::ProxyInfo::validate(zval* zv, bool throwException)
 {
     if(Z_TYPE_P(zv) != IS_NULL)
     {
         if(Z_TYPE_P(zv) != IS_OBJECT || (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) != proxyClassEntry))
         {
-            string s = zendTypeToString(Z_TYPE_P(zv));
-            invalidArgument("expected proxy value or null but received %s", s.c_str());
+            if(throwException)
+            {
+                string s = zendTypeToString(Z_TYPE_P(zv));
+                invalidArgument("expected proxy value or null but received %s", s.c_str());
+            }
             return false;
         }
     }
@@ -2812,7 +2854,7 @@ IcePHP::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallb
 void
 IcePHP::ProxyInfo::print(zval* zv, IceUtilInternal::Output& out, PrintObjectHistory*)
 {
-    if(!validate(zv))
+    if(!validate(zv, false))
     {
         out << "<invalid value - expected " << id << ">";
         return;
@@ -2942,7 +2984,7 @@ IcePHP::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMem
             continue;
         }
 
-        if(!member->type->validate(val))
+        if(!member->type->validate(val, false))
         {
             invalidArgument("invalid value for %s member `%s'", _info->id.c_str(), member->name.c_str());
             throw AbortMarshaling();
@@ -3136,7 +3178,7 @@ IcePHP::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is, const Communicat
 
     if(object_init_ex(zv, zce) != SUCCESS)
     {
-        runtimeError("unable to initialize object of type %s", zce->name);
+        runtimeError("unable to initialize object of type %s", zce->name->val);
         throw AbortMarshaling();
     }
 
@@ -3186,10 +3228,14 @@ IcePHP::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is, const Communicat
 void
 IcePHP::ExceptionInfo::print(zval* zv, IceUtilInternal::Output& out)
 {
+    out << "exception " << id;
+    out.sb();
+
     if(Z_TYPE_P(zv) != IS_OBJECT)
     {
         string s = zendTypeToString(Z_TYPE_P(zv));
-        invalidArgument("expected exception value of type %s but received %s", zce->name, s.c_str());
+        out << nl << "expected exception value of type " << zce->name->val << " but received " << s;
+        out.eb();
         return;
     }
 
@@ -3199,15 +3245,14 @@ IcePHP::ExceptionInfo::print(zval* zv, IceUtilInternal::Output& out)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != zce)
     {
-        invalidArgument("expected exception value of type %s but received %s", zce->name, ce->name);
+        out << nl << "expected exception value of type " << zce->name->val << " but received " << ce->name->val;
+        out.eb();
         return;
     }
 
     PrintObjectHistory history;
     history.index = 0;
 
-    out << "exception " << id;
-    out.sb();
     printMembers(zv, out, &history);
     out.eb();
 }
diff --git a/php/src/php7/Types.h b/php/src/php7/Types.h
index 3a8ea345a24..ee3aa294945 100644
--- a/php/src/php7/Types.h
+++ b/php/src/php7/Types.h
@@ -111,7 +111,7 @@ public:
 
     virtual std::string getId() const = 0;
 
-    virtual bool validate(zval*) = 0;
+    virtual bool validate(zval*, bool) = 0; // Validate type data. Bool enables excpetion throwing.
 
     virtual bool variableLength() const = 0;
     virtual int wireSize() const = 0;
@@ -150,7 +150,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -189,7 +189,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -235,7 +235,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -275,7 +275,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -315,7 +315,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -388,7 +388,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
@@ -440,7 +440,7 @@ public:
 
     virtual std::string getId() const;
 
-    virtual bool validate(zval*);
+    virtual bool validate(zval*, bool);
 
     virtual bool variableLength() const;
     virtual int wireSize() const;
diff --git a/php/src/php7/Util.cpp b/php/src/php7/Util.cpp
index 193f613f303..fa16d188475 100644
--- a/php/src/php7/Util.cpp
+++ b/php/src/php7/Util.cpp
@@ -80,7 +80,7 @@ getVersion(zval* zv, T& v, const char* type)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != cls)
     {
-        invalidArgument("expected an instance of %s", ce->name);
+        invalidArgument("expected an instance of %s", ce->name->val);
         return false;
     }
 
@@ -125,7 +125,7 @@ createVersion(zval* zv, const T& version, const char* type)
 
     if(object_init_ex(zv, cls) != SUCCESS)
     {
-        runtimeError("unable to initialize %s", cls->name);
+        runtimeError("unable to initialize %s", cls->name->val);
         return false;
     }
 
@@ -255,7 +255,7 @@ IcePHP::extractIdentity(zval* zv, Ice::Identity& id)
     zend_class_entry* ce = Z_OBJCE_P(zv);
     if(ce != cls)
     {
-        invalidArgument("expected an identity but received %s", ce->name);
+        invalidArgument("expected an identity but received %s", ce->name->val);
         return false;
     }
 
@@ -595,7 +595,7 @@ IcePHP::convertException(zval* zex, const Ice::Exception& ex)
         {
             if(object_init_ex(zex, cls) != SUCCESS)
             {
-                runtimeError("unable to create exception %s", cls->name);
+                runtimeError("unable to create exception %s", cls->name->val);
                 return;
             }
             if(!convertLocalException(e, zex))
@@ -609,7 +609,7 @@ IcePHP::convertException(zval* zex, const Ice::Exception& ex)
             assert(cls);
             if(object_init_ex(zex, cls) != SUCCESS)
             {
-                runtimeError("unable to create exception %s", cls->name);
+                runtimeError("unable to create exception %s", cls->name->val);
                 return;
             }
             setStringMember(zex, "unknown", str);
@@ -621,7 +621,7 @@ IcePHP::convertException(zval* zex, const Ice::Exception& ex)
         assert(cls);
         if(object_init_ex(zex, cls) != SUCCESS)
         {
-            runtimeError("unable to create exception %s", cls->name);
+            runtimeError("unable to create exception %s", cls->name->val);
             return;
         }
         setStringMember(zex, "unknown", str);
@@ -632,7 +632,7 @@ IcePHP::convertException(zval* zex, const Ice::Exception& ex)
         assert(cls);
         if(object_init_ex(zex, cls) != SUCCESS)
         {
-            runtimeError("unable to create exception %s", cls->name);
+            runtimeError("unable to create exception %s", cls->name->val);
             return;
         }
         setStringMember(zex, "unknown", str);