From 404a62d1c8455a7d6f9a74b14c56e8e9ee1640ab Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 19 Jan 2017 11:49:04 +0100
Subject: IcePHP Ice::Value implementation & minor extension cleanup

---
 php/src/php5/Communicator.cpp | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

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

diff --git a/php/src/php5/Communicator.cpp b/php/src/php5/Communicator.cpp
index 2d8fcc0b919..c22723e53d7 100644
--- a/php/src/php5/Communicator.cpp
+++ b/php/src/php5/Communicator.cpp
@@ -354,7 +354,7 @@ ZEND_METHOD(Ice_Communicator, proxyToString)
         if(zv)
         {
             Ice::ObjectPrx prx;
-            ClassInfoPtr info;
+            ProxyInfoPtr info;
             if(!fetchProxy(zv, prx, info TSRMLS_CC))
             {
                 RETURN_NULL();
@@ -420,7 +420,7 @@ ZEND_METHOD(Ice_Communicator, proxyToProperty)
         if(zv)
         {
             Ice::ObjectPrx prx;
-            ClassInfoPtr info;
+            ProxyInfoPtr info;
             if(!fetchProxy(zv, prx, info TSRMLS_CC))
             {
                 RETURN_NULL();
@@ -664,7 +664,7 @@ ZEND_METHOD(Ice_Communicator, getDefaultRouter)
         Ice::RouterPrx router = _this->getCommunicator()->getDefaultRouter();
         if(router)
         {
-            ClassInfoPtr info = getClassInfoById("::Ice::Router" TSRMLS_CC);
+            ProxyInfoPtr info = getProxyInfo("::Ice::Router" TSRMLS_CC);
             if(!info)
             {
                 runtimeError("no definition for Ice::Router" TSRMLS_CC);
@@ -700,7 +700,7 @@ ZEND_METHOD(Ice_Communicator, setDefaultRouter)
     }
 
     Ice::ObjectPrx proxy;
-    ClassInfoPtr info;
+    ProxyInfoPtr info;
     if(zv && !fetchProxy(zv, proxy, info TSRMLS_CC))
     {
         RETURN_NULL();
@@ -742,7 +742,7 @@ ZEND_METHOD(Ice_Communicator, getDefaultLocator)
         Ice::LocatorPrx locator = _this->getCommunicator()->getDefaultLocator();
         if(locator)
         {
-            ClassInfoPtr info = getClassInfoById("::Ice::Locator" TSRMLS_CC);
+            ProxyInfoPtr info = getProxyInfo("::Ice::Locator" TSRMLS_CC);
             if(!info)
             {
                 runtimeError("no definition for Ice::Locator" TSRMLS_CC);
@@ -778,7 +778,7 @@ ZEND_METHOD(Ice_Communicator, setDefaultLocator)
     }
 
     Ice::ObjectPrx proxy;
-    ClassInfoPtr info;
+    ProxyInfoPtr info;
     if(zv && !fetchProxy(zv, proxy, info TSRMLS_CC))
     {
         RETURN_NULL();
@@ -1850,7 +1850,7 @@ IcePHP::FactoryWrapper::create(const string& id)
         // When the ID is that of Ice::Object, it indicates that the stream has not
         // found a factory and is providing us an opportunity to preserve the object.
         //
-        cls = getClassInfoById("::Ice::UnknownSlicedObject" TSRMLS_CC);
+        cls = getClassInfoById("::Ice::UnknownSlicedValue" TSRMLS_CC);
     }
     else
     {
@@ -1961,7 +1961,7 @@ IcePHP::DefaultValueFactory::create(const string& id)
         // When the ID is that of Ice::Object, it indicates that the stream has not
         // found a factory and is providing us an opportunity to preserve the object.
         //
-        cls = getClassInfoById("::Ice::UnknownSlicedObject" TSRMLS_CC);
+        cls = getClassInfoById("::Ice::UnknownSlicedValue" TSRMLS_CC);
     }
     else
     {
@@ -1973,14 +1973,6 @@ IcePHP::DefaultValueFactory::create(const string& id)
         return 0;
     }
 
-    //
-    // If the requested type is an abstract class, then we give up.
-    //
-    if(cls->isAbstract)
-    {
-        return 0;
-    }
-
     //
     // Instantiate the object.
     //
-- 
cgit v1.2.3