86 files changed, 30 insertions, 189 deletions

diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
index 8d7fa46a..58c9977a 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
@@ -65,5 +65,3 @@ class ActiveRecordDynamicCallTestCase extends UnitTestCase
 		var_dump($param);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
index e962046b..d9bd7420 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
@@ -41,5 +41,3 @@ class ActiveRecordFinderTestCase extends UnitTestCase
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
index d173f005..09981f43 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
@@ -42,5 +42,4 @@ class ActiveRecordMySql5TestCase extends UnitTestCase
 			$this->assertEqual($check->{$prop}, $blog->{$prop});
 	}
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
index fe1507cd..12b0796c 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
@@ -163,5 +163,3 @@ class ActiveRecordRegistryTestCase extends UnitTestCase
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php b/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
index c356216b..676a0dd0 100644
--- a/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
@@ -29,5 +29,3 @@ class BaseActiveRecordTestCase extends UnitTestCase
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
index 4c489d49..36a96ab6 100644
--- a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
+++ b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
@@ -31,5 +31,3 @@ class CountRecordsTestCase extends UnitTestCase
 		$this->assertEqual($finder->count(), 8);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/CriteriaTestCase.php b/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
index de5b3b71..a320f38c 100644
--- a/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
+++ b/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
@@ -46,5 +46,3 @@ class CriteriaTestCase extends UnitTestCase
 		$this->assertEqual($criteria->getParameters()->toArray(), $expect);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php b/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
index f848033c..0c09a9b0 100644
--- a/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
+++ b/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
@@ -27,5 +27,4 @@ class DeleteByPkTestCase extends UnitTestCase
 		$this->assertEqual($finder->deleteByPk(array(100, 101), array(102, 103)),0);
 		$this->assertEqual($finder->deleteByPk(array(array(100, 101), array(102, 103))),0);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/FindByPksTestCase.php b/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
index 4ccbddd5..32a79cea 100644
--- a/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
+++ b/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
@@ -60,5 +60,3 @@ class FindByPksTestCase extends UnitTestCase
 		$this->assertEqual($dep->section_id, $sec_id);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php b/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
index e613cc30..14da0833 100644
--- a/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
+++ b/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
@@ -42,5 +42,3 @@ class FindBySqlTestCase extends UnitTestCase
 		var_dump($users);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
index b960760e..86462ca6 100644
--- a/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
@@ -171,5 +171,3 @@ class ForeignKeyTestCase extends UnitTestCase
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php b/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
index 672c2d0f..29fbff42 100644
--- a/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
+++ b/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
@@ -238,5 +238,3 @@ class ForeignObjectUpdateTest extends UnitTestCase
 	}
 //*/
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php b/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
index c43db032..4b149503 100644
--- a/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
+++ b/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
@@ -188,5 +188,3 @@ class MultipleForeignKeyTestCase extends UnitTestCase
 		$this->assertNotIdentical($arr, $arr->state2[0]->object2);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
index 3e98d46b..12c57421 100644
--- a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
+++ b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
@@ -33,5 +33,3 @@ class RecordEventTestCase extends UnitTestCase
 		//var_dump($param);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/SqliteTestCase.php b/tests/simple_unit/ActiveRecord/SqliteTestCase.php
index 7d860b9a..ed0ea496 100644
--- a/tests/simple_unit/ActiveRecord/SqliteTestCase.php
+++ b/tests/simple_unit/ActiveRecord/SqliteTestCase.php
@@ -17,5 +17,3 @@ class SqliteTestCase extends UnitTestCase
 		$this->assertNotNull($user);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/UserRecordTestCase.php b/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
index 34e45ca8..85b12594 100644
--- a/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
@@ -62,5 +62,3 @@ class UserRecordTestCase extends UnitTestCase
 			$this->assertEqual($user->$prop,$check->$prop);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
