From b149bc7050c5136f3b071e1c1251f0f2716ae208 Mon Sep 17 00:00:00 2001
From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Thu, 12 Aug 2010 14:54:33 +0000
Subject: [PATCH] THRIFT-718. php: Thrift PHP library includes closing tags and
 extraneous whitespace

This patch trims closing tags to avoid potential for whitespace.

Patch: Nicholas Telford

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@984811 13f79535-47bb-0310-9956-ffa450edef68
---
 lib/php/src/Thrift.php                       | 2 --
 lib/php/src/protocol/TBinaryProtocol.php     | 2 --
 lib/php/src/protocol/TProtocol.php           | 3 ---
 lib/php/src/transport/TBufferedTransport.php | 2 --
 lib/php/src/transport/THttpClient.php        | 2 --
 lib/php/src/transport/TMemoryBuffer.php      | 2 --
 lib/php/src/transport/TNullTransport.php     | 2 --
 lib/php/src/transport/TPhpStream.php         | 2 --
 lib/php/src/transport/TSocket.php            | 2 --
 lib/php/src/transport/TSocketPool.php        | 2 --
 lib/php/src/transport/TTransport.php         | 2 --
 11 files changed, 23 deletions(-)

diff --git a/lib/php/src/Thrift.php b/lib/php/src/Thrift.php
index ef6ab8a4..a14a3f30 100644
--- a/lib/php/src/Thrift.php
+++ b/lib/php/src/Thrift.php
@@ -783,5 +783,3 @@ if (!isset($GLOBALS['THRIFT_ROOT'])) {
 }
 include_once $GLOBALS['THRIFT_ROOT'].'/protocol/TProtocol.php';
 include_once $GLOBALS['THRIFT_ROOT'].'/transport/TTransport.php';
-
-?>
diff --git a/lib/php/src/protocol/TBinaryProtocol.php b/lib/php/src/protocol/TBinaryProtocol.php
index 31bbbf9d..f4579e14 100644
--- a/lib/php/src/protocol/TBinaryProtocol.php
+++ b/lib/php/src/protocol/TBinaryProtocol.php
@@ -427,5 +427,3 @@ class TBinaryProtocolAccelerated extends TBinaryProtocol {
     return $this->strictWrite_;
   }
 }
-
-?>
diff --git a/lib/php/src/protocol/TProtocol.php b/lib/php/src/protocol/TProtocol.php
index e9ff41a3..be47100f 100644
--- a/lib/php/src/protocol/TProtocol.php
+++ b/lib/php/src/protocol/TProtocol.php
@@ -372,6 +372,3 @@ interface TProtocolFactory {
    */
   public function getProtocol($trans);
 }
-
-
-?>
diff --git a/lib/php/src/transport/TBufferedTransport.php b/lib/php/src/transport/TBufferedTransport.php
index cfae767e..e841564d 100644
--- a/lib/php/src/transport/TBufferedTransport.php
+++ b/lib/php/src/transport/TBufferedTransport.php
@@ -159,5 +159,3 @@ class TBufferedTransport extends TTransport {
   }
 
 }
-
-?>
diff --git a/lib/php/src/transport/THttpClient.php b/lib/php/src/transport/THttpClient.php
index 224d403b..102dbbb7 100644
--- a/lib/php/src/transport/THttpClient.php
+++ b/lib/php/src/transport/THttpClient.php
@@ -198,5 +198,3 @@ class THttpClient extends TTransport {
   }
 
 }
-
-?>
diff --git a/lib/php/src/transport/TMemoryBuffer.php b/lib/php/src/transport/TMemoryBuffer.php
index 01eb0f5a..a0b1a546 100644
--- a/lib/php/src/transport/TMemoryBuffer.php
+++ b/lib/php/src/transport/TMemoryBuffer.php
@@ -80,5 +80,3 @@ class TMemoryBuffer extends TTransport {
     return strlen($this->buf_);
   }
 }
-
-?>
diff --git a/lib/php/src/transport/TNullTransport.php b/lib/php/src/transport/TNullTransport.php
index bada5dfb..6e5340d3 100644
--- a/lib/php/src/transport/TNullTransport.php
+++ b/lib/php/src/transport/TNullTransport.php
@@ -44,5 +44,3 @@ class TNullTransport extends TTransport {
   public function write($buf) {}
 
 }
-
-?>
diff --git a/lib/php/src/transport/TPhpStream.php b/lib/php/src/transport/TPhpStream.php
index 3a1c80b8..94b11a6e 100644
--- a/lib/php/src/transport/TPhpStream.php
+++ b/lib/php/src/transport/TPhpStream.php
@@ -107,5 +107,3 @@ class TPhpStream extends TTransport {
   }
 
 }
-
-?>
diff --git a/lib/php/src/transport/TSocket.php b/lib/php/src/transport/TSocket.php
index ba3a6318..a3000f73 100644
--- a/lib/php/src/transport/TSocket.php
+++ b/lib/php/src/transport/TSocket.php
@@ -308,5 +308,3 @@ class TSocket extends TTransport {
     }
   }
 }
-
-?>
diff --git a/lib/php/src/transport/TSocketPool.php b/lib/php/src/transport/TSocketPool.php
index 1421a650..ac46c360 100644
--- a/lib/php/src/transport/TSocketPool.php
+++ b/lib/php/src/transport/TSocketPool.php
@@ -292,5 +292,3 @@ class TSocketPool extends TSocket {
     throw new TException($error);
   }
 }
-
-?>
diff --git a/lib/php/src/transport/TTransport.php b/lib/php/src/transport/TTransport.php
index e2445259..e0e336d2 100644
--- a/lib/php/src/transport/TTransport.php
+++ b/lib/php/src/transport/TTransport.php
@@ -104,5 +104,3 @@ abstract class TTransport {
    */
   public function flush() {}
 }
-
-?>
-- 
2.17.1