From e40a438a70f06fb163020eb3b2cb42e0e18eb3ed Mon Sep 17 00:00:00 2001
From: Joe George <joe@zeroc.com>
Date: Tue, 31 May 2016 15:58:29 -0400
Subject: 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.
---
 php/src/php5/Operation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'php/src/php5/Operation.cpp')

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))
-- 
cgit v1.2.3