index adf0beed..bb13a96f 100644
--- a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
@@ -72,5 +72,4 @@ class ViewRecordTestCase extends UnitTestCase
 			$this->pass();
 		}
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/Blogs.php b/tests/simple_unit/ActiveRecord/records/Blogs.php
index 680b3141..6523f029 100644
--- a/tests/simple_unit/ActiveRecord/records/Blogs.php
+++ b/tests/simple_unit/ActiveRecord/records/Blogs.php
@@ -10,5 +10,3 @@ class Blogs extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/DepSections.php b/tests/simple_unit/ActiveRecord/records/DepSections.php
index 6f37ae3e..bf01ed12 100644
--- a/tests/simple_unit/ActiveRecord/records/DepSections.php
+++ b/tests/simple_unit/ActiveRecord/records/DepSections.php
@@ -12,5 +12,3 @@ class DepSections extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php b/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
index 732610ae..b60c7930 100644
--- a/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
@@ -14,5 +14,3 @@ class DepartmentRecord extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/ItemRecord.php b/tests/simple_unit/ActiveRecord/records/ItemRecord.php
index 8585ebaf..e6707cde 100644
--- a/tests/simple_unit/ActiveRecord/records/ItemRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/ItemRecord.php
@@ -45,5 +45,3 @@ class ItemRecord extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/SimpleUser.php b/tests/simple_unit/ActiveRecord/records/SimpleUser.php
index cfba272e..b6748857 100644
--- a/tests/simple_unit/ActiveRecord/records/SimpleUser.php
+++ b/tests/simple_unit/ActiveRecord/records/SimpleUser.php
@@ -10,5 +10,3 @@ class SimpleUser extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/SqliteUsers.php b/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
index 8e5b9fde..f8fa12c5 100644
--- a/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
+++ b/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
@@ -12,5 +12,3 @@ class SqliteUsers extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/UserRecord.php b/tests/simple_unit/ActiveRecord/records/UserRecord.php
index c4e8ce60..4ef98baf 100644
--- a/tests/simple_unit/ActiveRecord/records/UserRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/UserRecord.php
@@ -34,5 +34,3 @@ class UserRecord extends TActiveRecord
 		return parent::finder($className);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
index f8a4257c..d309c1cc 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
@@ -42,5 +42,3 @@ class CommandBuilderMssqlTest extends UnitTestCase
 	//	var_dump($sql);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
index e248defd..e47914aa 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
@@ -15,5 +15,3 @@ class CommandBuilderMysqlTest extends UnitTestCase
 		$this->mysql_meta_data()->getTableInfo("tests.table1");
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
index 63660aee..8e339073 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
@@ -72,5 +72,3 @@ class CommandBuilderPgsqlTest extends UnitTestCase
 		$this->assertEqual($expect, $limit);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/MssqlColumnTest.php b/tests/simple_unit/DbCommon/MssqlColumnTest.php
index 16d73bc4..f64615e8 100644
--- a/tests/simple_unit/DbCommon/MssqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/MssqlColumnTest.php
@@ -44,5 +44,3 @@ class MssqlColumnTest extends UnitTestCase
 		var_dump($result);
 	}*/
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/Mysql4ColumnTest.php b/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
index 234a212f..6216cdd7 100644
--- a/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
+++ b/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
@@ -250,5 +250,3 @@ class Mysql4ColumnTest extends UnitTestCase
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/MysqlColumnTest.php b/tests/simple_unit/DbCommon/MysqlColumnTest.php
index 08fdb545..57565ca1 100644
--- a/tests/simple_unit/DbCommon/MysqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/MysqlColumnTest.php
@@ -250,5 +250,3 @@ class MysqlColumnTest extends UnitTestCase
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/PgsqlColumnTest.php b/tests/simple_unit/DbCommon/PgsqlColumnTest.php
index a16de964..5859c115 100644
--- a/tests/simple_unit/DbCommon/PgsqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/PgsqlColumnTest.php
@@ -135,5 +135,3 @@ class PgsqlColumnTest extends UnitTestCase
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/SqliteColumnTest.php b/tests/simple_unit/DbCommon/SqliteColumnTest.php
index 246c4a27..712d2977 100644
--- a/tests/simple_unit/DbCommon/SqliteColumnTest.php
+++ b/tests/simple_unit/DbCommon/SqliteColumnTest.php
@@ -25,5 +25,4 @@ class SqliteColumnTest extends UnitTestCase
 		//$table = new TTableGateway('Accounts', $conn);
 //		var_dump($table->findAll()->readAll());
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php b/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
index 80e9c1fd..0728baf7 100644
--- a/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
+++ b/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
@@ -41,5 +41,3 @@ class MysqlMessageSourceTestCase extends UnitTestCase
 	}
 */
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/Soap/ContactManager.php b/tests/simple_unit/Soap/ContactManager.php
index 290063b3..2fbeec48 100644
--- a/tests/simple_unit/Soap/ContactManager.php
+++ b/tests/simple_unit/Soap/ContactManager.php
@@ -23,12 +23,12 @@ class ContactManager{
 		$Contact->email = "me@you.com";
 		$Contact->id = 1;
 		$Contact->name ="me";
-		
+
 		$ret[] = $Contact;
 		//debugObject("Contacten: ",$ret);
 		return $ret;
 	}
