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.

1 files changed, 7 insertions, 7 deletions

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);