minor fixes to stream classes; restoring test/Ice/stream

2 files changed, 5 insertions, 5 deletions

diff --git a/php/src/IcePHP/Operation.cpp b/php/src/IcePHP/Operation.cpp
index a6bb7e4d7ed..283f61ddd82 100644
--- a/php/src/IcePHP/Operation.cpp
+++ b/php/src/IcePHP/Operation.cpp
@@ -528,7 +528,7 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream
             {
                 ParamInfoPtr info = *p;
                 zval* arg = args[info->pos];
-                if(!isUnset(arg TSRMLS_CC) && os->writeOpt(info->tag, info->type->optionalFormat()))
+                if(!isUnset(arg TSRMLS_CC) && os->writeOptional(info->tag, info->type->optionalFormat()))
                 {
                     info->type->marshal(arg, os, &objectMap, true TSRMLS_CC);
                 }
@@ -623,7 +623,7 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret,
             outParamCallbacks[info->pos] = cb;
         }
 
-        if(is.readOpt(info->tag, info->type->optionalFormat()))
+        if(is.readOptional(info->tag, info->type->optionalFormat()))
         {
             info->type->unmarshal(&is, cb, _communicator, 0, 0, true TSRMLS_CC);
         }
diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp
index 0aa78e4791b..c98e51e7b2a 100644
--- a/php/src/IcePHP/Types.cpp
+++ b/php/src/IcePHP/Types.cpp
@@ -3018,7 +3018,7 @@ IcePHP::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList&
         zval** val = reinterpret_cast<zval**>(data);
 
         if(member->optional && (isUnset(*val TSRMLS_CC) ||
-           !os->writeOpt(member->tag, member->type->optionalFormat())))
+           !os->writeOptional(member->tag, member->type->optionalFormat())))
         {
             continue;
         }
@@ -3102,7 +3102,7 @@ IcePHP::ObjectReader::__read(Ice::InputStream* is)
             for(p = info->optionalMembers.begin(); p != info->optionalMembers.end(); ++p)
             {
                 DataMemberPtr member = *p;
-                if(is->readOpt(member->tag, member->type->optionalFormat()))
+                if(is->readOptional(member->tag, member->type->optionalFormat()))
                 {
                     member->type->unmarshal(is, member, _communicator, _object, 0, true TSRMLS_CC);
                 }
@@ -3265,7 +3265,7 @@ IcePHP::ExceptionInfo::unmarshal(Ice::InputStream* is, const CommunicatorInfoPtr
         for(q = info->optionalMembers.begin(); q != info->optionalMembers.end(); ++q)
         {
             DataMemberPtr member = *q;
-            if(is->readOpt(member->tag, member->type->optionalFormat()))
+            if(is->readOptional(member->tag, member->type->optionalFormat()))
             {
                 member->type->unmarshal(is, member, comm, zv, 0, true TSRMLS_CC);
             }