-	
+
 	/**
 	  * Gets the Contact with the given id.
 	  * @param int $id The id
@@ -48,7 +48,7 @@ class ContactManager{
 	public function newContact() {
 		return new Contact();
 	}
-	
+
 	/**
 	  * Saves a given Contact
 	  * @param Contact $Contact
@@ -60,7 +60,7 @@ class ContactManager{
 		//$Contact->save();
 		return true;
 	}
-	
+
 	/**
 	 * @return mixed
 	 * @soapmethod
@@ -69,7 +69,7 @@ class ContactManager{
 	{
 		return array(array(1,2), array("12", 1.2));
 	}
-	
+
 	/**
 	 * @return array
 	 * @soapmethod
@@ -92,13 +92,13 @@ class ContactManager{
   */
 class Contact{
 
-	/** 
+	/**
 	 * @var int $id
 	 * @soapproperty
 	 */
 	public $id;
-	
-	/** 
+
+	/**
 	* @var string $name
 	 * @soapproperty
 	*/
@@ -110,10 +110,10 @@ class Contact{
 	public $address;
 
 	/** @var string $email
-	 * @soapproperty	
+	 * @soapproperty
 	*/
 	public $email;
-	
+
 	/**
 	  * saves a Contact
 	  *
@@ -134,24 +134,22 @@ class Contact{
   */
 class Address{
 	/** @var string $street
-	 * @soapproperty	
+	 * @soapproperty
 	*/
 	public $street;
-	
+
 	/** @var string $nr
 	 * @soapproperty
 	*/
 	public $nr;
-	
+
 	/** @var string $zipcode
 	 * @soapproperty
 	*/
-	public $zipcode;	
-	
+	public $zipcode;
+
 	/** @var string $city
 	 * @soapproperty
 	*/
-	public $city;	
+	public $city;
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/Soap/SoapTestCase.php b/tests/simple_unit/Soap/SoapTestCase.php
index fe151b04..3aaa60d3 100644
--- a/tests/simple_unit/Soap/SoapTestCase.php
+++ b/tests/simple_unit/Soap/SoapTestCase.php
@@ -35,7 +35,7 @@ class SoapTestCase extends UnitTestCase
 	{
 		try
 		{
-			$result = $this->getClient()->getContact(1);	
+			$result = $this->getClient()->getContact(1);
 			$this->fail();
 		}
 		catch (SoapFault $f)
@@ -88,4 +88,3 @@ class SoapTestCase extends UnitTestCase
 	}
 }
 
-?>
diff --git a/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php b/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
index b3cde511..2ae051e8 100644
--- a/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
+++ b/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
@@ -83,5 +83,3 @@ class ActiveRecordSqlMapTest extends BaseCase
 			$this->assertEqual($account1->{$prop}, $account2->{$prop});
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/BaseCase.php b/tests/simple_unit/SqlMap/BaseCase.php
index b0961b5b..4f44a5b7 100644
--- a/tests/simple_unit/SqlMap/BaseCase.php
+++ b/tests/simple_unit/SqlMap/BaseCase.php
@@ -258,5 +258,3 @@ class TDateTime
 		$this->_datetime = $value;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/CacheTest.php b/tests/simple_unit/SqlMap/CacheTest.php
index 131ddfbb..ff87cd3a 100644
--- a/tests/simple_unit/SqlMap/CacheTest.php
+++ b/tests/simple_unit/SqlMap/CacheTest.php
@@ -160,5 +160,3 @@ class CacheTest extends BaseCase
 		$this->assertIdentical(0.5, $cache->getHitRatio());
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/DelegateTest.php b/tests/simple_unit/SqlMap/DelegateTest.php
index 800e4240..80b23332 100644
--- a/tests/simple_unit/SqlMap/DelegateTest.php
+++ b/tests/simple_unit/SqlMap/DelegateTest.php
@@ -60,5 +60,3 @@ class DelegateTest extends BaseCase
 }
 
 
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php b/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
index 436cd49e..be7a1820 100644
--- a/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
+++ b/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
@@ -7,5 +7,3 @@ class DynamicTest extends UnitTestCase
 
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/GroupByTest.php b/tests/simple_unit/SqlMap/GroupByTest.php
index 11bd86bb..a16211c3 100644
--- a/tests/simple_unit/SqlMap/GroupByTest.php
+++ b/tests/simple_unit/SqlMap/GroupByTest.php
@@ -39,5 +39,3 @@ class GroupByTest extends BaseCase
 
 /**/
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/InheritanceTest.php b/tests/simple_unit/SqlMap/InheritanceTest.php
index 82f86af3..81cad4a5 100644
--- a/tests/simple_unit/SqlMap/InheritanceTest.php
+++ b/tests/simple_unit/SqlMap/InheritanceTest.php
@@ -141,5 +141,4 @@ class CustomInheritance extends TSqlMapTypeHandler
 	{
 		throw new TDataMapperException('can not create');
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ParameterMapTest.php b/tests/simple_unit/SqlMap/ParameterMapTest.php
index fb29c162..557b9f4d 100644
--- a/tests/simple_unit/SqlMap/ParameterMapTest.php
+++ b/tests/simple_unit/SqlMap/ParameterMapTest.php
@@ -245,5 +245,3 @@ class ParameterMapTest extends BaseCase
 	}
 /**/
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/PropertyAccessTest.php b/tests/simple_unit/SqlMap/PropertyAccessTest.php
index d580f965..80199628 100644
--- a/tests/simple_unit/SqlMap/PropertyAccessTest.php
+++ b/tests/simple_unit/SqlMap/PropertyAccessTest.php
@@ -73,5 +73,3 @@ class PropertyAccessTest extends BaseCase
 
 }
 
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ResultClassTest.php b/tests/simple_unit/SqlMap/ResultClassTest.php
index 041c124e..773268b9 100644
--- a/tests/simple_unit/SqlMap/ResultClassTest.php
+++ b/tests/simple_unit/SqlMap/ResultClassTest.php
@@ -245,5 +245,3 @@ class ResultClassTest extends BaseCase
 /**/
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ResultMapTest.php b/tests/simple_unit/SqlMap/ResultMapTest.php
index d545b65e..b14cee31 100644
--- a/tests/simple_unit/SqlMap/ResultMapTest.php
+++ b/tests/simple_unit/SqlMap/ResultMapTest.php
@@ -269,5 +269,3 @@ class ResultMapTest extends BaseCase
 */
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/SelectKeyTest.php b/tests/simple_unit/SqlMap/SelectKeyTest.php
index a1efa640..464b94f1 100644
--- a/tests/simple_unit/SqlMap/SelectKeyTest.php
+++ b/tests/simple_unit/SqlMap/SelectKeyTest.php
@@ -116,5 +116,3 @@ class SelectKeyTest extends BaseCase
 		$this->initScript('line-item-init.sql');
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/SqlMapCacheTest.php b/tests/simple_unit/SqlMap/SqlMapCacheTest.php
index 1bb9b8d4..7c3495b5 100644
--- a/tests/simple_unit/SqlMap/SqlMapCacheTest.php
+++ b/tests/simple_unit/SqlMap/SqlMapCacheTest.php
@@ -73,5 +73,3 @@ class SqlMapCacheTest extends UnitTestCase
 	}
 }
 
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/StatementExtendsTest.php b/tests/simple_unit/SqlMap/StatementExtendsTest.php
index f496f154..69beaa58 100644
--- a/tests/simple_unit/SqlMap/StatementExtendsTest.php
+++ b/tests/simple_unit/SqlMap/StatementExtendsTest.php
@@ -25,5 +25,3 @@ class StatementExtendsTest extends UnitTestCase
 		$this->assertPattern('/img_progress/', $sql2);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/StatementTest.php b/tests/simple_unit/SqlMap/StatementTest.php
