From 1d373bc0e719718836395b90e84dbe0b0f241c9b Mon Sep 17 00:00:00 2001
From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Wed, 2 Mar 2011 18:13:30 +0000
Subject: [PATCH] THRIFT-1078. php: ThriftTest.thrift generates invalid PHP
 library

This patch updates ThriftTest.thrft to have a valid php namespace, as well as updating the test client to use the properly namespaced code

Patch: Nicholas Telford

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1076316 13f79535-47bb-0310-9956-ffa450edef68
---
 test/ThriftTest.thrift  |  1 +
 test/php/TestClient.php | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift
index 83e4e39c..63a533a6 100644
--- a/test/ThriftTest.thrift
+++ b/test/ThriftTest.thrift
@@ -32,6 +32,7 @@ namespace st ThriftTest
 namespace py ThriftTest
 namespace py.twisted ThriftTest
 namespace go ThriftTest
+namespace php ThriftTest
 namespace * thrift.test
 
 /**
diff --git a/test/php/TestClient.php b/test/php/TestClient.php
index 8eca175f..6a06367d 100644
--- a/test/php/TestClient.php
+++ b/test/php/TestClient.php
@@ -130,7 +130,7 @@ print_r(" = $dub\n");
  * STRUCT TEST
  */
 print_r("testStruct({\"Zero\", 1, -3, -5})");
-$out = new Xtruct();
+$out = new ThriftTest_Xtruct();
 $out->string_thing = "Zero";
 $out->byte_thing = 1;
 $out->i32_thing = -3;
@@ -145,7 +145,7 @@ print_r(" = {\"".$in->string_thing."\", ".
  * NESTED STRUCT TEST
  */
 print_r("testNest({1, {\"Zero\", 1, -3, -5}), 5}");
-$out2 = new Xtruct2();
+$out2 = new ThriftTest_Xtruct2();
 $out2->byte_thing = 1;
 $out2->struct_thing = $out;
 $out2->i32_thing = 5;
@@ -256,23 +256,23 @@ print_r("}\n");
  * ENUM TEST
  */
 print_r("testEnum(ONE)");
-$ret = $testClient->testEnum(Numberz::ONE);
+$ret = $testClient->testEnum(ThriftTest_Numberz::ONE);
 print_r(" = $ret\n");
 
 print_r("testEnum(TWO)");
-$ret = $testClient->testEnum(Numberz::TWO);
+$ret = $testClient->testEnum(ThriftTest_Numberz::TWO);
 print_r(" = $ret\n");
 
 print_r("testEnum(THREE)");
-$ret = $testClient->testEnum(Numberz::THREE);
+$ret = $testClient->testEnum(ThriftTest_Numberz::THREE);
 print_r(" = $ret\n");
 
 print_r("testEnum(FIVE)");
-$ret = $testClient->testEnum(Numberz::FIVE);
+$ret = $testClient->testEnum(ThriftTest_Numberz::FIVE);
 print_r(" = $ret\n");
 
 print_r("testEnum(EIGHT)");
-$ret = $testClient->testEnum(Numberz::EIGHT);
+$ret = $testClient->testEnum(ThriftTest_Numberz::EIGHT);
 print_r(" = $ret\n");
 
 /**
@@ -300,9 +300,9 @@ print_r("}\n");
 /**
  * INSANITY TEST
  */
-$insane = new Insanity();
-$insane->userMap[Numberz::FIVE] = 5000;
-$truck = new Xtruct();
+$insane = new ThriftTest_Insanity();
+$insane->userMap[ThriftTest_Numberz::FIVE] = 5000;
+$truck = new ThriftTest_Xtruct();
 $truck->string_thing = "Truck";
 $truck->byte_thing = 8;
 $truck->i32_thing = 8;
-- 
2.17.1