Fixed ICE-5376 - IcePHP build with USE_NAMESPACES=yes broken

8 files changed, 18 insertions, 17 deletions

diff --git a/php/src/IcePHP/Communicator.cpp b/php/src/IcePHP/Communicator.cpp
index 6cc4a1cabae..01d6b7c618a 100644
--- a/php/src/IcePHP/Communicator.cpp
+++ b/php/src/IcePHP/Communicator.cpp
@@ -1341,7 +1341,7 @@ IcePHP::communicatorInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Communicator"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Communicator", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Communicator", _interfaceMethods);
 #endif
diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp
index 9ad24ec1b25..57823f94104 100644
--- a/php/src/IcePHP/Connection.cpp
+++ b/php/src/IcePHP/Connection.cpp
@@ -360,7 +360,7 @@ IcePHP::connectionInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Connection"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Connection", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Connection", _interfaceMethods);
 #endif
@@ -380,7 +380,7 @@ IcePHP::connectionInit(TSRMLS_D)
     // Register the ConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ConnectionInfo"), _connectionInfoClassMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "ConnectionInfo", _connectionInfoClassMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_ConnectionInfo", _connectionInfoClassMethods);
 #endif
@@ -396,7 +396,7 @@ IcePHP::connectionInit(TSRMLS_D)
     // Register the IPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL);
 #endif
@@ -415,7 +415,7 @@ IcePHP::connectionInit(TSRMLS_D)
     // Register the TCPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL);
 #endif
@@ -426,7 +426,7 @@ IcePHP::connectionInit(TSRMLS_D)
     // Register the UDPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL);
 #endif
diff --git a/php/src/IcePHP/Endpoint.cpp b/php/src/IcePHP/Endpoint.cpp
index d718610c94d..b3cc4351670 100644
--- a/php/src/IcePHP/Endpoint.cpp
+++ b/php/src/IcePHP/Endpoint.cpp
@@ -274,7 +274,7 @@ IcePHP::endpointInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Endpoint"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Endpoint", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Endpoint", _interfaceMethods);
 #endif
@@ -293,7 +293,7 @@ IcePHP::endpointInit(TSRMLS_D)
     // Register the EndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("EndpointInfo"), _endpointInfoMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "EndpointInfo", _endpointInfoMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_EndpointInfo", _endpointInfoMethods);
 #endif
@@ -309,7 +309,7 @@ IcePHP::endpointInit(TSRMLS_D)
     // Register the IPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL);
 #endif
@@ -324,7 +324,7 @@ IcePHP::endpointInit(TSRMLS_D)
     // Register the TCPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL);
 #endif
@@ -335,7 +335,7 @@ IcePHP::endpointInit(TSRMLS_D)
     // Register the UDPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL);
 #endif
@@ -350,7 +350,7 @@ IcePHP::endpointInit(TSRMLS_D)
     // Register the OpaqueEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("OpaqueEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL);
 #endif
diff --git a/php/src/IcePHP/Logger.cpp b/php/src/IcePHP/Logger.cpp
index c3dad2b1a41..0b6967e37b6 100644
--- a/php/src/IcePHP/Logger.cpp
+++ b/php/src/IcePHP/Logger.cpp
@@ -269,7 +269,7 @@ IcePHP::loggerInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Logger"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Logger", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Logger", _interfaceMethods);
 #endif
diff --git a/php/src/IcePHP/Properties.cpp b/php/src/IcePHP/Properties.cpp
index 639f59ca47d..80075a5d3f4 100644
--- a/php/src/IcePHP/Properties.cpp
+++ b/php/src/IcePHP/Properties.cpp
@@ -641,7 +641,7 @@ IcePHP::propertiesInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Properties"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Properties", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Properties", _interfaceMethods);
 #endif
diff --git a/php/src/IcePHP/Proxy.cpp b/php/src/IcePHP/Proxy.cpp
index 69595ccd22d..b7501c7a8b1 100644
--- a/php/src/IcePHP/Proxy.cpp
+++ b/php/src/IcePHP/Proxy.cpp
@@ -1702,7 +1702,7 @@ IcePHP::proxyInit(TSRMLS_D)
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ObjectPrx"), _proxyMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "ObjectPrx", _proxyMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_ObjectPrx", _proxyMethods);
 #endif
diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php
index adf6b2ccdfb..1c00215a217 100644
--- a/php/test/Ice/exceptions/Client.php
+++ b/php/test/Ice/exceptions/Client.php
@@ -427,7 +427,7 @@ function allTests($communicator)
     return $thrower;
 }
 
-$initData = new Ice_InitializationData;
+$initData = $NS ? eval("return new Ice\\InitializationData;") : eval("return new Ice_InitializationData;");
 $initData->properties = Ice_getProperties();
 $initData->properties->setProperty("Ice.MessageSizeMax", "10");
 $communicator = Ice_initialize($argv, $initData);
diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php
index 7942cc98335..433c0f728dd 100644
--- a/php/test/Ice/objects/Client.php
+++ b/php/test/Ice/objects/Client.php
@@ -359,7 +359,8 @@ function allTests($communicator)
     $outS = null;
     $initial->opBaseSeq(array(), $outS);
 
-    $retS = $initial->opBaseSeq(array(new Test_Base()), $outS);
+    $base = $NS ? eval("return new Test\\Base;") : eval("return new Test_Base;");
+    $retS = $initial->opBaseSeq(array($base), $outS);
     test(count($retS) == 1 && count($outS) == 1);
     echo "ok\n";