index f9c3fb13..3f9f4506 100644
--- a/tests/simple_unit/SqlMap/StatementTest.php
+++ b/tests/simple_unit/SqlMap/StatementTest.php
@@ -1131,5 +1131,3 @@ class StatementTest extends BaseCase
 	#endregion
 	/**/
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/TestQueryForMap.php b/tests/simple_unit/SqlMap/TestQueryForMap.php
index 89676469..2de020a8 100644
--- a/tests/simple_unit/SqlMap/TestQueryForMap.php
+++ b/tests/simple_unit/SqlMap/TestQueryForMap.php
@@ -39,5 +39,3 @@ class TestQueryForMap extends BaseCase
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/common.php b/tests/simple_unit/SqlMap/common.php
index 5146d123..020a296b 100644
--- a/tests/simple_unit/SqlMap/common.php
+++ b/tests/simple_unit/SqlMap/common.php
@@ -151,5 +151,3 @@ class BaseTestConfig
 	}
 }
 
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/A.php b/tests/simple_unit/SqlMap/domain/A.php
index af1f925d..a4f204e4 100644
--- a/tests/simple_unit/SqlMap/domain/A.php
+++ b/tests/simple_unit/SqlMap/domain/A.php
@@ -23,5 +23,3 @@ class A
 	public function getF(){ return $this->_F; }
 	public function setF($value){ $this->_F = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Account.php b/tests/simple_unit/SqlMap/domain/Account.php
index 9502eb85..b4bcbcc8 100644
--- a/tests/simple_unit/SqlMap/domain/Account.php
+++ b/tests/simple_unit/SqlMap/domain/Account.php
@@ -32,5 +32,3 @@ class Account
 	public function setCartOptions($value){ $this->_CartOptions = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/AccountBis.php b/tests/simple_unit/SqlMap/domain/AccountBis.php
index d454f2a8..e48184b6 100644
--- a/tests/simple_unit/SqlMap/domain/AccountBis.php
+++ b/tests/simple_unit/SqlMap/domain/AccountBis.php
@@ -9,5 +9,3 @@ class AccountBis
 	public $More;
 }
 
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/AccountCollection.php b/tests/simple_unit/SqlMap/domain/AccountCollection.php
index b14ece5e..06e30dc8 100644
--- a/tests/simple_unit/SqlMap/domain/AccountCollection.php
+++ b/tests/simple_unit/SqlMap/domain/AccountCollection.php
@@ -13,5 +13,3 @@ class AccountCollection extends TList
 		$array->copyFrom($this);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/B.php b/tests/simple_unit/SqlMap/domain/B.php
index 788b804e..ab42e6b6 100644
--- a/tests/simple_unit/SqlMap/domain/B.php
+++ b/tests/simple_unit/SqlMap/domain/B.php
@@ -19,5 +19,3 @@ class B
 	public function getLibelle(){ return $this->_Libelle; }
 	public function setLibelle($value){ $this->_Libelle = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Book.php b/tests/simple_unit/SqlMap/domain/Book.php
index 80877112..4c0670e8 100644
--- a/tests/simple_unit/SqlMap/domain/Book.php
+++ b/tests/simple_unit/SqlMap/domain/Book.php
@@ -5,7 +5,5 @@ class Book extends Document
 	private $_PageNumber='';
 
 	public function getPageNumber(){ return $this->_PageNumber; }
-	public function setPageNumber($value){ $this->_PageNumber = $value; }	
+	public function setPageNumber($value){ $this->_PageNumber = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/C.php b/tests/simple_unit/SqlMap/domain/C.php
index 47118d44..642f97e9 100644
--- a/tests/simple_unit/SqlMap/domain/C.php
+++ b/tests/simple_unit/SqlMap/domain/C.php
@@ -11,5 +11,3 @@ class C
 	public function getLibelle(){ return $this->_Libelle; }
 	public function setLibelle($value){ $this->_Libelle = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Category.php b/tests/simple_unit/SqlMap/domain/Category.php
index db76edb4..895819e9 100644
--- a/tests/simple_unit/SqlMap/domain/Category.php
+++ b/tests/simple_unit/SqlMap/domain/Category.php
@@ -15,5 +15,3 @@ class Category
 	public function getGuidString(){ return $this->_Guid; }
 	public function setGuidString($value){ $this->_Guid = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Complex.php b/tests/simple_unit/SqlMap/domain/Complex.php
index 99cb04b8..01082343 100644
--- a/tests/simple_unit/SqlMap/domain/Complex.php
+++ b/tests/simple_unit/SqlMap/domain/Complex.php
@@ -7,5 +7,3 @@ class Complex
 	public function getMap(){ return $this->_map; }
 	public function setMap(TMap $map){ $this->_map = $map; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/D.php b/tests/simple_unit/SqlMap/domain/D.php
index 2cbd2883..f120e2d1 100644
--- a/tests/simple_unit/SqlMap/domain/D.php
+++ b/tests/simple_unit/SqlMap/domain/D.php
@@ -12,5 +12,3 @@ class D
 	public function setLibelle($value){ $this->_Libelle = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Document.php b/tests/simple_unit/SqlMap/domain/Document.php
index 682f8eb3..518851e6 100644
--- a/tests/simple_unit/SqlMap/domain/Document.php
+++ b/tests/simple_unit/SqlMap/domain/Document.php
@@ -12,5 +12,3 @@ class Document
 	public function setTitle($value){ $this->_Title = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/DocumentCollection.php b/tests/simple_unit/SqlMap/domain/DocumentCollection.php
index c130db56..a2d5d89d 100644
--- a/tests/simple_unit/SqlMap/domain/DocumentCollection.php
+++ b/tests/simple_unit/SqlMap/domain/DocumentCollection.php
@@ -4,5 +4,3 @@ class DocumentCollection extends TList
 {
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/E.php b/tests/simple_unit/SqlMap/domain/E.php
index 8473c156..c69c8027 100644
--- a/tests/simple_unit/SqlMap/domain/E.php
+++ b/tests/simple_unit/SqlMap/domain/E.php
@@ -12,5 +12,3 @@ class E
 	public function setLibelle($value){ $this->_Libelle = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/F.php b/tests/simple_unit/SqlMap/domain/F.php
index 2bbbb2fb..159d8d63 100644
--- a/tests/simple_unit/SqlMap/domain/F.php
+++ b/tests/simple_unit/SqlMap/domain/F.php
@@ -12,5 +12,3 @@ class F
 	public function setLibelle($value){ $this->_Libelle = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/LineItem.php b/tests/simple_unit/SqlMap/domain/LineItem.php
index f6908bbd..a989ab8b 100644
--- a/tests/simple_unit/SqlMap/domain/LineItem.php
+++ b/tests/simple_unit/SqlMap/domain/LineItem.php
@@ -28,5 +28,3 @@ class LineItem
 	public function setPictureData($value){ $this->_PictureData = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/LineItemCollection.php b/tests/simple_unit/SqlMap/domain/LineItemCollection.php
index 8bc95622..1c31dca3 100644
--- a/tests/simple_unit/SqlMap/domain/LineItemCollection.php
+++ b/tests/simple_unit/SqlMap/domain/LineItemCollection.php
@@ -4,5 +4,3 @@ class LineItemCollection extends TList
 {
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Newspaper.php b/tests/simple_unit/SqlMap/domain/Newspaper.php
index 08716c6d..12ebce5b 100644
--- a/tests/simple_unit/SqlMap/domain/Newspaper.php
+++ b/tests/simple_unit/SqlMap/domain/Newspaper.php
@@ -8,5 +8,3 @@ class Newspaper extends Document
 	public function setCity($value){ $this->_City = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Order.php b/tests/simple_unit/SqlMap/domain/Order.php
index 312626fe..2b907ac6 100644
--- a/tests/simple_unit/SqlMap/domain/Order.php
+++ b/tests/simple_unit/SqlMap/domain/Order.php
@@ -67,5 +67,3 @@ class Order
 	public function setFavouriteLineItem($value){ $this->_FavouriteLineItem = $value; }
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Other.php b/tests/simple_unit/SqlMap/domain/Other.php
index 9e78ab97..89f9d490 100644
--- a/tests/simple_unit/SqlMap/domain/Other.php
+++ b/tests/simple_unit/SqlMap/domain/Other.php
@@ -19,5 +19,3 @@ class Other
 	public function getLong(){ return $this->_Long; }
 	public function setLong($value){ $this->_Long = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Sample.php b/tests/simple_unit/SqlMap/domain/Sample.php
index e03be2df..f2a8951f 100644
--- a/tests/simple_unit/SqlMap/domain/Sample.php
+++ b/tests/simple_unit/SqlMap/domain/Sample.php
@@ -51,5 +51,3 @@ class Sample
 	public function getSequenceDate(){ return $this->_SequenceDate; }
 	public function setSequenceDate($value){ $this->_SequenceDate = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Search.php b/tests/simple_unit/SqlMap/domain/Search.php
index c01891a9..d2170044 100644
--- a/tests/simple_unit/SqlMap/domain/Search.php
+++ b/tests/simple_unit/SqlMap/domain/Search.php
@@ -19,5 +19,3 @@ class Search
 	public function getStartDateAnd(){ return $this->_StartDateAnd; }
 	public function setStartDateAnd($value){ $this->_StartDateAnd = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/User.php b/tests/simple_unit/SqlMap/domain/User.php
index b21712a3..1106d1e9 100644
--- a/tests/simple_unit/SqlMap/domain/User.php
+++ b/tests/simple_unit/SqlMap/domain/User.php
@@ -23,5 +23,3 @@ class User
 	public function getLastLogon(){ return $this->_LastLogon; }
 	public function setLastLogon($value){ $this->_LastLogon = $value; }
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/gen.php b/tests/simple_unit/SqlMap/gen.php
index 855172ba..40ddc297 100644
--- a/tests/simple_unit/SqlMap/gen.php
+++ b/tests/simple_unit/SqlMap/gen.php
@@ -29,5 +29,3 @@ function print_funcs($props)
 		echo $getter.$setter."\n";
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/queryForListLimitTest.php b/tests/simple_unit/SqlMap/queryForListLimitTest.php
index 349314a5..af550dcb 100644
--- a/tests/simple_unit/SqlMap/queryForListLimitTest.php
+++ b/tests/simple_unit/SqlMap/queryForListLimitTest.php
@@ -36,5 +36,3 @@ class queryForListLimitTest extends BaseCase
 		$this->assertEqual($list1[1][2],'Dalton');
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/BaseGatewayTest.php b/tests/simple_unit/TableGateway/BaseGatewayTest.php
index 98b236ee..f3117ed2 100644
--- a/tests/simple_unit/TableGateway/BaseGatewayTest.php
+++ b/tests/simple_unit/TableGateway/BaseGatewayTest.php
@@ -90,5 +90,4 @@ class BaseGatewayTest extends UnitTestCase
 	{
 		$this->getGateway()->deleteAll('1=1');
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/CountTest.php b/tests/simple_unit/TableGateway/CountTest.php
index 0e159ab0..97211e3c 100644
--- a/tests/simple_unit/TableGateway/CountTest.php
+++ b/tests/simple_unit/TableGateway/CountTest.php
@@ -12,5 +12,4 @@ class CountTest extends BaseGatewayTest
 		$result = $this->getGateway2()->count('department_id = ?', 1);
 		$this->assertEqual(4, $result);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/DeleteByPkTest.php b/tests/simple_unit/TableGateway/DeleteByPkTest.php
index 57d9dd31..49b2d86c 100644
--- a/tests/simple_unit/TableGateway/DeleteByPkTest.php
+++ b/tests/simple_unit/TableGateway/DeleteByPkTest.php
@@ -48,5 +48,4 @@ class DeleteByPkTest extends BaseGatewayTest
 
 		$this->assertEqual(2, $deleted);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/MagicCallTest.php b/tests/simple_unit/TableGateway/MagicCallTest.php
index 8d42fba8..87f9e785 100644
--- a/tests/simple_unit/TableGateway/MagicCallTest.php
+++ b/tests/simple_unit/TableGateway/MagicCallTest.php
@@ -27,5 +27,4 @@ class MagicCallTest extends BaseGatewayTest
 
 		$this->assertEqual(0, count($result));
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php b/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
index f34dcefc..96c9351d 100644
--- a/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
+++ b/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
@@ -52,5 +52,4 @@ class TableGatewayPgsqlTest extends BaseGatewayTest
 		$this->assertEqual($result['username'], 'record2');
 	}
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TableInfoGatewayTest.php b/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
index 51af7634..6c85248c 100644
--- a/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
+++ b/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
@@ -13,5 +13,4 @@ class TableInfoGatewayTest extends BaseGatewayTest
 		$table = new TTableGateway($info, $conn);
 		$this->assertEqual(count($table->findAll()->readAll()), 2);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TestFindByPk.php b/tests/simple_unit/TableGateway/TestFindByPk.php
index 5a7a081c..3756d35a 100644
--- a/tests/simple_unit/TableGateway/TestFindByPk.php
+++ b/tests/simple_unit/TableGateway/TestFindByPk.php
@@ -44,5 +44,4 @@ class TestFindByPk extends BaseGatewayTest
 		$this->assertEqual($expect, $result);
 
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/simple_unit/Tickets/Ticket589Test.php b/tests/simple_unit/Tickets/Ticket589Test.php
index 2fedda6f..487181ff 100644
--- a/tests/simple_unit/Tickets/Ticket589Test.php
+++ b/tests/simple_unit/Tickets/Ticket589Test.php
@@ -18,5 +18,3 @@ class Ticket589Test extends UnitTestCase
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/unit.php b/tests/simple_unit/unit.php
index 63910f68..b0e7874d 100644
--- a/tests/simple_unit/unit.php
+++ b/tests/simple_unit/unit.php
@@ -5,5 +5,3 @@ $test_cases = dirname(__FILE__)."/";
 
 $tester = new PradoUnitTester($test_cases);
 $tester->run(new HtmlReporter());
-
-?>
\ No newline at end of file
diff --git a/tests/simple_unit/ws.php b/tests/simple_unit/ws.php
index 703235d1..9096183e 100644
--- a/tests/simple_unit/ws.php
+++ b/tests/simple_unit/ws.php
@@ -5,5 +5,3 @@ include_once './Soap/ContactManager.php';
 
 $app = new TApplication('.');
 $app->run();
-
-?>
\ No newline at end of file