pradosoft / prado

tests/simple_unit/SqlMap/BaseCase.php

Doc Comments +7 added lines

@@ -31,6 +31,9 @@ 
 		$this->ScriptDirectory = $this->config->getScriptDir();
 	}
 
+	/**
+	 * @param string $feature
+	 */
 	public function hasSupportFor($feature)
 	{
 		return $this->config->hasFeature($feature);
@@ -63,6 +66,7 @@ 
 
 	/**
 	 * Run a sql batch for the datasource.
+	 * @param string $script
 	 */
 	protected function initScript($script)
 	{
@@ -248,6 +252,9 @@ 
 		return strtotime($this->getDatetime());
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getDateTime()
 	{
 		return $this->_datetime;

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(__FILE__).'/common.php');
+require_once(dirname(__FILE__) . '/common.php');
 Prado::using('System.Data.SqlMap.TSqlMapManager');
 
 /**
@@ -38,13 +38,13 @@ 
 
 	public function __destruct()
 	{
-		if(!is_null($this->mapper))
+		if (!is_null($this->mapper))
 			$this->mapper->cacheConfiguration();
 	}
 
 	function getConnection()
 	{
-		if(is_null($this->connection))
+		if (is_null($this->connection))
 			$this->connection = $this->config->getConnection();
 		$this->connection->setActive(true);
 		return $this->connection;
@@ -67,7 +67,7 @@ 
 	protected function initScript($script)
 	{
 		$runner = $this->config->getScriptRunner();
-		$runner->runScript($this->getConnection(), $this->ScriptDirectory.$script);
+		$runner->runScript($this->getConnection(), $this->ScriptDirectory . $script);
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 */
 	protected function assertOrder1(Order $order)
 	{
-		$date = @mktime(8,15,0,2,15,2003);
+		$date = @mktime(8, 15, 0, 2, 15, 2003);
 
-		$this->assertIdentical((int)$order->getID(), 1);
-		if($order->getDate() instanceof TDateTime)
+		$this->assertIdentical((int) $order->getID(), 1);
+		if ($order->getDate() instanceof TDateTime)
 			$this->assertIdentical($order->getDate()->getTimestamp(), $date);
 		else
 			$this->fail();
@@ -126,7 +126,7 @@ 
 
 	function assertAccount1AsHashArray($account)
 	{
-		$this->assertIdentical(1, (int)$account["Id"]);
+		$this->assertIdentical(1, (int) $account["Id"]);
 		$this->assertIdentical("Joe", $account["FirstName"]);
 		$this->assertIdentical("Dalton", $account["LastName"]);
 		$this->assertIdentical("Joe.Dalton@somewhere.com", $account["EmailAddress"]);
@@ -134,10 +134,10 @@ 
 
 	function AssertOrder1AsHashArray($order)
 	{
-		$date = @mktime(8,15,0,2,15,2003);
+		$date = @mktime(8, 15, 0, 2, 15, 2003);
 
 		$this->assertIdentical(1, $order["Id"]);
-		if($order['Date'] instanceof TDateTime)
+		if ($order['Date'] instanceof TDateTime)
 			$this->assertIdentical($date, $order["Date"]->getTimestamp());
 		else
 			$this->fail();
@@ -157,22 +157,22 @@ 
 	public function getResult($string)
 	{
 		$value = intval($string);
-		if($value == 100)
+		if ($value == 100)
 			return true;
-		if($value == 200)
+		if ($value == 200)
 			return false;
 		//throw new Exception('unexpected value '.$value);
 	}
 
 	public function getParameter($parameter)
 	{
-		if($parameter)
+		if ($parameter)
 			return 100;
 		else
 			return 200;
 	}
 
-	public function createNewInstance($data=null)
+	public function createNewInstance($data = null)
 	{
 		throw new TDataMapperException('can not create');
 	}
@@ -185,22 +185,22 @@ 
 
 	public function getResult($string)
 	{
-		if($string === self::YES)
+		if ($string === self::YES)
 			return true;
-		if($string === self::NO)
+		if ($string === self::NO)
 			return false;
 		//throw new Exception('unexpected value '.$string);
 	}
 
 	public function getParameter($parameter)
 	{
-		if($parameter)
+		if ($parameter)
 			return self::YES;
 		else
 			return self::NO;
 	}
 
-	public function createNewInstance($data=null)
+	public function createNewInstance($data = null)
 	{
 		throw new TDataMapperException('can not create');
 	}
@@ -221,13 +221,13 @@ 
 
 	public function getParameter($parameter)
 	{
-		if($parameter instanceof TDateTime)
+		if ($parameter instanceof TDateTime)
 			return $parameter->getTimestamp();
 		else
 			return $parameter;
 	}
 
-	public function createNewInstance($data=null)
+	public function createNewInstance($data = null)
 	{
 		return new TDateTime;
 	}
@@ -237,9 +237,9 @@ 
 {
 	private $_datetime;
 
-	public function __construct($datetime=null)
+	public function __construct($datetime = null)
 	{
-		if(!is_null($datetime))
+		if (!is_null($datetime))
 			$this->setDatetime($datetime);
 	}
 

Braces +46 added lines, -34 removed lines

@@ -38,14 +38,16 @@ 
 
 	public function __destruct()
 	{
-		if(!is_null($this->mapper))
-			$this->mapper->cacheConfiguration();
+		if(!is_null($this->mapper)) {
+					$this->mapper->cacheConfiguration();
+		}
 	}
 
 	function getConnection()
 	{
-		if(is_null($this->connection))
-			$this->connection = $this->config->getConnection();
+		if(is_null($this->connection)) {
+					$this->connection = $this->config->getConnection();
+		}
 		$this->connection->setActive(true);
 		return $this->connection;
 	}
@@ -112,10 +114,11 @@ 
 		$date = @mktime(8,15,0,2,15,2003);
 
 		$this->assertIdentical((int)$order->getID(), 1);
-		if($order->getDate() instanceof TDateTime)
-			$this->assertIdentical($order->getDate()->getTimestamp(), $date);
-		else
-			$this->fail();
+		if($order->getDate() instanceof TDateTime) {
+					$this->assertIdentical($order->getDate()->getTimestamp(), $date);
+		} else {
+					$this->fail();
+		}
 		$this->assertIdentical($order->getCardType(), 'VISA');
 		$this->assertIdentical($order->getCardNumber(), '999999999999');
 		$this->assertIdentical($order->getCardExpiry(), '05/03');
@@ -137,10 +140,11 @@ 
 		$date = @mktime(8,15,0,2,15,2003);
 
 		$this->assertIdentical(1, $order["Id"]);
-		if($order['Date'] instanceof TDateTime)
-			$this->assertIdentical($date, $order["Date"]->getTimestamp());
-		else
-			$this->fail();
+		if($order['Date'] instanceof TDateTime) {
+					$this->assertIdentical($date, $order["Date"]->getTimestamp());
+		} else {
+					$this->fail();
+		}
 		$this->assertIdentical("VISA", $order["CardType"]);
 		$this->assertIdentical("999999999999", $order["CardNumber"]);
 		$this->assertIdentical("05/03", $order["CardExpiry"]);
@@ -157,19 +161,22 @@ 
 	public function getResult($string)
 	{
 		$value = intval($string);
-		if($value == 100)
-			return true;
-		if($value == 200)
-			return false;
+		if($value == 100) {
+					return true;
+		}
+		if($value == 200) {
+					return false;
+		}
 		//throw new Exception('unexpected value '.$value);
 	}
 
 	public function getParameter($parameter)
 	{
-		if($parameter)
-			return 100;
-		else
-			return 200;
+		if($parameter) {
+					return 100;
+		} else {
+					return 200;
+		}
 	}
 
 	public function createNewInstance($data=null)
@@ -185,19 +192,22 @@ 
 
 	public function getResult($string)
 	{
-		if($string === self::YES)
-			return true;
-		if($string === self::NO)
-			return false;
+		if($string === self::YES) {
+					return true;
+		}
+		if($string === self::NO) {
+					return false;
+		}
 		//throw new Exception('unexpected value '.$string);
 	}
 
 	public function getParameter($parameter)
 	{
-		if($parameter)
-			return self::YES;
-		else
-			return self::NO;
+		if($parameter) {
+					return self::YES;
+		} else {
+					return self::NO;
+		}
 	}
 
 	public function createNewInstance($data=null)
@@ -221,10 +231,11 @@ 
 
 	public function getParameter($parameter)
 	{
-		if($parameter instanceof TDateTime)
-			return $parameter->getTimestamp();
-		else
-			return $parameter;
+		if($parameter instanceof TDateTime) {
+					return $parameter->getTimestamp();
+		} else {
+					return $parameter;
+		}
 	}
 
 	public function createNewInstance($data=null)
@@ -239,8 +250,9 @@ 
 
 	public function __construct($datetime=null)
 	{
-		if(!is_null($datetime))
-			$this->setDatetime($datetime);
+		if(!is_null($datetime)) {
+					$this->setDatetime($datetime);
+		}
 	}
 
 	public function getTimestamp()

tests/simple_unit/SqlMap/common.php

Doc Comments +7 added lines

@@ -51,12 +51,19 @@
 	protected $baseFile;
 	protected $targetFile;
 
+	/**
+	 * @param string $base
+	 * @param string $target
+	 */
 	public function __construct($base, $target)
 	{
 		$this->baseFile = $base;
 		$this->targetFile = $target;
 	}
 
+	/**
+	 * @param string $script
+	 */
 	function runScript($connection, $script)
 	{
 		copy($this->baseFile, $this->targetFile);

Spacing +34 added lines, -34 removed lines

@@ -2,33 +2,33 @@ 
 
 Prado::using('System.Data.TDbConnection');
 
-if(!defined('SQLMAP_TESTS'))
+if (!defined('SQLMAP_TESTS'))
 	define('SQLMAP_TESTS', realpath(dirname(__FILE__)));
 
-if(!class_exists('Account', false))
+if (!class_exists('Account', false))
 {
-	include(SQLMAP_TESTS.'/domain/A.php');
-	include(SQLMAP_TESTS.'/domain/Account.php');
-	include(SQLMAP_TESTS.'/domain/AccountBis.php');
-	include(SQLMAP_TESTS.'/domain/AccountCollection.php');
-	include(SQLMAP_TESTS.'/domain/B.php');
-	include(SQLMAP_TESTS.'/domain/Document.php');
-	include(SQLMAP_TESTS.'/domain/Book.php');
-	include(SQLMAP_TESTS.'/domain/C.php');
-	include(SQLMAP_TESTS.'/domain/Category.php');
-	include(SQLMAP_TESTS.'/domain/Complex.php');
-	include(SQLMAP_TESTS.'/domain/D.php');
-	include(SQLMAP_TESTS.'/domain/DocumentCollection.php');
-	include(SQLMAP_TESTS.'/domain/E.php');
-	include(SQLMAP_TESTS.'/domain/F.php');
-	include(SQLMAP_TESTS.'/domain/LineItem.php');
-	include(SQLMAP_TESTS.'/domain/LineItemCollection.php');
-	include(SQLMAP_TESTS.'/domain/Newspaper.php');
-	include(SQLMAP_TESTS.'/domain/Order.php');
-	include(SQLMAP_TESTS.'/domain/Other.php');
-	include(SQLMAP_TESTS.'/domain/Sample.php');
-	include(SQLMAP_TESTS.'/domain/Search.php');
-	include(SQLMAP_TESTS.'/domain/User.php');
+	include(SQLMAP_TESTS . '/domain/A.php');
+	include(SQLMAP_TESTS . '/domain/Account.php');
+	include(SQLMAP_TESTS . '/domain/AccountBis.php');
+	include(SQLMAP_TESTS . '/domain/AccountCollection.php');
+	include(SQLMAP_TESTS . '/domain/B.php');
+	include(SQLMAP_TESTS . '/domain/Document.php');
+	include(SQLMAP_TESTS . '/domain/Book.php');
+	include(SQLMAP_TESTS . '/domain/C.php');
+	include(SQLMAP_TESTS . '/domain/Category.php');
+	include(SQLMAP_TESTS . '/domain/Complex.php');
+	include(SQLMAP_TESTS . '/domain/D.php');
+	include(SQLMAP_TESTS . '/domain/DocumentCollection.php');
+	include(SQLMAP_TESTS . '/domain/E.php');
+	include(SQLMAP_TESTS . '/domain/F.php');
+	include(SQLMAP_TESTS . '/domain/LineItem.php');
+	include(SQLMAP_TESTS . '/domain/LineItemCollection.php');
+	include(SQLMAP_TESTS . '/domain/Newspaper.php');
+	include(SQLMAP_TESTS . '/domain/Order.php');
+	include(SQLMAP_TESTS . '/domain/Other.php');
+	include(SQLMAP_TESTS . '/domain/Sample.php');
+	include(SQLMAP_TESTS . '/domain/Search.php');
+	include(SQLMAP_TESTS . '/domain/User.php');
 }
 
 class DefaultScriptRunner
@@ -37,10 +37,10 @@ 
 	{
 		$sql = file_get_contents($script);
 		$lines = explode(';', $sql);
-		foreach($lines as $line)
+		foreach ($lines as $line)
 		{
 			$line = trim($line);
-			if(strlen($line) > 0)
+			if (strlen($line) > 0)
 				$connection->createCommand($line)->execute();
 		}
 	}
@@ -70,11 +70,11 @@ 
 
 	public function __construct()
 	{
-		$this->_sqlmapConfigFile = SQLMAP_TESTS.'/sqlite.xml';
-		$this->_scriptDir = SQLMAP_TESTS.'/scripts/sqlite/';
+		$this->_sqlmapConfigFile = SQLMAP_TESTS . '/sqlite.xml';
+		$this->_scriptDir = SQLMAP_TESTS . '/scripts/sqlite/';
 
-		$this->targetFile = realpath(SQLMAP_TESTS.'/sqlite/tests.db');
-		$this->baseFile = realpath(SQLMAP_TESTS.'/sqlite/backup.db');
+		$this->targetFile = realpath(SQLMAP_TESTS . '/sqlite/tests.db');
+		$this->baseFile = realpath(SQLMAP_TESTS . '/sqlite/backup.db');
 		$file = realpath($this->targetFile);
 		$this->_connection = new TDbConnection("sqlite:{$file}");
 	}
@@ -89,8 +89,8 @@ 
 {
 	public function __construct()
 	{
-		$this->_sqlmapConfigFile = SQLMAP_TESTS.'/mysql.xml';
-		$this->_scriptDir = SQLMAP_TESTS.'/scripts/mysql/';
+		$this->_sqlmapConfigFile = SQLMAP_TESTS . '/mysql.xml';
+		$this->_scriptDir = SQLMAP_TESTS . '/scripts/mysql/';
 		$this->_features = array('insert_id');
 		$dsn = 'mysql:host=localhost;dbname=sqlmap_test;port=3307';
 		$this->_connection = new TDbConnection($dsn, 'test5', 'test5');
@@ -101,9 +101,9 @@ 
 {
 	public function __construct()
 	{
-		$this->_sqlmap = SQLMAP_TESTS.'/mssql.xml';
+		$this->_sqlmap = SQLMAP_TESTS . '/mssql.xml';
 		$this->_connectionString = 'odbc_mssql://sqlmap_tests';
-		$this->_scriptDir = SQLMAP_TESTS.'/scripts/mssql/';
+		$this->_scriptDir = SQLMAP_TESTS . '/scripts/mssql/';
 		$this->_features = array('insert_id');
 	}
 }

Braces +5 added lines, -3 removed lines

@@ -2,8 +2,9 @@ 
 
 Prado::using('System.Data.TDbConnection');
 
-if(!defined('SQLMAP_TESTS'))
+if(!defined('SQLMAP_TESTS')) {
 	define('SQLMAP_TESTS', realpath(dirname(__FILE__)));
+}
 
 if(!class_exists('Account', false))
 {
@@ -40,8 +41,9 @@ 
 		foreach($lines as $line)
 		{
 			$line = trim($line);
-			if(strlen($line) > 0)
-				$connection->createCommand($line)->execute();
+			if(strlen($line) > 0) {
+							$connection->createCommand($line)->execute();
+			}
 		}
 	}
 }

tests/simple_unit/SqlMap/domain/Account.php

Doc Comments +16 added lines

@@ -11,15 +11,31 @@
 	private $_CartOptions=0;
 
 	public function getID(){ return $this->_ID; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setID($value){ $this->_ID = intval($value); }
 
 	public function getFirstName(){ return $this->_FirstName; }
+
+	/**
+	 * @param string $value
+	 */
 	public function setFirstName($value){ $this->_FirstName = $value; }
 
 	public function getLastName(){ return $this->_LastName; }
+
+	/**
+	 * @param string $value
+	 */
 	public function setLastName($value){ $this->_LastName = $value; }
 
 	public function getEmailAddress(){ return $this->_EmailAddress; }
+
+	/**
+	 * @param string|null $value
+	 */
 	public function setEmailAddress($value){ $this->_EmailAddress = $value; }
 
 	public function getIDS(){ return $this->_IDS; }

Spacing +21 added lines, -21 removed lines

@@ -2,33 +2,33 @@
 
 class Account
 {
-	private $_ID=0;
-	private $_FirstName='';
-	private $_LastName='';
-	private $_EmailAddress=null;
-	private $_IDS='';
-	private $_BannerOptions=0;
-	private $_CartOptions=0;
+	private $_ID = 0;
+	private $_FirstName = '';
+	private $_LastName = '';
+	private $_EmailAddress = null;
+	private $_IDS = '';
+	private $_BannerOptions = 0;
+	private $_CartOptions = 0;
 
-	public function getID(){ return $this->_ID; }
-	public function setID($value){ $this->_ID = intval($value); }
+	public function getID() { return $this->_ID; }
+	public function setID($value) { $this->_ID = intval($value); }
 
-	public function getFirstName(){ return $this->_FirstName; }
-	public function setFirstName($value){ $this->_FirstName = $value; }
+	public function getFirstName() { return $this->_FirstName; }
+	public function setFirstName($value) { $this->_FirstName = $value; }
 
-	public function getLastName(){ return $this->_LastName; }
-	public function setLastName($value){ $this->_LastName = $value; }
+	public function getLastName() { return $this->_LastName; }
+	public function setLastName($value) { $this->_LastName = $value; }
 
-	public function getEmailAddress(){ return $this->_EmailAddress; }
-	public function setEmailAddress($value){ $this->_EmailAddress = $value; }
+	public function getEmailAddress() { return $this->_EmailAddress; }
+	public function setEmailAddress($value) { $this->_EmailAddress = $value; }
 
-	public function getIDS(){ return $this->_IDS; }
-	public function setIDS($value){ $this->_IDS = $value; }
+	public function getIDS() { return $this->_IDS; }
+	public function setIDS($value) { $this->_IDS = $value; }
 
-	public function getBannerOptions(){ return $this->_BannerOptions; }
-	public function setBannerOptions($value){ $this->_BannerOptions = $value; }
+	public function getBannerOptions() { return $this->_BannerOptions; }
+	public function setBannerOptions($value) { $this->_BannerOptions = $value; }
 
-	public function getCartOptions(){ return $this->_CartOptions; }
-	public function setCartOptions($value){ $this->_CartOptions = $value; }
+	public function getCartOptions() { return $this->_CartOptions; }
+	public function setCartOptions($value) { $this->_CartOptions = $value; }
 
 }

tests/simple_unit/SqlMap/domain/LineItem.php

Doc Comments +20 added lines

@@ -10,18 +10,38 @@
 	private $_PictureData='';
 
 	public function getID(){ return $this->_ID; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setID($value){ $this->_ID = $value; }
 
 	public function getOrder(){ return $this->_Order; }
+
+	/**
+	 * @param Order $value
+	 */
 	public function setOrder($value){ $this->_Order = $value; }
 
 	public function getCode(){ return $this->_Code; }
+
+	/**
+	 * @param string $value
+	 */
 	public function setCode($value){ $this->_Code = $value; }
 
 	public function getQuantity(){ return $this->_Quantity; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setQuantity($value){ $this->_Quantity = $value; }
 
 	public function getPrice(){ return $this->_Price; }
+
+	/**
+	 * @param double $value
+	 */
 	public function setPrice($value){ $this->_Price = $value; }
 
 	public function getPictureData(){ return $this->_PictureData; }

Spacing +18 added lines, -18 removed lines

@@ -2,29 +2,29 @@
 
 class LineItem
 {
-	private $_ID=-1;
-	private $_Order='';
-	private $_Code='';
-	private $_Quantity=-1;
-	private $_Price=0.0;
-	private $_PictureData='';
+	private $_ID = -1;
+	private $_Order = '';
+	private $_Code = '';
+	private $_Quantity = -1;
+	private $_Price = 0.0;
+	private $_PictureData = '';
 
-	public function getID(){ return $this->_ID; }
-	public function setID($value){ $this->_ID = $value; }
+	public function getID() { return $this->_ID; }
+	public function setID($value) { $this->_ID = $value; }
 
-	public function getOrder(){ return $this->_Order; }
-	public function setOrder($value){ $this->_Order = $value; }
+	public function getOrder() { return $this->_Order; }
+	public function setOrder($value) { $this->_Order = $value; }
 
-	public function getCode(){ return $this->_Code; }
-	public function setCode($value){ $this->_Code = $value; }
+	public function getCode() { return $this->_Code; }
+	public function setCode($value) { $this->_Code = $value; }
 
-	public function getQuantity(){ return $this->_Quantity; }
-	public function setQuantity($value){ $this->_Quantity = $value; }
+	public function getQuantity() { return $this->_Quantity; }
+	public function setQuantity($value) { $this->_Quantity = $value; }
 
-	public function getPrice(){ return $this->_Price; }
-	public function setPrice($value){ $this->_Price = $value; }
+	public function getPrice() { return $this->_Price; }
+	public function setPrice($value) { $this->_Price = $value; }
 
-	public function getPictureData(){ return $this->_PictureData; }
-	public function setPictureData($value){ $this->_PictureData = $value; }
+	public function getPictureData() { return $this->_PictureData; }
+	public function setPictureData($value) { $this->_PictureData = $value; }
 
 }

tests/simple_unit/SqlMap/domain/Other.php

Doc Comments +16 added lines

@@ -8,14 +8,30 @@
 	private $_Bool2=false;
 
 	public function getBool2(){ return $this->_Bool2; }
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setBool2($value){ $this->_Bool2 = $value; }
 
 	public function getBool(){ return $this->_Bool; }
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setBool($value){ $this->_Bool = $value; }
 
 	public function getInt(){ return $this->_Int; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setInt($value){ $this->_Int = $value; }
 
 	public function getLong(){ return $this->_Long; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setLong($value){ $this->_Long = $value; }
 }

Spacing +12 added lines, -12 removed lines

@@ -2,20 +2,20 @@
 
 class Other
 {
-	private $_Int=-1;
-	private $_Long=-1;
-	private $_Bool=false;
-	private $_Bool2=false;
+	private $_Int = -1;
+	private $_Long = -1;
+	private $_Bool = false;
+	private $_Bool2 = false;
 
-	public function getBool2(){ return $this->_Bool2; }
-	public function setBool2($value){ $this->_Bool2 = $value; }
+	public function getBool2() { return $this->_Bool2; }
+	public function setBool2($value) { $this->_Bool2 = $value; }
 
-	public function getBool(){ return $this->_Bool; }
-	public function setBool($value){ $this->_Bool = $value; }
+	public function getBool() { return $this->_Bool; }
+	public function setBool($value) { $this->_Bool = $value; }
 
-	public function getInt(){ return $this->_Int; }
-	public function setInt($value){ $this->_Int = $value; }
+	public function getInt() { return $this->_Int; }
+	public function setInt($value) { $this->_Int = $value; }
 
-	public function getLong(){ return $this->_Long; }
-	public function setLong($value){ $this->_Long = $value; }
+	public function getLong() { return $this->_Long; }
+	public function setLong($value) { $this->_Long = $value; }
 }

tests/simple_unit/SqlMap/InheritanceTest.php

Doc Comments +14 added lines

@@ -95,12 +95,21 @@ 
 		$this->assertNewspaper($news, 4, "Le Canard enchaine", "Paris");
 	}
 
+	/**
+	 * @param integer $id
+	 * @param string $title
+	 */
 	function AssertDocument(Document $document, $id, $title)
 	{
 		$this->assertEqual($id, $document->getID());
 		$this->assertEqual($title, $document->getTitle());
 	}
 
+	/**
+	 * @param integer $id
+	 * @param string $title
+	 * @param integer $pageNumber
+	 */
 	function AssertBook(Book $book, $id, $title, $pageNumber)
 	{
 		$this->assertEqual($id, $book->getId());
@@ -108,6 +117,11 @@ 
 		$this->assertEqual($pageNumber, (int)$book->getPageNumber());
 	}
 
+	/**
+	 * @param integer $id
+	 * @param string $title
+	 * @param string $city
+	 */
 	function AssertNewspaper(Newspaper $news, $id, $title, $city)
 	{
 		$this->assertEqual($id, $news->getId());

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(__FILE__).'/BaseCase.php');
+require_once(dirname(__FILE__) . '/BaseCase.php');
 
 /**
  * @package System.DataAccess.SQLMap
@@ -105,7 +105,7 @@ 
 	{
 		$this->assertEqual($id, $book->getId());
 		$this->assertEqual($title, $book->getTitle());
-		$this->assertEqual($pageNumber, (int)$book->getPageNumber());
+		$this->assertEqual($pageNumber, (int) $book->getPageNumber());
 	}
 
 	function AssertNewspaper(Newspaper $news, $id, $title, $city)
@@ -137,7 +137,7 @@ 
 		throw new TDataMapperException('not implemented');
 	}
 
-	public function createNewInstance($data=null)
+	public function createNewInstance($data = null)
 	{
 		throw new TDataMapperException('can not create');
 	}

tests/test_tools/PradoGenericSelenium2Test.php

Doc Comments +30 added lines

@@ -56,6 +56,10 @@ 
 		$this->setSeleniumServerRequestsTimeout(static::$timeout);
 	}
 
+	/**
+	 * @param string $idattr
+	 * @param string|null $txt
+	 */
 	protected function assertAttribute($idattr, $txt)
 	{
 		list($id, $attr) = explode('@', $idattr);
@@ -91,6 +95,9 @@ 
 		$this->assertEquals($txt, $this->getElement($id)->text());
 	}
 
+	/**
+	 * @param string $txt
+	 */
 	protected function assertValue($id, $txt)
 	{
 		try{
@@ -185,11 +192,18 @@ 
 		$select->selectOptionByLabel($value);
 	}
 
+	/**
+	 * @param string $id
+	 * @param string $value
+	 */
 	protected function selectAndWait($id, $value)
 	{
 		$this->select($id, $value);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function addSelection($id, $value)
 	{
 		parent::select($this->getElement($id))->selectOptionByLabel($value);
@@ -200,11 +214,18 @@ 
 		return parent::select($this->getElement($id))->selectedLabels();
 	}
 
+	/**
+	 * @param string $id
+	 */
 	protected function getSelectOptions($id)
 	{
 		return parent::select($this->getElement($id))->selectOptionLabels();
 	}
 
+	/**
+	 * @param string $id
+	 * @param integer $value
+	 */
 	protected function assertSelectedIndex($id, $value)
 	{
 		$options=parent::select($this->getElement($id))->selectOptionValues();
@@ -223,6 +244,9 @@ 
 		$this->fail('Current value '.$curval.' not found in: '.implode(',', $options));
 	}
 
+	/**
+	 * @param string $label
+	 */
 	protected function assertSelected($id, $label)
 	{
 		$this->assertSame($label, parent::select($this->getElement($id))->selectedLabel());
@@ -233,6 +257,9 @@ 
 		$this->assertSame(array(), $this->getSelectedLabels($id));
 	}
 
+	/**
+	 * @param string $index
+	 */
 	protected function assertSelectedValue($id, $index)
 	{
 		$this->assertSame($index, parent::select($this->getElement($id))->selectedValue());
@@ -264,6 +291,9 @@ 
 		$this->assertTrue($found, "Failed asserting that page source contains $text");
 	}
 
+	/**
+	 * @param string $text
+	 */
 	public function assertSourceNotContains($text)
 	{
 		$found = strpos($this->source(), $text) !== false;

Spacing +29 added lines, -29 removed lines

@@ -45,9 +45,9 @@ 
 */
 	);
 
-	static $baseurl='http://127.0.0.1/prado-master/tests/FunctionalTests/';
+	static $baseurl = 'http://127.0.0.1/prado-master/tests/FunctionalTests/';
 
-	static $timeout=5; //seconds
+	static $timeout = 5; //seconds
 
 	protected function setUp()
 	{
@@ -61,11 +61,11 @@ 
 		list($id, $attr) = explode('@', $idattr);
 
 		$element = $this->getElement($id);
-		$value=$element->attribute($attr);
+		$value = $element->attribute($attr);
 
-		if(strpos($txt, 'regexp:')===0)
+		if (strpos($txt, 'regexp:') === 0)
 		{
-			$this->assertRegExp('/'.substr($txt, 7).'/', $value);
+			$this->assertRegExp('/' . substr($txt, 7) . '/', $value);
 		} else {
 			$this->assertEquals($txt, $value);
 		}
@@ -73,13 +73,13 @@ 
 
 	protected function getElement($id)
 	{
-		if(strpos($id, 'id=')===0) {
+		if (strpos($id, 'id=') === 0) {
 			return $this->byId(substr($id, 3));
-		} elseif(strpos($id, 'name=')===0) {
+		} elseif (strpos($id, 'name=') === 0) {
 			return $this->byName(substr($id, 5));
-		} elseif(strpos($id, '//')===0) {
+		} elseif (strpos($id, '//') === 0) {
 			return $this->byXPath($id);
-		} elseif(strpos($id, '$')!==false) {
+		} elseif (strpos($id, '$') !== false) {
 			return $this->byName($id);
 		} else {
 			return $this->byId($id);
@@ -93,7 +93,7 @@ 
 
 	protected function assertValue($id, $txt)
 	{
-		try{
+		try {
 			$this->assertEquals($txt, $this->getElement($id)->value());
 		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
 			//stale element reference. try second time.
@@ -104,7 +104,7 @@ 
 
 	protected function assertVisible($id)
 	{
-		try{
+		try {
 			$this->assertTrue($this->getElement($id)->displayed());
 		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
 			//stale element reference. try second time.
@@ -115,7 +115,7 @@ 
 
 	protected function assertNotVisible($id)
 	{
-		try{
+		try {
 			$this->assertFalse($this->getElement($id)->displayed());
 		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
 			//stale element reference. try second time.
@@ -126,7 +126,7 @@ 
 
 	protected function assertElementPresent($id)
 	{
-		$this->assertTrue($this->getElement($id)!==null);
+		$this->assertTrue($this->getElement($id) !== null);
 	}
 
 	protected function assertElementNotPresent($id)
@@ -137,10 +137,10 @@ 
 			$this->assertEquals(PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoSuchElement, $e->getCode());
 			return;
 		}
-		$this->fail('The element '.$id.' shouldn\'t exist.');
+		$this->fail('The element ' . $id . ' shouldn\'t exist.');
 	}
 
-	protected function type($id, $txt='')
+	protected function type($id, $txt = '')
 	{
 		$element = $this->getElement($id);
 		$element->clear();
@@ -149,7 +149,7 @@ 
 		$this->byCssSelector('body')->click();
 	}
 
-	protected function typeSpecial($id, $txt='')
+	protected function typeSpecial($id, $txt = '')
 	{
 		$element = $this->getElement($id);
 		// clear the textbox without using clear() that triggers onchange()
@@ -159,16 +159,16 @@ 
 		// sequences of end+backspace and start+delete
 
 		$element->click();
-		while(strlen($element->value())>0)
+		while (strlen($element->value()) > 0)
 		{
 			$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::END);
 			// the number 100 is purely empiric
-			for($i=0;$i<100;$i++)
+			for ($i = 0; $i < 100; $i++)
 				$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::BACKSPACE);
 
 			$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::HOME);
 			// the number 100 is purely empiric
-			for($i=0;$i<100;$i++)
+			for ($i = 0; $i < 100; $i++)
 				$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::DELETE);
 		}
 
@@ -207,20 +207,20 @@ 
 
 	protected function assertSelectedIndex($id, $value)
 	{
-		$options=parent::select($this->getElement($id))->selectOptionValues();
-		$curval=parent::select($this->getElement($id))->selectedValue();
+		$options = parent::select($this->getElement($id))->selectOptionValues();
+		$curval = parent::select($this->getElement($id))->selectedValue();
 
-		$i=0;
-		foreach($options as $option)
+		$i = 0;
+		foreach ($options as $option)
 		{
-			if($option==$curval)
+			if ($option == $curval)
 			{
 				$this->assertEquals($i, $value);
 				return;
 			}
 			$i++;
 		}
-		$this->fail('Current value '.$curval.' not found in: '.implode(',', $options));
+		$this->fail('Current value ' . $curval . ' not found in: ' . implode(',', $options));
 	}
 
 	protected function assertSelected($id, $label)
@@ -241,7 +241,7 @@ 
 	protected function assertAlertNotPresent()
 	{
 		try {
-			$foo=$this->alertText();
+			$foo = $this->alertText();
 		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
 			$this->assertEquals(PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoAlertOpenError, $e->getCode());
 			return;
@@ -251,13 +251,13 @@ 
 
 	protected function pause($msec)
 	{
-		usleep($msec*1000);
+		usleep($msec * 1000);
 	}
 
 	public function assertSourceContains($text)
 	{
 		$found = strpos($this->source(), $text) !== false;
-		for($i=0;$i<10 && ! $found; $i++) {
+		for ($i = 0; $i < 10 && !$found; $i++) {
 			$this->pause(20);
 			$found = strpos($this->source(), $text) !== false;
 		}
@@ -267,7 +267,7 @@ 
 	public function assertSourceNotContains($text)
 	{
 		$found = strpos($this->source(), $text) !== false;
-		for($i=0;$i<10 && $found; $i++) {
+		for ($i = 0; $i < 10 && $found; $i++) {
 			$this->pause(20);
 			$found = strpos($this->source(), $text) !== false;
 		}

Braces +6 added lines, -4 removed lines

@@ -163,13 +163,15 @@
 		{
 			$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::END);
 			// the number 100 is purely empiric
-			for($i=0;$i<100;$i++)
-				$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::BACKSPACE);
+			for($i=0;$i<100;$i++) {
+							$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::BACKSPACE);
+			}
 
 			$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::HOME);
 			// the number 100 is purely empiric
-			for($i=0;$i<100;$i++)
-				$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::DELETE);
+			for($i=0;$i<100;$i++) {
+							$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::DELETE);
+			}
 		}
 
 		$element->value($txt);

tests/test_tools/simpletest/authentication.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
         /**
          *    Accessor for current identity.
-         *    @return string        Last succesful password.
+         *    @return boolean        Last succesful password.
          *    @access public
          */
         function getPassword() {

Indentation +232 added lines, -232 removed lines

@@ -1,237 +1,237 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: authentication.php 1532 2006-12-01 12:28:55Z xue $
-     */
-    /**
-     *	include http class
-     */
-    require_once(dirname(__FILE__) . '/http.php');
-
-    /**
-     *    Represents a single security realm's identity.
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: authentication.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+	/**
+	 *	include http class
+	 */
+	require_once(dirname(__FILE__) . '/http.php');
+
+	/**
+	 *    Represents a single security realm's identity.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRealm {
-        protected $_type;
-        protected $_root;
-        protected $_username;
-        protected $_password;
-
-        /**
-         *    Starts with the initial entry directory.
-         *    @param string $type      Authentication type for this
-         *                             realm. Only Basic authentication
-         *                             is currently supported.
-         *    @param SimpleUrl $url    Somewhere in realm.
-         *    @access public
-         */
-        function SimpleRealm($type, $url) {
-            $this->_type = $type;
-            $this->_root = $url->getBasePath();
-            $this->_username = false;
-            $this->_password = false;
-        }
-
-        /**
-         *    Adds another location to the realm.
-         *    @param SimpleUrl $url    Somewhere in realm.
-         *    @access public
-         */
-        function stretch($url) {
-            $this->_root = $this->_getCommonPath($this->_root, $url->getPath());
-        }
-
-        /**
-         *    Finds the common starting path.
-         *    @param string $first        Path to compare.
-         *    @param string $second       Path to compare.
-         *    @return string              Common directories.
-         *    @access private
-         */
-        function _getCommonPath($first, $second) {
-            $first = explode('/', $first);
-            $second = explode('/', $second);
-            for ($i = 0; $i < min(count($first), count($second)); $i++) {
-                if ($first[$i] != $second[$i]) {
-                    return implode('/', array_slice($first, 0, $i)) . '/';
-                }
-            }
-            return implode('/', $first) . '/';
-        }
-
-        /**
-         *    Sets the identity to try within this realm.
-         *    @param string $username    Username in authentication dialog.
-         *    @param string $username    Password in authentication dialog.
-         *    @access public
-         */
-        function setIdentity($username, $password) {
-            $this->_username = $username;
-            $this->_password = $password;
-        }
-
-        /**
-         *    Accessor for current identity.
-         *    @return string        Last succesful username.
-         *    @access public
-         */
-        function getUsername() {
-            return $this->_username;
-        }
-
-        /**
-         *    Accessor for current identity.
-         *    @return string        Last succesful password.
-         *    @access public
-         */
-        function getPassword() {
-            return $this->_password;
-        }
-
-        /**
-         *    Test to see if the URL is within the directory
-         *    tree of the realm.
-         *    @param SimpleUrl $url    URL to test.
-         *    @return boolean          True if subpath.
-         *    @access public
-         */
-        function isWithin($url) {
-            if ($this->_isIn($this->_root, $url->getBasePath())) {
-                return true;
-            }
-            if ($this->_isIn($this->_root, $url->getBasePath() . $url->getPage() . '/')) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         *    Tests to see if one string is a substring of
-         *    another.
-         *    @param string $part        Small bit.
-         *    @param string $whole       Big bit.
-         *    @return boolean            True if the small bit is
-         *                               in the big bit.
-         *    @access private
-         */
-        function _isIn($part, $whole) {
-            return strpos($whole, $part) === 0;
-        }
-    }
-
-    /**
-     *    Manages security realms.
+	 */
+	class SimpleRealm {
+		protected $_type;
+		protected $_root;
+		protected $_username;
+		protected $_password;
+
+		/**
+		 *    Starts with the initial entry directory.
+		 *    @param string $type      Authentication type for this
+		 *                             realm. Only Basic authentication
+		 *                             is currently supported.
+		 *    @param SimpleUrl $url    Somewhere in realm.
+		 *    @access public
+		 */
+		function SimpleRealm($type, $url) {
+			$this->_type = $type;
+			$this->_root = $url->getBasePath();
+			$this->_username = false;
+			$this->_password = false;
+		}
+
+		/**
+		 *    Adds another location to the realm.
+		 *    @param SimpleUrl $url    Somewhere in realm.
+		 *    @access public
+		 */
+		function stretch($url) {
+			$this->_root = $this->_getCommonPath($this->_root, $url->getPath());
+		}
+
+		/**
+		 *    Finds the common starting path.
+		 *    @param string $first        Path to compare.
+		 *    @param string $second       Path to compare.
+		 *    @return string              Common directories.
+		 *    @access private
+		 */
+		function _getCommonPath($first, $second) {
+			$first = explode('/', $first);
+			$second = explode('/', $second);
+			for ($i = 0; $i < min(count($first), count($second)); $i++) {
+				if ($first[$i] != $second[$i]) {
+					return implode('/', array_slice($first, 0, $i)) . '/';
+				}
+			}
+			return implode('/', $first) . '/';
+		}
+
+		/**
+		 *    Sets the identity to try within this realm.
+		 *    @param string $username    Username in authentication dialog.
+		 *    @param string $username    Password in authentication dialog.
+		 *    @access public
+		 */
+		function setIdentity($username, $password) {
+			$this->_username = $username;
+			$this->_password = $password;
+		}
+
+		/**
+		 *    Accessor for current identity.
+		 *    @return string        Last succesful username.
+		 *    @access public
+		 */
+		function getUsername() {
+			return $this->_username;
+		}
+
+		/**
+		 *    Accessor for current identity.
+		 *    @return string        Last succesful password.
+		 *    @access public
+		 */
+		function getPassword() {
+			return $this->_password;
+		}
+
+		/**
+		 *    Test to see if the URL is within the directory
+		 *    tree of the realm.
+		 *    @param SimpleUrl $url    URL to test.
+		 *    @return boolean          True if subpath.
+		 *    @access public
+		 */
+		function isWithin($url) {
+			if ($this->_isIn($this->_root, $url->getBasePath())) {
+				return true;
+			}
+			if ($this->_isIn($this->_root, $url->getBasePath() . $url->getPage() . '/')) {
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 *    Tests to see if one string is a substring of
+		 *    another.
+		 *    @param string $part        Small bit.
+		 *    @param string $whole       Big bit.
+		 *    @return boolean            True if the small bit is
+		 *                               in the big bit.
+		 *    @access private
+		 */
+		function _isIn($part, $whole) {
+			return strpos($whole, $part) === 0;
+		}
+	}
+
+	/**
+	 *    Manages security realms.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleAuthenticator {
-        protected $_realms;
-
-        /**
-         *    Clears the realms.
-         *    @access public
-         */
-        function SimpleAuthenticator() {
-            $this->restartSession();
-        }
-
-        /**
-         *    Starts with no realms set up.
-         *    @access public
-         */
-        function restartSession() {
-            $this->_realms = array();
-        }
-
-        /**
-         *    Adds a new realm centered the current URL.
-         *    Browsers vary wildly on their behaviour in this
-         *    regard. Mozilla ignores the realm and presents
-         *    only when challenged, wasting bandwidth. IE
-         *    just carries on presenting until a new challenge
-         *    occours. SimpleTest tries to follow the spirit of
-         *    the original standards committee and treats the
-         *    base URL as the root of a file tree shaped realm.
-         *    @param SimpleUrl $url    Base of realm.
-         *    @param string $type      Authentication type for this
-         *                             realm. Only Basic authentication
-         *                             is currently supported.
-         *    @param string $realm     Name of realm.
-         *    @access public
-         */
-        function addRealm($url, $type, $realm) {
-            $this->_realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
-        }
-
-        /**
-         *    Sets the current identity to be presented
-         *    against that realm.
-         *    @param string $host        Server hosting realm.
-         *    @param string $realm       Name of realm.
-         *    @param string $username    Username for realm.
-         *    @param string $password    Password for realm.
-         *    @access public
-         */
-        function setIdentityForRealm($host, $realm, $username, $password) {
-            if (isset($this->_realms[$host][$realm])) {
-                $this->_realms[$host][$realm]->setIdentity($username, $password);
-            }
-        }
-
-        /**
-         *    Finds the name of the realm by comparing URLs.
-         *    @param SimpleUrl $url        URL to test.
-         *    @return SimpleRealm          Name of realm.
-         *    @access private
-         */
-        function _findRealmFromUrl($url) {
-            if (! isset($this->_realms[$url->getHost()])) {
-                return false;
-            }
-            foreach ($this->_realms[$url->getHost()] as $name => $realm) {
-                if ($realm->isWithin($url)) {
-                    return $realm;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Presents the appropriate headers for this location.
-         *    @param SimpleHttpRequest $request  Request to modify.
-         *    @param SimpleUrl $url              Base of realm.
-         *    @access public
-         */
-        function addHeaders($request, $url) {
-            if ($url->getUsername() && $url->getPassword()) {
-                $username = $url->getUsername();
-                $password = $url->getPassword();
-            } elseif ($realm = $this->_findRealmFromUrl($url)) {
-                $username = $realm->getUsername();
-                $password = $realm->getPassword();
-            } else {
-                return;
-            }
-            $this->addBasicHeaders($request, $username, $password);
-        }
-
-        /**
-         *    Presents the appropriate headers for this
-         *    location for basic authentication.
-         *    @param SimpleHttpRequest $request  Request to modify.
-         *    @param string $username            Username for realm.
-         *    @param string $password            Password for realm.
-         *    @access public
-         *    @static
-         */
-        static function addBasicHeaders($request, $username, $password) {
-            if ($username && $password) {
-                $request->addHeaderLine(
-                        'Authorization: Basic ' . base64_encode("$username:$password"));
-            }
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleAuthenticator {
+		protected $_realms;
+
+		/**
+		 *    Clears the realms.
+		 *    @access public
+		 */
+		function SimpleAuthenticator() {
+			$this->restartSession();
+		}
+
+		/**
+		 *    Starts with no realms set up.
+		 *    @access public
+		 */
+		function restartSession() {
+			$this->_realms = array();
+		}
+
+		/**
+		 *    Adds a new realm centered the current URL.
+		 *    Browsers vary wildly on their behaviour in this
+		 *    regard. Mozilla ignores the realm and presents
+		 *    only when challenged, wasting bandwidth. IE
+		 *    just carries on presenting until a new challenge
+		 *    occours. SimpleTest tries to follow the spirit of
+		 *    the original standards committee and treats the
+		 *    base URL as the root of a file tree shaped realm.
+		 *    @param SimpleUrl $url    Base of realm.
+		 *    @param string $type      Authentication type for this
+		 *                             realm. Only Basic authentication
+		 *                             is currently supported.
+		 *    @param string $realm     Name of realm.
+		 *    @access public
+		 */
+		function addRealm($url, $type, $realm) {
+			$this->_realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
+		}
+
+		/**
+		 *    Sets the current identity to be presented
+		 *    against that realm.
+		 *    @param string $host        Server hosting realm.
+		 *    @param string $realm       Name of realm.
+		 *    @param string $username    Username for realm.
+		 *    @param string $password    Password for realm.
+		 *    @access public
+		 */
+		function setIdentityForRealm($host, $realm, $username, $password) {
+			if (isset($this->_realms[$host][$realm])) {
+				$this->_realms[$host][$realm]->setIdentity($username, $password);
+			}
+		}
+
+		/**
+		 *    Finds the name of the realm by comparing URLs.
+		 *    @param SimpleUrl $url        URL to test.
+		 *    @return SimpleRealm          Name of realm.
+		 *    @access private
+		 */
+		function _findRealmFromUrl($url) {
+			if (! isset($this->_realms[$url->getHost()])) {
+				return false;
+			}
+			foreach ($this->_realms[$url->getHost()] as $name => $realm) {
+				if ($realm->isWithin($url)) {
+					return $realm;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Presents the appropriate headers for this location.
+		 *    @param SimpleHttpRequest $request  Request to modify.
+		 *    @param SimpleUrl $url              Base of realm.
+		 *    @access public
+		 */
+		function addHeaders($request, $url) {
+			if ($url->getUsername() && $url->getPassword()) {
+				$username = $url->getUsername();
+				$password = $url->getPassword();
+			} elseif ($realm = $this->_findRealmFromUrl($url)) {
+				$username = $realm->getUsername();
+				$password = $realm->getPassword();
+			} else {
+				return;
+			}
+			$this->addBasicHeaders($request, $username, $password);
+		}
+
+		/**
+		 *    Presents the appropriate headers for this
+		 *    location for basic authentication.
+		 *    @param SimpleHttpRequest $request  Request to modify.
+		 *    @param string $username            Username for realm.
+		 *    @param string $password            Password for realm.
+		 *    @access public
+		 *    @static
+		 */
+		static function addBasicHeaders($request, $username, $password) {
+			if ($username && $password) {
+				$request->addHeaderLine(
+						'Authorization: Basic ' . base64_encode("$username:$password"));
+			}
+		}
+	}
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
          *    @access private
          */
         function _findRealmFromUrl($url) {
-            if (! isset($this->_realms[$url->getHost()])) {
+            if (!isset($this->_realms[$url->getHost()])) {
                 return false;
             }
             foreach ($this->_realms[$url->getHost()] as $name => $realm) {

tests/test_tools/simpletest/browser.php

Doc Comments +10 added lines, -10 removed lines

@@ -97,7 +97,7 @@ 
         /**
          *    Parameters of last fetch from current history
          *    position.
-         *    @return SimpleFormEncoding    Post parameters.
+         *    @return SimpleEncoding    Post parameters.
          *    @access public
          */
         function getParameters() {
@@ -185,7 +185,7 @@ 
 
         /**
          *    Creates the underlying user agent.
-         *    @return SimpleFetcher    Content fetcher.
+         *    @return SimpleUserAgent    Content fetcher.
          *    @access protected
          */
         function &_createUserAgent() {
@@ -311,9 +311,9 @@ 
 
         /**
          *    Fetches a page and makes it the current page/frame.
-         *    @param string/SimpleUrl $url            Target to fetch as string.
+         *    @param SimpleUrl $url            Target to fetch as string.
          *    @param SimplePostEncoding $parameters   POST parameters.
-         *    @return string                          Raw content of page.
+         *    @return boolean                          Raw content of page.
          *    @access private
          */
         function _loadPage($url, $parameters) {
@@ -328,7 +328,7 @@ 
          *    Fetches a frame into the existing frameset replacing the
          *    original.
          *    @param array $frames                    List of names to drill down.
-         *    @param string/SimpleUrl $url            Target to fetch as string.
+         *    @param SimpleUrl $url            Target to fetch as string.
          *    @param SimpleFormEncoding $parameters   POST parameters.
          *    @return string                          Raw content of page.
          *    @access private
@@ -453,7 +453,7 @@ 
         /**
          *    Fetches the page content with a HEAD request.
          *    Will affect cookies, but will not change the base URL.
-         *    @param string/SimpleUrl $url                Target to fetch as string.
+         *    @param string $url                Target to fetch as string.
          *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
          *                                                HEAD request.
          *    @return boolean                             True if successful.
@@ -472,7 +472,7 @@ 
 
         /**
          *    Fetches the page content with a simple GET request.
-         *    @param string/SimpleUrl $url                Target to fetch.
+         *    @param string $url                Target to fetch.
          *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
          *                                                GET request.
          *    @return string                              Content of page or false.
@@ -490,7 +490,7 @@ 
 
         /**
          *    Fetches the page content with a POST request.
-         *    @param string/SimpleUrl $url                Target to fetch as string.
+         *    @param string $url                Target to fetch as string.
          *    @param hash/SimpleFormEncoding $parameters  POST parameters.
          *    @return string                              Content of page.
          *    @access public
@@ -597,7 +597,7 @@ 
 
         /**
          *    Accessor for a breakdown of the frameset.
-         *    @return array   Hash tree of frames by name
+         *    @return string   Hash tree of frames by name
          *                    or index if no name.
          *    @access public
          */
@@ -724,7 +724,7 @@ 
 
         /**
          *    Accessor for raw page information.
-         *    @return string      Original text content of web page.
+         *    @return boolean      Original text content of web page.
          *    @access public
          */
         function getContent() {

Indentation +1049 added lines, -1049 removed lines

@@ -1,1056 +1,1056 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: browser.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: browser.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/simpletest.php');
-    require_once(dirname(__FILE__) . '/http.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    require_once(dirname(__FILE__) . '/page.php');
-    require_once(dirname(__FILE__) . '/selector.php');
-    require_once(dirname(__FILE__) . '/frames.php');
-    require_once(dirname(__FILE__) . '/user_agent.php');
-    /**#@-*/
-
-    if (!defined('DEFAULT_MAX_NESTED_FRAMES')) {
-        define('DEFAULT_MAX_NESTED_FRAMES', 3);
-    }
-
-    /**
-     *    Browser history list.
+	require_once(dirname(__FILE__) . '/simpletest.php');
+	require_once(dirname(__FILE__) . '/http.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	require_once(dirname(__FILE__) . '/page.php');
+	require_once(dirname(__FILE__) . '/selector.php');
+	require_once(dirname(__FILE__) . '/frames.php');
+	require_once(dirname(__FILE__) . '/user_agent.php');
+	/**#@-*/
+
+	if (!defined('DEFAULT_MAX_NESTED_FRAMES')) {
+		define('DEFAULT_MAX_NESTED_FRAMES', 3);
+	}
+
+	/**
+	 *    Browser history list.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleBrowserHistory {
-        protected $_sequence;
-        protected $_position;
-
-        /**
-         *    Starts empty.
-         *    @access public
-         */
-        function SimpleBrowserHistory() {
-            $this->_sequence = array();
-            $this->_position = -1;
-        }
-
-        /**
-         *    Test for no entries yet.
-         *    @return boolean        True if empty.
-         *    @access private
-         */
-        function _isEmpty() {
-            return ($this->_position == -1);
-        }
-
-        /**
-         *    Test for being at the beginning.
-         *    @return boolean        True if first.
-         *    @access private
-         */
-        function _atBeginning() {
-            return ($this->_position == 0) && ! $this->_isEmpty();
-        }
-
-        /**
-         *    Test for being at the last entry.
-         *    @return boolean        True if last.
-         *    @access private
-         */
-        function _atEnd() {
-            return ($this->_position + 1 >= count($this->_sequence)) && ! $this->_isEmpty();
-        }
-
-        /**
-         *    Adds a successfully fetched page to the history.
-         *    @param SimpleUrl $url                 URL of fetch.
-         *    @param SimpleEncoding $parameters     Any post data with the fetch.
-         *    @access public
-         */
-        function recordEntry($url, $parameters) {
-            $this->_dropFuture();
-            array_push(
-                    $this->_sequence,
-                    array('url' => $url, 'parameters' => $parameters));
-            $this->_position++;
-        }
-
-        /**
-         *    Last fully qualified URL for current history
-         *    position.
-         *    @return SimpleUrl        URL for this position.
-         *    @access public
-         */
-        function getUrl() {
-            if ($this->_isEmpty()) {
-                return false;
-            }
-            return $this->_sequence[$this->_position]['url'];
-        }
-
-        /**
-         *    Parameters of last fetch from current history
-         *    position.
-         *    @return SimpleFormEncoding    Post parameters.
-         *    @access public
-         */
-        function getParameters() {
-            if ($this->_isEmpty()) {
-                return false;
-            }
-            return $this->_sequence[$this->_position]['parameters'];
-        }
-
-        /**
-         *    Step back one place in the history. Stops at
-         *    the first page.
-         *    @return boolean     True if any previous entries.
-         *    @access public
-         */
-        function back() {
-            if ($this->_isEmpty() || $this->_atBeginning()) {
-                return false;
-            }
-            $this->_position--;
-            return true;
-        }
-
-        /**
-         *    Step forward one place. If already at the
-         *    latest entry then nothing will happen.
-         *    @return boolean     True if any future entries.
-         *    @access public
-         */
-        function forward() {
-            if ($this->_isEmpty() || $this->_atEnd()) {
-                return false;
-            }
-            $this->_position++;
-            return true;
-        }
-
-        /**
-         *    Ditches all future entries beyond the current
-         *    point.
-         *    @access private
-         */
-        function _dropFuture() {
-            if ($this->_isEmpty()) {
-                return;
-            }
-            while (! $this->_atEnd()) {
-                array_pop($this->_sequence);
-            }
-        }
-    }
-
-    /**
-     *    Simulated web browser. This is an aggregate of
-     *    the user agent, the HTML parsing, request history
-     *    and the last header set.
+	 */
+	class SimpleBrowserHistory {
+		protected $_sequence;
+		protected $_position;
+
+		/**
+		 *    Starts empty.
+		 *    @access public
+		 */
+		function SimpleBrowserHistory() {
+			$this->_sequence = array();
+			$this->_position = -1;
+		}
+
+		/**
+		 *    Test for no entries yet.
+		 *    @return boolean        True if empty.
+		 *    @access private
+		 */
+		function _isEmpty() {
+			return ($this->_position == -1);
+		}
+
+		/**
+		 *    Test for being at the beginning.
+		 *    @return boolean        True if first.
+		 *    @access private
+		 */
+		function _atBeginning() {
+			return ($this->_position == 0) && ! $this->_isEmpty();
+		}
+
+		/**
+		 *    Test for being at the last entry.
+		 *    @return boolean        True if last.
+		 *    @access private
+		 */
+		function _atEnd() {
+			return ($this->_position + 1 >= count($this->_sequence)) && ! $this->_isEmpty();
+		}
+
+		/**
+		 *    Adds a successfully fetched page to the history.
+		 *    @param SimpleUrl $url                 URL of fetch.
+		 *    @param SimpleEncoding $parameters     Any post data with the fetch.
+		 *    @access public
+		 */
+		function recordEntry($url, $parameters) {
+			$this->_dropFuture();
+			array_push(
+					$this->_sequence,
+					array('url' => $url, 'parameters' => $parameters));
+			$this->_position++;
+		}
+
+		/**
+		 *    Last fully qualified URL for current history
+		 *    position.
+		 *    @return SimpleUrl        URL for this position.
+		 *    @access public
+		 */
+		function getUrl() {
+			if ($this->_isEmpty()) {
+				return false;
+			}
+			return $this->_sequence[$this->_position]['url'];
+		}
+
+		/**
+		 *    Parameters of last fetch from current history
+		 *    position.
+		 *    @return SimpleFormEncoding    Post parameters.
+		 *    @access public
+		 */
+		function getParameters() {
+			if ($this->_isEmpty()) {
+				return false;
+			}
+			return $this->_sequence[$this->_position]['parameters'];
+		}
+
+		/**
+		 *    Step back one place in the history. Stops at
+		 *    the first page.
+		 *    @return boolean     True if any previous entries.
+		 *    @access public
+		 */
+		function back() {
+			if ($this->_isEmpty() || $this->_atBeginning()) {
+				return false;
+			}
+			$this->_position--;
+			return true;
+		}
+
+		/**
+		 *    Step forward one place. If already at the
+		 *    latest entry then nothing will happen.
+		 *    @return boolean     True if any future entries.
+		 *    @access public
+		 */
+		function forward() {
+			if ($this->_isEmpty() || $this->_atEnd()) {
+				return false;
+			}
+			$this->_position++;
+			return true;
+		}
+
+		/**
+		 *    Ditches all future entries beyond the current
+		 *    point.
+		 *    @access private
+		 */
+		function _dropFuture() {
+			if ($this->_isEmpty()) {
+				return;
+			}
+			while (! $this->_atEnd()) {
+				array_pop($this->_sequence);
+			}
+		}
+	}
+
+	/**
+	 *    Simulated web browser. This is an aggregate of
+	 *    the user agent, the HTML parsing, request history
+	 *    and the last header set.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleBrowser {
-        protected $_user_agent;
-        protected $_page;
-        protected $_history;
-        protected $_ignore_frames;
-        protected $_maximum_nested_frames;
-
-        /**
-         *    Starts with a fresh browser with no
-         *    cookie or any other state information. The
-         *    exception is that a default proxy will be
-         *    set up if specified in the options.
-         *    @access public
-         */
-        function SimpleBrowser() {
-            $this->_user_agent = $this->_createUserAgent();
-            $this->_user_agent->useProxy(
-                    SimpleTest::getDefaultProxy(),
-                    SimpleTest::getDefaultProxyUsername(),
-                    SimpleTest::getDefaultProxyPassword());
-            $this->_page = new SimplePage();
-            $this->_history = $this->_createHistory();
-            $this->_ignore_frames = false;
-            $this->_maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
-        }
-
-        /**
-         *    Creates the underlying user agent.
-         *    @return SimpleFetcher    Content fetcher.
-         *    @access protected
-         */
-        function &_createUserAgent() {
-            $user_agent = new SimpleUserAgent();
-            return $user_agent;
-        }
-
-        /**
-         *    Creates a new empty history list.
-         *    @return SimpleBrowserHistory    New list.
-         *    @access protected
-         */
-        function &_createHistory() {
-            $history = new SimpleBrowserHistory();
-            return $history;
-        }
-
-        /**
-         *    Disables frames support. Frames will not be fetched
-         *    and the frameset page will be used instead.
-         *    @access public
-         */
-        function ignoreFrames() {
-            $this->_ignore_frames = true;
-        }
-
-        /**
-         *    Enables frames support. Frames will be fetched from
-         *    now on.
-         *    @access public
-         */
-        function useFrames() {
-            $this->_ignore_frames = false;
-        }
-
-        /**
-         *    Switches off cookie sending and recieving.
-         *    @access public
-         */
-        function ignoreCookies() {
-            $this->_user_agent->ignoreCookies();
-        }
-
-        /**
-         *    Switches back on the cookie sending and recieving.
-         *    @access public
-         */
-        function useCookies() {
-            $this->_user_agent->useCookies();
-        }
-
-        /**
-         *    Parses the raw content into a page. Will load further
-         *    frame pages unless frames are disabled.
-         *    @param SimpleHttpResponse $response    Response from fetch.
-         *    @param integer $depth                  Nested frameset depth.
-         *    @return SimplePage                     Parsed HTML.
-         *    @access private
-         */
-        function &_parse($response, $depth = 0) {
-            $page = $this->_buildPage($response);
-            if ($this->_ignore_frames || ! $page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
-                return $page;
-            }
-            $frameset = new SimpleFrameset($page);
-            foreach ($page->getFrameset() as $key => $url) {
-                $frame = $this->_fetch($url, new SimpleGetEncoding(), $depth + 1);
-                $frameset->addFrame($frame, $key);
-            }
-            return $frameset;
-        }
-
-        /**
-         *    Assembles the parsing machinery and actually parses
-         *    a single page. Frees all of the builder memory and so
-         *    unjams the PHP memory management.
-         *    @param SimpleHttpResponse $response    Response from fetch.
-         *    @return SimplePage                     Parsed top level page.
-         *    @access protected
-         */
-        function &_buildPage($response) {
-            $builder = new SimplePageBuilder();
-            $page = $builder->parse($response);
-            $builder->free();
-            unset($builder);
-            return $page;
-        }
-
-        /**
-         *    Fetches a page. Jointly recursive with the _parse()
-         *    method as it descends a frameset.
-         *    @param string/SimpleUrl $url          Target to fetch.
-         *    @param SimpleEncoding $encoding       GET/POST parameters.
-         *    @param integer $depth                 Nested frameset depth protection.
-         *    @return SimplePage                    Parsed page.
-         *    @access private
-         */
-        function &_fetch($url, $encoding, $depth = 0) {
-            $response = $this->_user_agent->fetchResponse($url, $encoding);
-            if ($response->isError()) {
-                $page = new SimplePage($response);
-            } else {
-                $page = $this->_parse($response, $depth);
-            }
-            return $page;
-        }
-
-        /**
-         *    Fetches a page or a single frame if that is the current
-         *    focus.
-         *    @param SimpleUrl $url                   Target to fetch.
-         *    @param SimpleEncoding $parameters       GET/POST parameters.
-         *    @return string                          Raw content of page.
-         *    @access private
-         */
-        function _load($url, $parameters) {
-            $frame = $url->getTarget();
-            if (! $frame || ! $this->_page->hasFrames() || (strtolower($frame) == '_top')) {
-                return $this->_loadPage($url, $parameters);
-            }
-            return $this->_loadFrame(array($frame), $url, $parameters);
-        }
-
-        /**
-         *    Fetches a page and makes it the current page/frame.
-         *    @param string/SimpleUrl $url            Target to fetch as string.
-         *    @param SimplePostEncoding $parameters   POST parameters.
-         *    @return string                          Raw content of page.
-         *    @access private
-         */
-        function _loadPage($url, $parameters) {
-            $this->_page = $this->_fetch($url, $parameters);
-            $this->_history->recordEntry(
-                    $this->_page->getUrl(),
-                    $this->_page->getRequestData());
-            return $this->_page->getRaw();
-        }
-
-        /**
-         *    Fetches a frame into the existing frameset replacing the
-         *    original.
-         *    @param array $frames                    List of names to drill down.
-         *    @param string/SimpleUrl $url            Target to fetch as string.
-         *    @param SimpleFormEncoding $parameters   POST parameters.
-         *    @return string                          Raw content of page.
-         *    @access private
-         */
-        function _loadFrame($frames, $url, $parameters) {
-            $page = $this->_fetch($url, $parameters);
-            $this->_page->setFrame($frames, $page);
-        }
-
-        /**
-         *    Removes expired and temporary cookies as if
-         *    the browser was closed and re-opened.
-         *    @param string/integer $date   Time when session restarted.
-         *                                  If omitted then all persistent
-         *                                  cookies are kept.
-         *    @access public
-         */
-        function restart($date = false) {
-            $this->_user_agent->restart($date);
-        }
-
-        /**
-         *    Adds a header to every fetch.
-         *    @param string $header       Header line to add to every
-         *                                request until cleared.
-         *    @access public
-         */
-        function addHeader($header) {
-            $this->_user_agent->addHeader($header);
-        }
-
-        /**
-         *    Ages the cookies by the specified time.
-         *    @param integer $interval    Amount in seconds.
-         *    @access public
-         */
-        function ageCookies($interval) {
-            $this->_user_agent->ageCookies($interval);
-        }
-
-        /**
-         *    Sets an additional cookie. If a cookie has
-         *    the same name and path it is replaced.
-         *    @param string $name       Cookie key.
-         *    @param string $value      Value of cookie.
-         *    @param string $host       Host upon which the cookie is valid.
-         *    @param string $path       Cookie path if not host wide.
-         *    @param string $expiry     Expiry date.
-         *    @access public
-         */
-        function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-            $this->_user_agent->setCookie($name, $value, $host, $path, $expiry);
-        }
-
-        /**
-         *    Reads the most specific cookie value from the
-         *    browser cookies.
-         *    @param string $host        Host to search.
-         *    @param string $path        Applicable path.
-         *    @param string $name        Name of cookie to read.
-         *    @return string             False if not present, else the
-         *                               value as a string.
-         *    @access public
-         */
-        function getCookieValue($host, $path, $name) {
-            return $this->_user_agent->getCookieValue($host, $path, $name);
-        }
-
-        /**
-         *    Reads the current cookies for the current URL.
-         *    @param string $name   Key of cookie to find.
-         *    @return string        Null if there is no current URL, false
-         *                          if the cookie is not set.
-         *    @access public
-         */
-        function getCurrentCookieValue($name) {
-            return $this->_user_agent->getBaseCookieValue($name, $this->_page->getUrl());
-        }
-
-        /**
-         *    Sets the maximum number of redirects before
-         *    a page will be loaded anyway.
-         *    @param integer $max        Most hops allowed.
-         *    @access public
-         */
-        function setMaximumRedirects($max) {
-            $this->_user_agent->setMaximumRedirects($max);
-        }
-
-        /**
-         *    Sets the maximum number of nesting of framed pages
-         *    within a framed page to prevent loops.
-         *    @param integer $max        Highest depth allowed.
-         *    @access public
-         */
-        function setMaximumNestedFrames($max) {
-            $this->_maximum_nested_frames = $max;
-        }
-
-        /**
-         *    Sets the socket timeout for opening a connection.
-         *    @param integer $timeout      Maximum time in seconds.
-         *    @access public
-         */
-        function setConnectionTimeout($timeout) {
-            $this->_user_agent->setConnectionTimeout($timeout);
-        }
-
-        /**
-         *    Sets proxy to use on all requests for when
-         *    testing from behind a firewall. Set URL
-         *    to false to disable.
-         *    @param string $proxy        Proxy URL.
-         *    @param string $username     Proxy username for authentication.
-         *    @param string $password     Proxy password for authentication.
-         *    @access public
-         */
-        function useProxy($proxy, $username = false, $password = false) {
-            $this->_user_agent->useProxy($proxy, $username, $password);
-        }
-
-        /**
-         *    Fetches the page content with a HEAD request.
-         *    Will affect cookies, but will not change the base URL.
-         *    @param string/SimpleUrl $url                Target to fetch as string.
-         *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
-         *                                                HEAD request.
-         *    @return boolean                             True if successful.
-         *    @access public
-         */
-        function head($url, $parameters = false) {
-            if (! is_object($url)) {
-                $url = new SimpleUrl($url);
-            }
-            if ($this->getUrl()) {
-                $url = $url->makeAbsolute($this->getUrl());
-            }
-            $response = $this->_user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
-            return ! $response->isError();
-        }
-
-        /**
-         *    Fetches the page content with a simple GET request.
-         *    @param string/SimpleUrl $url                Target to fetch.
-         *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
-         *                                                GET request.
-         *    @return string                              Content of page or false.
-         *    @access public
-         */
-        function get($url, $parameters = false) {
-            if (! is_object($url)) {
-                $url = new SimpleUrl($url);
-            }
-            if ($this->getUrl()) {
-                $url = $url->makeAbsolute($this->getUrl());
-            }
-            return $this->_load($url, new SimpleGetEncoding($parameters));
-        }
-
-        /**
-         *    Fetches the page content with a POST request.
-         *    @param string/SimpleUrl $url                Target to fetch as string.
-         *    @param hash/SimpleFormEncoding $parameters  POST parameters.
-         *    @return string                              Content of page.
-         *    @access public
-         */
-        function post($url, $parameters = false) {
-            if (! is_object($url)) {
-                $url = new SimpleUrl($url);
-            }
-            if ($this->getUrl()) {
-                $url = $url->makeAbsolute($this->getUrl());
-            }
-            return $this->_load($url, new SimplePostEncoding($parameters));
-        }
-
-        /**
-         *    Equivalent to hitting the retry button on the
-         *    browser. Will attempt to repeat the page fetch. If
-         *    there is no history to repeat it will give false.
-         *    @return string/boolean   Content if fetch succeeded
-         *                             else false.
-         *    @access public
-         */
-        function retry() {
-            $frames = $this->_page->getFrameFocus();
-            if (count($frames) > 0) {
-                $this->_loadFrame(
-                        $frames,
-                        $this->_page->getUrl(),
-                        $this->_page->getRequestData());
-                return $this->_page->getRaw();
-            }
-            if ($url = $this->_history->getUrl()) {
-                $this->_page = $this->_fetch($url, $this->_history->getParameters());
-                return $this->_page->getRaw();
-            }
-            return false;
-        }
-
-        /**
-         *    Equivalent to hitting the back button on the
-         *    browser. The browser history is unchanged on
-         *    failure. The page content is refetched as there
-         *    is no concept of content caching in SimpleTest.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded
-         *    @access public
-         */
-        function back() {
-            if (! $this->_history->back()) {
-                return false;
-            }
-            $content = $this->retry();
-            if (! $content) {
-                $this->_history->forward();
-            }
-            return $content;
-        }
-
-        /**
-         *    Equivalent to hitting the forward button on the
-         *    browser. The browser history is unchanged on
-         *    failure. The page content is refetched as there
-         *    is no concept of content caching in SimpleTest.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded
-         *    @access public
-         */
-        function forward() {
-            if (! $this->_history->forward()) {
-                return false;
-            }
-            $content = $this->retry();
-            if (! $content) {
-                $this->_history->back();
-            }
-            return $content;
-        }
-
-        /**
-         *    Retries a request after setting the authentication
-         *    for the current realm.
-         *    @param string $username    Username for realm.
-         *    @param string $password    Password for realm.
-         *    @return boolean            True if successful fetch. Note
-         *                               that authentication may still have
-         *                               failed.
-         *    @access public
-         */
-        function authenticate($username, $password) {
-            if (! $this->_page->getRealm()) {
-                return false;
-            }
-            $url = $this->_page->getUrl();
-            if (! $url) {
-                return false;
-            }
-            $this->_user_agent->setIdentity(
-                    $url->getHost(),
-                    $this->_page->getRealm(),
-                    $username,
-                    $password);
-            return $this->retry();
-        }
-
-        /**
-         *    Accessor for a breakdown of the frameset.
-         *    @return array   Hash tree of frames by name
-         *                    or index if no name.
-         *    @access public
-         */
-        function getFrames() {
-            return $this->_page->getFrames();
-        }
-
-        /**
-         *    Accessor for current frame focus. Will be
-         *    false if no frame has focus.
-         *    @return integer/string/boolean    Label if any, otherwise
-         *                                      the position in the frameset
-         *                                      or false if none.
-         *    @access public
-         */
-        function getFrameFocus() {
-            return $this->_page->getFrameFocus();
-        }
-
-        /**
-         *    Sets the focus by index. The integer index starts from 1.
-         *    @param integer $choice    Chosen frame.
-         *    @return boolean           True if frame exists.
-         *    @access public
-         */
-        function setFrameFocusByIndex($choice) {
-            return $this->_page->setFrameFocusByIndex($choice);
-        }
-
-        /**
-         *    Sets the focus by name.
-         *    @param string $name    Chosen frame.
-         *    @return boolean        True if frame exists.
-         *    @access public
-         */
-        function setFrameFocus($name) {
-            return $this->_page->setFrameFocus($name);
-        }
-
-        /**
-         *    Clears the frame focus. All frames will be searched
-         *    for content.
-         *    @access public
-         */
-        function clearFrameFocus() {
-            return $this->_page->clearFrameFocus();
-        }
-
-        /**
-         *    Accessor for last error.
-         *    @return string        Error from last response.
-         *    @access public
-         */
-        function getTransportError() {
-            return $this->_page->getTransportError();
-        }
-
-        /**
-         *    Accessor for current MIME type.
-         *    @return string    MIME type as string; e.g. 'text/html'
-         *    @access public
-         */
-        function getMimeType() {
-            return $this->_page->getMimeType();
-        }
-
-        /**
-         *    Accessor for last response code.
-         *    @return integer    Last HTTP response code received.
-         *    @access public
-         */
-        function getResponseCode() {
-            return $this->_page->getResponseCode();
-        }
-
-        /**
-         *    Accessor for last Authentication type. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Description of challenge type.
-         *    @access public
-         */
-        function getAuthentication() {
-            return $this->_page->getAuthentication();
-        }
-
-        /**
-         *    Accessor for last Authentication realm. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Name of security realm.
-         *    @access public
-         */
-        function getRealm() {
-            return $this->_page->getRealm();
-        }
-
-        /**
-         *    Accessor for current URL of page or frame if
-         *    focused.
-         *    @return string    Location of current page or frame as
-         *                      a string.
-         */
-        function getUrl() {
-            $url = $this->_page->getUrl();
-            return $url ? $url->asString() : false;
-        }
-
-        /**
-         *    Accessor for raw bytes sent down the wire.
-         *    @return string      Original text sent.
-         *    @access public
-         */
-        function getRequest() {
-            return $this->_page->getRequest();
-        }
-
-        /**
-         *    Accessor for raw header information.
-         *    @return string      Header block.
-         *    @access public
-         */
-        function getHeaders() {
-            return $this->_page->getHeaders();
-        }
-
-        /**
-         *    Accessor for raw page information.
-         *    @return string      Original text content of web page.
-         *    @access public
-         */
-        function getContent() {
-            return $this->_page->getRaw();
-        }
-
-        /**
-         *    Accessor for plain text version of the page.
-         *    @return string      Normalised text representation.
-         *    @access public
-         */
-        function getContentAsText() {
-            return $this->_page->getText();
-        }
-
-        /**
-         *    Accessor for parsed title.
-         *    @return string     Title or false if no title is present.
-         *    @access public
-         */
-        function getTitle() {
-            return $this->_page->getTitle();
-        }
-
-        /**
-         *    Accessor for a list of all fixed links in current page.
-         *    @return array   List of urls with scheme of
-         *                    http or https and hostname.
-         *    @access public
-         */
-        function getAbsoluteUrls() {
-            return $this->_page->getAbsoluteUrls();
-        }
-
-        /**
-         *    Accessor for a list of all relative links.
-         *    @return array      List of urls without hostname.
-         *    @access public
-         */
-        function getRelativeUrls() {
-            return $this->_page->getRelativeUrls();
-        }
-
-        /**
-         *    Sets all form fields with that name.
-         *    @param string $label   Name or label of field in forms.
-         *    @param string $value   New value of field.
-         *    @return boolean        True if field exists, otherwise false.
-         *    @access public
-         */
-        function setField($label, $value) {
-            return $this->_page->setField(new SimpleByLabelOrName($label), $value);
-        }
-
-        /**
-         *    Sets all form fields with that name. Will use label if
-         *    one is available (not yet implemented).
-         *    @param string $name    Name of field in forms.
-         *    @param string $value   New value of field.
-         *    @return boolean        True if field exists, otherwise false.
-         *    @access public
-         */
-        function setFieldByName($name, $value) {
-            return $this->_page->setField(new SimpleByName($name), $value);
-        }
-
-        /**
-         *    Sets all form fields with that id attribute.
-         *    @param string/integer $id   Id of field in forms.
-         *    @param string $value        New value of field.
-         *    @return boolean             True if field exists, otherwise false.
-         *    @access public
-         */
-        function setFieldById($id, $value) {
-            return $this->_page->setField(new SimpleById($id), $value);
-        }
-
-        /**
-         *    Accessor for a form element value within the page.
-         *    Finds the first match.
-         *    @param string $label       Field label.
-         *    @return string/boolean     A value if the field is
-         *                               present, false if unchecked
-         *                               and null if missing.
-         *    @access public
-         */
-        function getField($label) {
-            return $this->_page->getField(new SimpleByLabelOrName($label));
-        }
-
-        /**
-         *    Accessor for a form element value within the page.
-         *    Finds the first match.
-         *    @param string $name        Field name.
-         *    @return string/boolean     A string if the field is
-         *                               present, false if unchecked
-         *                               and null if missing.
-         *    @access public
-         */
-        function getFieldByName($name) {
-            return $this->_page->getField(new SimpleByName($name));
-        }
-
-        /**
-         *    Accessor for a form element value within the page.
-         *    @param string/integer $id  Id of field in forms.
-         *    @return string/boolean     A string if the field is
-         *                               present, false if unchecked
-         *                               and null if missing.
-         *    @access public
-         */
-        function getFieldById($id) {
-            return $this->_page->getField(new SimpleById($id));
-        }
-
-        /**
-         *    Clicks the submit button by label. The owning
-         *    form will be submitted by this.
-         *    @param string $label    Button label. An unlabeled
-         *                            button can be triggered by 'Submit'.
-         *    @param hash $additional Additional form data.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function clickSubmit($label = 'Submit', $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitButton(new SimpleByLabel($label), $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Clicks the submit button by name attribute. The owning
-         *    form will be submitted by this.
-         *    @param string $name     Button name.
-         *    @param hash $additional Additional form data.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function clickSubmitByName($name, $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleByName($name)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitButton(new SimpleByName($name), $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Clicks the submit button by ID attribute of the button
-         *    itself. The owning form will be submitted by this.
-         *    @param string $id       Button ID.
-         *    @param hash $additional Additional form data.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function clickSubmitById($id, $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleById($id)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitButton(new SimpleById($id), $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Clicks the submit image by some kind of label. Usually
-         *    the alt tag or the nearest equivalent. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param string $label    ID attribute of button.
-         *    @param integer $x       X-coordinate of imaginary click.
-         *    @param integer $y       Y-coordinate of imaginary click.
-         *    @param hash $additional Additional form data.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function clickImage($label, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleByLabel($label)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Clicks the submit image by the name. Usually
-         *    the alt tag or the nearest equivalent. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param string $name     Name attribute of button.
-         *    @param integer $x       X-coordinate of imaginary click.
-         *    @param integer $y       Y-coordinate of imaginary click.
-         *    @param hash $additional Additional form data.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleByName($name)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitImage(new SimpleByName($name), $x, $y, $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Clicks the submit image by ID attribute. The owning
-         *    form will be submitted by this. Clicking outside of
-         *    the boundary of the coordinates will result in
-         *    a failure.
-         *    @param integer/string $id    ID attribute of button.
-         *    @param integer $x            X-coordinate of imaginary click.
-         *    @param integer $y            Y-coordinate of imaginary click.
-         *    @param hash $additional      Additional form data.
-         *    @return string/boolean       Page on success.
-         *    @access public
-         */
-        function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleById($id)))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submitImage(new SimpleById($id), $x, $y, $additional));
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Submits a form by the ID.
-         *    @param string $id       The form ID. No submit button value
-         *                            will be sent.
-         *    @return string/boolean  Page on success.
-         *    @access public
-         */
-        function submitFormById($id) {
-            if (! ($form = $this->_page->getFormById($id))) {
-                return false;
-            }
-            $success = $this->_load(
-                    $form->getAction(),
-                    $form->submit());
-            return ($success ? $this->getContent() : $success);
-        }
-
-        /**
-         *    Follows a link by label. Will click the first link
-         *    found with this link text by default, or a later
-         *    one if an index is given. The match ignores case and
-         *    white space issues.
-         *    @param string $label     Text between the anchor tags.
-         *    @param integer $index    Link position counting from zero.
-         *    @return string/boolean   Page on success.
-         *    @access public
-         */
-        function clickLink($label, $index = 0) {
-            $urls = $this->_page->getUrlsByLabel($label);
-            if (count($urls) == 0) {
-                return false;
-            }
-            if (count($urls) < $index + 1) {
-                return false;
-            }
-            $this->_load($urls[$index], new SimpleGetEncoding());
-            return $this->getContent();
-        }
-
-        /**
-         *    Tests to see if a link is present by label.
-         *    @param string $label     Text of value attribute.
-         *    @return boolean          True if link present.
-         *    @access public
-         */
-        function isLink($label) {
-            return (count($this->_page->getUrlsByLabel($label)) > 0);
-        }
-
-        /**
-         *    Follows a link by id attribute.
-         *    @param string $id        ID attribute value.
-         *    @return string/boolean   Page on success.
-         *    @access public
-         */
-        function clickLinkById($id) {
-            if (! ($url = $this->_page->getUrlById($id))) {
-                return false;
-            }
-            $this->_load($url, new SimpleGetEncoding());
-            return $this->getContent();
-        }
-
-        /**
-         *    Tests to see if a link is present by ID attribute.
-         *    @param string $id     Text of id attribute.
-         *    @return boolean       True if link present.
-         *    @access public
-         */
-        function isLinkById($id) {
-            return (boolean)$this->_page->getUrlById($id);
-        }
-
-        /**
-         *    Clicks a visible text item. Will first try buttons,
-         *    then links and then images.
-         *    @param string $label        Visible text or alt text.
-         *    @return string/boolean      Raw page or false.
-         *    @access public
-         */
-        function click($label) {
-            $raw = $this->clickSubmit($label);
-            if (! $raw) {
-                $raw = $this->clickLink($label);
-            }
-            if (! $raw) {
-                $raw = $this->clickImage($label);
-            }
-            return $raw;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleBrowser {
+		protected $_user_agent;
+		protected $_page;
+		protected $_history;
+		protected $_ignore_frames;
+		protected $_maximum_nested_frames;
+
+		/**
+		 *    Starts with a fresh browser with no
+		 *    cookie or any other state information. The
+		 *    exception is that a default proxy will be
+		 *    set up if specified in the options.
+		 *    @access public
+		 */
+		function SimpleBrowser() {
+			$this->_user_agent = $this->_createUserAgent();
+			$this->_user_agent->useProxy(
+					SimpleTest::getDefaultProxy(),
+					SimpleTest::getDefaultProxyUsername(),
+					SimpleTest::getDefaultProxyPassword());
+			$this->_page = new SimplePage();
+			$this->_history = $this->_createHistory();
+			$this->_ignore_frames = false;
+			$this->_maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
+		}
+
+		/**
+		 *    Creates the underlying user agent.
+		 *    @return SimpleFetcher    Content fetcher.
+		 *    @access protected
+		 */
+		function &_createUserAgent() {
+			$user_agent = new SimpleUserAgent();
+			return $user_agent;
+		}
+
+		/**
+		 *    Creates a new empty history list.
+		 *    @return SimpleBrowserHistory    New list.
+		 *    @access protected
+		 */
+		function &_createHistory() {
+			$history = new SimpleBrowserHistory();
+			return $history;
+		}
+
+		/**
+		 *    Disables frames support. Frames will not be fetched
+		 *    and the frameset page will be used instead.
+		 *    @access public
+		 */
+		function ignoreFrames() {
+			$this->_ignore_frames = true;
+		}
+
+		/**
+		 *    Enables frames support. Frames will be fetched from
+		 *    now on.
+		 *    @access public
+		 */
+		function useFrames() {
+			$this->_ignore_frames = false;
+		}
+
+		/**
+		 *    Switches off cookie sending and recieving.
+		 *    @access public
+		 */
+		function ignoreCookies() {
+			$this->_user_agent->ignoreCookies();
+		}
+
+		/**
+		 *    Switches back on the cookie sending and recieving.
+		 *    @access public
+		 */
+		function useCookies() {
+			$this->_user_agent->useCookies();
+		}
+
+		/**
+		 *    Parses the raw content into a page. Will load further
+		 *    frame pages unless frames are disabled.
+		 *    @param SimpleHttpResponse $response    Response from fetch.
+		 *    @param integer $depth                  Nested frameset depth.
+		 *    @return SimplePage                     Parsed HTML.
+		 *    @access private
+		 */
+		function &_parse($response, $depth = 0) {
+			$page = $this->_buildPage($response);
+			if ($this->_ignore_frames || ! $page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
+				return $page;
+			}
+			$frameset = new SimpleFrameset($page);
+			foreach ($page->getFrameset() as $key => $url) {
+				$frame = $this->_fetch($url, new SimpleGetEncoding(), $depth + 1);
+				$frameset->addFrame($frame, $key);
+			}
+			return $frameset;
+		}
+
+		/**
+		 *    Assembles the parsing machinery and actually parses
+		 *    a single page. Frees all of the builder memory and so
+		 *    unjams the PHP memory management.
+		 *    @param SimpleHttpResponse $response    Response from fetch.
+		 *    @return SimplePage                     Parsed top level page.
+		 *    @access protected
+		 */
+		function &_buildPage($response) {
+			$builder = new SimplePageBuilder();
+			$page = $builder->parse($response);
+			$builder->free();
+			unset($builder);
+			return $page;
+		}
+
+		/**
+		 *    Fetches a page. Jointly recursive with the _parse()
+		 *    method as it descends a frameset.
+		 *    @param string/SimpleUrl $url          Target to fetch.
+		 *    @param SimpleEncoding $encoding       GET/POST parameters.
+		 *    @param integer $depth                 Nested frameset depth protection.
+		 *    @return SimplePage                    Parsed page.
+		 *    @access private
+		 */
+		function &_fetch($url, $encoding, $depth = 0) {
+			$response = $this->_user_agent->fetchResponse($url, $encoding);
+			if ($response->isError()) {
+				$page = new SimplePage($response);
+			} else {
+				$page = $this->_parse($response, $depth);
+			}
+			return $page;
+		}
+
+		/**
+		 *    Fetches a page or a single frame if that is the current
+		 *    focus.
+		 *    @param SimpleUrl $url                   Target to fetch.
+		 *    @param SimpleEncoding $parameters       GET/POST parameters.
+		 *    @return string                          Raw content of page.
+		 *    @access private
+		 */
+		function _load($url, $parameters) {
+			$frame = $url->getTarget();
+			if (! $frame || ! $this->_page->hasFrames() || (strtolower($frame) == '_top')) {
+				return $this->_loadPage($url, $parameters);
+			}
+			return $this->_loadFrame(array($frame), $url, $parameters);
+		}
+
+		/**
+		 *    Fetches a page and makes it the current page/frame.
+		 *    @param string/SimpleUrl $url            Target to fetch as string.
+		 *    @param SimplePostEncoding $parameters   POST parameters.
+		 *    @return string                          Raw content of page.
+		 *    @access private
+		 */
+		function _loadPage($url, $parameters) {
+			$this->_page = $this->_fetch($url, $parameters);
+			$this->_history->recordEntry(
+					$this->_page->getUrl(),
+					$this->_page->getRequestData());
+			return $this->_page->getRaw();
+		}
+
+		/**
+		 *    Fetches a frame into the existing frameset replacing the
+		 *    original.
+		 *    @param array $frames                    List of names to drill down.
+		 *    @param string/SimpleUrl $url            Target to fetch as string.
+		 *    @param SimpleFormEncoding $parameters   POST parameters.
+		 *    @return string                          Raw content of page.
+		 *    @access private
+		 */
+		function _loadFrame($frames, $url, $parameters) {
+			$page = $this->_fetch($url, $parameters);
+			$this->_page->setFrame($frames, $page);
+		}
+
+		/**
+		 *    Removes expired and temporary cookies as if
+		 *    the browser was closed and re-opened.
+		 *    @param string/integer $date   Time when session restarted.
+		 *                                  If omitted then all persistent
+		 *                                  cookies are kept.
+		 *    @access public
+		 */
+		function restart($date = false) {
+			$this->_user_agent->restart($date);
+		}
+
+		/**
+		 *    Adds a header to every fetch.
+		 *    @param string $header       Header line to add to every
+		 *                                request until cleared.
+		 *    @access public
+		 */
+		function addHeader($header) {
+			$this->_user_agent->addHeader($header);
+		}
+
+		/**
+		 *    Ages the cookies by the specified time.
+		 *    @param integer $interval    Amount in seconds.
+		 *    @access public
+		 */
+		function ageCookies($interval) {
+			$this->_user_agent->ageCookies($interval);
+		}
+
+		/**
+		 *    Sets an additional cookie. If a cookie has
+		 *    the same name and path it is replaced.
+		 *    @param string $name       Cookie key.
+		 *    @param string $value      Value of cookie.
+		 *    @param string $host       Host upon which the cookie is valid.
+		 *    @param string $path       Cookie path if not host wide.
+		 *    @param string $expiry     Expiry date.
+		 *    @access public
+		 */
+		function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+			$this->_user_agent->setCookie($name, $value, $host, $path, $expiry);
+		}
+
+		/**
+		 *    Reads the most specific cookie value from the
+		 *    browser cookies.
+		 *    @param string $host        Host to search.
+		 *    @param string $path        Applicable path.
+		 *    @param string $name        Name of cookie to read.
+		 *    @return string             False if not present, else the
+		 *                               value as a string.
+		 *    @access public
+		 */
+		function getCookieValue($host, $path, $name) {
+			return $this->_user_agent->getCookieValue($host, $path, $name);
+		}
+
+		/**
+		 *    Reads the current cookies for the current URL.
+		 *    @param string $name   Key of cookie to find.
+		 *    @return string        Null if there is no current URL, false
+		 *                          if the cookie is not set.
+		 *    @access public
+		 */
+		function getCurrentCookieValue($name) {
+			return $this->_user_agent->getBaseCookieValue($name, $this->_page->getUrl());
+		}
+
+		/**
+		 *    Sets the maximum number of redirects before
+		 *    a page will be loaded anyway.
+		 *    @param integer $max        Most hops allowed.
+		 *    @access public
+		 */
+		function setMaximumRedirects($max) {
+			$this->_user_agent->setMaximumRedirects($max);
+		}
+
+		/**
+		 *    Sets the maximum number of nesting of framed pages
+		 *    within a framed page to prevent loops.
+		 *    @param integer $max        Highest depth allowed.
+		 *    @access public
+		 */
+		function setMaximumNestedFrames($max) {
+			$this->_maximum_nested_frames = $max;
+		}
+
+		/**
+		 *    Sets the socket timeout for opening a connection.
+		 *    @param integer $timeout      Maximum time in seconds.
+		 *    @access public
+		 */
+		function setConnectionTimeout($timeout) {
+			$this->_user_agent->setConnectionTimeout($timeout);
+		}
+
+		/**
+		 *    Sets proxy to use on all requests for when
+		 *    testing from behind a firewall. Set URL
+		 *    to false to disable.
+		 *    @param string $proxy        Proxy URL.
+		 *    @param string $username     Proxy username for authentication.
+		 *    @param string $password     Proxy password for authentication.
+		 *    @access public
+		 */
+		function useProxy($proxy, $username = false, $password = false) {
+			$this->_user_agent->useProxy($proxy, $username, $password);
+		}
+
+		/**
+		 *    Fetches the page content with a HEAD request.
+		 *    Will affect cookies, but will not change the base URL.
+		 *    @param string/SimpleUrl $url                Target to fetch as string.
+		 *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
+		 *                                                HEAD request.
+		 *    @return boolean                             True if successful.
+		 *    @access public
+		 */
+		function head($url, $parameters = false) {
+			if (! is_object($url)) {
+				$url = new SimpleUrl($url);
+			}
+			if ($this->getUrl()) {
+				$url = $url->makeAbsolute($this->getUrl());
+			}
+			$response = $this->_user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
+			return ! $response->isError();
+		}
+
+		/**
+		 *    Fetches the page content with a simple GET request.
+		 *    @param string/SimpleUrl $url                Target to fetch.
+		 *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+		 *                                                GET request.
+		 *    @return string                              Content of page or false.
+		 *    @access public
+		 */
+		function get($url, $parameters = false) {
+			if (! is_object($url)) {
+				$url = new SimpleUrl($url);
+			}
+			if ($this->getUrl()) {
+				$url = $url->makeAbsolute($this->getUrl());
+			}
+			return $this->_load($url, new SimpleGetEncoding($parameters));
+		}
+
+		/**
+		 *    Fetches the page content with a POST request.
+		 *    @param string/SimpleUrl $url                Target to fetch as string.
+		 *    @param hash/SimpleFormEncoding $parameters  POST parameters.
+		 *    @return string                              Content of page.
+		 *    @access public
+		 */
+		function post($url, $parameters = false) {
+			if (! is_object($url)) {
+				$url = new SimpleUrl($url);
+			}
+			if ($this->getUrl()) {
+				$url = $url->makeAbsolute($this->getUrl());
+			}
+			return $this->_load($url, new SimplePostEncoding($parameters));
+		}
+
+		/**
+		 *    Equivalent to hitting the retry button on the
+		 *    browser. Will attempt to repeat the page fetch. If
+		 *    there is no history to repeat it will give false.
+		 *    @return string/boolean   Content if fetch succeeded
+		 *                             else false.
+		 *    @access public
+		 */
+		function retry() {
+			$frames = $this->_page->getFrameFocus();
+			if (count($frames) > 0) {
+				$this->_loadFrame(
+						$frames,
+						$this->_page->getUrl(),
+						$this->_page->getRequestData());
+				return $this->_page->getRaw();
+			}
+			if ($url = $this->_history->getUrl()) {
+				$this->_page = $this->_fetch($url, $this->_history->getParameters());
+				return $this->_page->getRaw();
+			}
+			return false;
+		}
+
+		/**
+		 *    Equivalent to hitting the back button on the
+		 *    browser. The browser history is unchanged on
+		 *    failure. The page content is refetched as there
+		 *    is no concept of content caching in SimpleTest.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded
+		 *    @access public
+		 */
+		function back() {
+			if (! $this->_history->back()) {
+				return false;
+			}
+			$content = $this->retry();
+			if (! $content) {
+				$this->_history->forward();
+			}
+			return $content;
+		}
+
+		/**
+		 *    Equivalent to hitting the forward button on the
+		 *    browser. The browser history is unchanged on
+		 *    failure. The page content is refetched as there
+		 *    is no concept of content caching in SimpleTest.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded
+		 *    @access public
+		 */
+		function forward() {
+			if (! $this->_history->forward()) {
+				return false;
+			}
+			$content = $this->retry();
+			if (! $content) {
+				$this->_history->back();
+			}
+			return $content;
+		}
+
+		/**
+		 *    Retries a request after setting the authentication
+		 *    for the current realm.
+		 *    @param string $username    Username for realm.
+		 *    @param string $password    Password for realm.
+		 *    @return boolean            True if successful fetch. Note
+		 *                               that authentication may still have
+		 *                               failed.
+		 *    @access public
+		 */
+		function authenticate($username, $password) {
+			if (! $this->_page->getRealm()) {
+				return false;
+			}
+			$url = $this->_page->getUrl();
+			if (! $url) {
+				return false;
+			}
+			$this->_user_agent->setIdentity(
+					$url->getHost(),
+					$this->_page->getRealm(),
+					$username,
+					$password);
+			return $this->retry();
+		}
+
+		/**
+		 *    Accessor for a breakdown of the frameset.
+		 *    @return array   Hash tree of frames by name
+		 *                    or index if no name.
+		 *    @access public
+		 */
+		function getFrames() {
+			return $this->_page->getFrames();
+		}
+
+		/**
+		 *    Accessor for current frame focus. Will be
+		 *    false if no frame has focus.
+		 *    @return integer/string/boolean    Label if any, otherwise
+		 *                                      the position in the frameset
+		 *                                      or false if none.
+		 *    @access public
+		 */
+		function getFrameFocus() {
+			return $this->_page->getFrameFocus();
+		}
+
+		/**
+		 *    Sets the focus by index. The integer index starts from 1.
+		 *    @param integer $choice    Chosen frame.
+		 *    @return boolean           True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocusByIndex($choice) {
+			return $this->_page->setFrameFocusByIndex($choice);
+		}
+
+		/**
+		 *    Sets the focus by name.
+		 *    @param string $name    Chosen frame.
+		 *    @return boolean        True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocus($name) {
+			return $this->_page->setFrameFocus($name);
+		}
+
+		/**
+		 *    Clears the frame focus. All frames will be searched
+		 *    for content.
+		 *    @access public
+		 */
+		function clearFrameFocus() {
+			return $this->_page->clearFrameFocus();
+		}
+
+		/**
+		 *    Accessor for last error.
+		 *    @return string        Error from last response.
+		 *    @access public
+		 */
+		function getTransportError() {
+			return $this->_page->getTransportError();
+		}
+
+		/**
+		 *    Accessor for current MIME type.
+		 *    @return string    MIME type as string; e.g. 'text/html'
+		 *    @access public
+		 */
+		function getMimeType() {
+			return $this->_page->getMimeType();
+		}
+
+		/**
+		 *    Accessor for last response code.
+		 *    @return integer    Last HTTP response code received.
+		 *    @access public
+		 */
+		function getResponseCode() {
+			return $this->_page->getResponseCode();
+		}
+
+		/**
+		 *    Accessor for last Authentication type. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Description of challenge type.
+		 *    @access public
+		 */
+		function getAuthentication() {
+			return $this->_page->getAuthentication();
+		}
+
+		/**
+		 *    Accessor for last Authentication realm. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Name of security realm.
+		 *    @access public
+		 */
+		function getRealm() {
+			return $this->_page->getRealm();
+		}
+
+		/**
+		 *    Accessor for current URL of page or frame if
+		 *    focused.
+		 *    @return string    Location of current page or frame as
+		 *                      a string.
+		 */
+		function getUrl() {
+			$url = $this->_page->getUrl();
+			return $url ? $url->asString() : false;
+		}
+
+		/**
+		 *    Accessor for raw bytes sent down the wire.
+		 *    @return string      Original text sent.
+		 *    @access public
+		 */
+		function getRequest() {
+			return $this->_page->getRequest();
+		}
+
+		/**
+		 *    Accessor for raw header information.
+		 *    @return string      Header block.
+		 *    @access public
+		 */
+		function getHeaders() {
+			return $this->_page->getHeaders();
+		}
+
+		/**
+		 *    Accessor for raw page information.
+		 *    @return string      Original text content of web page.
+		 *    @access public
+		 */
+		function getContent() {
+			return $this->_page->getRaw();
+		}
+
+		/**
+		 *    Accessor for plain text version of the page.
+		 *    @return string      Normalised text representation.
+		 *    @access public
+		 */
+		function getContentAsText() {
+			return $this->_page->getText();
+		}
+
+		/**
+		 *    Accessor for parsed title.
+		 *    @return string     Title or false if no title is present.
+		 *    @access public
+		 */
+		function getTitle() {
+			return $this->_page->getTitle();
+		}
+
+		/**
+		 *    Accessor for a list of all fixed links in current page.
+		 *    @return array   List of urls with scheme of
+		 *                    http or https and hostname.
+		 *    @access public
+		 */
+		function getAbsoluteUrls() {
+			return $this->_page->getAbsoluteUrls();
+		}
+
+		/**
+		 *    Accessor for a list of all relative links.
+		 *    @return array      List of urls without hostname.
+		 *    @access public
+		 */
+		function getRelativeUrls() {
+			return $this->_page->getRelativeUrls();
+		}
+
+		/**
+		 *    Sets all form fields with that name.
+		 *    @param string $label   Name or label of field in forms.
+		 *    @param string $value   New value of field.
+		 *    @return boolean        True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setField($label, $value) {
+			return $this->_page->setField(new SimpleByLabelOrName($label), $value);
+		}
+
+		/**
+		 *    Sets all form fields with that name. Will use label if
+		 *    one is available (not yet implemented).
+		 *    @param string $name    Name of field in forms.
+		 *    @param string $value   New value of field.
+		 *    @return boolean        True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setFieldByName($name, $value) {
+			return $this->_page->setField(new SimpleByName($name), $value);
+		}
+
+		/**
+		 *    Sets all form fields with that id attribute.
+		 *    @param string/integer $id   Id of field in forms.
+		 *    @param string $value        New value of field.
+		 *    @return boolean             True if field exists, otherwise false.
+		 *    @access public
+		 */
+		function setFieldById($id, $value) {
+			return $this->_page->setField(new SimpleById($id), $value);
+		}
+
+		/**
+		 *    Accessor for a form element value within the page.
+		 *    Finds the first match.
+		 *    @param string $label       Field label.
+		 *    @return string/boolean     A value if the field is
+		 *                               present, false if unchecked
+		 *                               and null if missing.
+		 *    @access public
+		 */
+		function getField($label) {
+			return $this->_page->getField(new SimpleByLabelOrName($label));
+		}
+
+		/**
+		 *    Accessor for a form element value within the page.
+		 *    Finds the first match.
+		 *    @param string $name        Field name.
+		 *    @return string/boolean     A string if the field is
+		 *                               present, false if unchecked
+		 *                               and null if missing.
+		 *    @access public
+		 */
+		function getFieldByName($name) {
+			return $this->_page->getField(new SimpleByName($name));
+		}
+
+		/**
+		 *    Accessor for a form element value within the page.
+		 *    @param string/integer $id  Id of field in forms.
+		 *    @return string/boolean     A string if the field is
+		 *                               present, false if unchecked
+		 *                               and null if missing.
+		 *    @access public
+		 */
+		function getFieldById($id) {
+			return $this->_page->getField(new SimpleById($id));
+		}
+
+		/**
+		 *    Clicks the submit button by label. The owning
+		 *    form will be submitted by this.
+		 *    @param string $label    Button label. An unlabeled
+		 *                            button can be triggered by 'Submit'.
+		 *    @param hash $additional Additional form data.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function clickSubmit($label = 'Submit', $additional = false) {
+			if (! ($form = $this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitButton(new SimpleByLabel($label), $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Clicks the submit button by name attribute. The owning
+		 *    form will be submitted by this.
+		 *    @param string $name     Button name.
+		 *    @param hash $additional Additional form data.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitByName($name, $additional = false) {
+			if (! ($form = $this->_page->getFormBySubmit(new SimpleByName($name)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitButton(new SimpleByName($name), $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Clicks the submit button by ID attribute of the button
+		 *    itself. The owning form will be submitted by this.
+		 *    @param string $id       Button ID.
+		 *    @param hash $additional Additional form data.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitById($id, $additional = false) {
+			if (! ($form = $this->_page->getFormBySubmit(new SimpleById($id)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitButton(new SimpleById($id), $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Clicks the submit image by some kind of label. Usually
+		 *    the alt tag or the nearest equivalent. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param string $label    ID attribute of button.
+		 *    @param integer $x       X-coordinate of imaginary click.
+		 *    @param integer $y       Y-coordinate of imaginary click.
+		 *    @param hash $additional Additional form data.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function clickImage($label, $x = 1, $y = 1, $additional = false) {
+			if (! ($form = $this->_page->getFormByImage(new SimpleByLabel($label)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Clicks the submit image by the name. Usually
+		 *    the alt tag or the nearest equivalent. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param string $name     Name attribute of button.
+		 *    @param integer $x       X-coordinate of imaginary click.
+		 *    @param integer $y       Y-coordinate of imaginary click.
+		 *    @param hash $additional Additional form data.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+			if (! ($form = $this->_page->getFormByImage(new SimpleByName($name)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitImage(new SimpleByName($name), $x, $y, $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Clicks the submit image by ID attribute. The owning
+		 *    form will be submitted by this. Clicking outside of
+		 *    the boundary of the coordinates will result in
+		 *    a failure.
+		 *    @param integer/string $id    ID attribute of button.
+		 *    @param integer $x            X-coordinate of imaginary click.
+		 *    @param integer $y            Y-coordinate of imaginary click.
+		 *    @param hash $additional      Additional form data.
+		 *    @return string/boolean       Page on success.
+		 *    @access public
+		 */
+		function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+			if (! ($form = $this->_page->getFormByImage(new SimpleById($id)))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submitImage(new SimpleById($id), $x, $y, $additional));
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Submits a form by the ID.
+		 *    @param string $id       The form ID. No submit button value
+		 *                            will be sent.
+		 *    @return string/boolean  Page on success.
+		 *    @access public
+		 */
+		function submitFormById($id) {
+			if (! ($form = $this->_page->getFormById($id))) {
+				return false;
+			}
+			$success = $this->_load(
+					$form->getAction(),
+					$form->submit());
+			return ($success ? $this->getContent() : $success);
+		}
+
+		/**
+		 *    Follows a link by label. Will click the first link
+		 *    found with this link text by default, or a later
+		 *    one if an index is given. The match ignores case and
+		 *    white space issues.
+		 *    @param string $label     Text between the anchor tags.
+		 *    @param integer $index    Link position counting from zero.
+		 *    @return string/boolean   Page on success.
+		 *    @access public
+		 */
+		function clickLink($label, $index = 0) {
+			$urls = $this->_page->getUrlsByLabel($label);
+			if (count($urls) == 0) {
+				return false;
+			}
+			if (count($urls) < $index + 1) {
+				return false;
+			}
+			$this->_load($urls[$index], new SimpleGetEncoding());
+			return $this->getContent();
+		}
+
+		/**
+		 *    Tests to see if a link is present by label.
+		 *    @param string $label     Text of value attribute.
+		 *    @return boolean          True if link present.
+		 *    @access public
+		 */
+		function isLink($label) {
+			return (count($this->_page->getUrlsByLabel($label)) > 0);
+		}
+
+		/**
+		 *    Follows a link by id attribute.
+		 *    @param string $id        ID attribute value.
+		 *    @return string/boolean   Page on success.
+		 *    @access public
+		 */
+		function clickLinkById($id) {
+			if (! ($url = $this->_page->getUrlById($id))) {
+				return false;
+			}
+			$this->_load($url, new SimpleGetEncoding());
+			return $this->getContent();
+		}
+
+		/**
+		 *    Tests to see if a link is present by ID attribute.
+		 *    @param string $id     Text of id attribute.
+		 *    @return boolean       True if link present.
+		 *    @access public
+		 */
+		function isLinkById($id) {
+			return (boolean)$this->_page->getUrlById($id);
+		}
+
+		/**
+		 *    Clicks a visible text item. Will first try buttons,
+		 *    then links and then images.
+		 *    @param string $label        Visible text or alt text.
+		 *    @return string/boolean      Raw page or false.
+		 *    @access public
+		 */
+		function click($label) {
+			$raw = $this->clickSubmit($label);
+			if (! $raw) {
+				$raw = $this->clickLink($label);
+			}
+			if (! $raw) {
+				$raw = $this->clickImage($label);
+			}
+			return $raw;
+		}
+	}
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -55,7 +55,7 @@ 
          *    @access private
          */
         function _atBeginning() {
-            return ($this->_position == 0) && ! $this->_isEmpty();
+            return ($this->_position == 0) && !$this->_isEmpty();
         }
 
         /**
@@ -64,7 +64,7 @@ 
          *    @access private
          */
         function _atEnd() {
-            return ($this->_position + 1 >= count($this->_sequence)) && ! $this->_isEmpty();
+            return ($this->_position + 1 >= count($this->_sequence)) && !$this->_isEmpty();
         }
 
         /**
@@ -144,7 +144,7 @@ 
             if ($this->_isEmpty()) {
                 return;
             }
-            while (! $this->_atEnd()) {
+            while (!$this->_atEnd()) {
                 array_pop($this->_sequence);
             }
         }
@@ -247,7 +247,7 @@ 
          */
         function &_parse($response, $depth = 0) {
             $page = $this->_buildPage($response);
-            if ($this->_ignore_frames || ! $page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
+            if ($this->_ignore_frames || !$page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
                 return $page;
             }
             $frameset = new SimpleFrameset($page);
@@ -303,7 +303,7 @@ 
          */
         function _load($url, $parameters) {
             $frame = $url->getTarget();
-            if (! $frame || ! $this->_page->hasFrames() || (strtolower($frame) == '_top')) {
+            if (!$frame || !$this->_page->hasFrames() || (strtolower($frame) == '_top')) {
                 return $this->_loadPage($url, $parameters);
             }
             return $this->_loadFrame(array($frame), $url, $parameters);
@@ -460,14 +460,14 @@ 
          *    @access public
          */
         function head($url, $parameters = false) {
-            if (! is_object($url)) {
+            if (!is_object($url)) {
                 $url = new SimpleUrl($url);
             }
             if ($this->getUrl()) {
                 $url = $url->makeAbsolute($this->getUrl());
             }
             $response = $this->_user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
-            return ! $response->isError();
+            return !$response->isError();
         }
 
         /**
@@ -479,7 +479,7 @@ 
          *    @access public
          */
         function get($url, $parameters = false) {
-            if (! is_object($url)) {
+            if (!is_object($url)) {
                 $url = new SimpleUrl($url);
             }
             if ($this->getUrl()) {
@@ -496,7 +496,7 @@ 
          *    @access public
          */
         function post($url, $parameters = false) {
-            if (! is_object($url)) {
+            if (!is_object($url)) {
                 $url = new SimpleUrl($url);
             }
             if ($this->getUrl()) {
@@ -539,11 +539,11 @@ 
          *    @access public
          */
         function back() {
-            if (! $this->_history->back()) {
+            if (!$this->_history->back()) {
                 return false;
             }
             $content = $this->retry();
-            if (! $content) {
+            if (!$content) {
                 $this->_history->forward();
             }
             return $content;
@@ -559,11 +559,11 @@ 
          *    @access public
          */
         function forward() {
-            if (! $this->_history->forward()) {
+            if (!$this->_history->forward()) {
                 return false;
             }
             $content = $this->retry();
-            if (! $content) {
+            if (!$content) {
                 $this->_history->back();
             }
             return $content;
@@ -580,11 +580,11 @@ 
          *    @access public
          */
         function authenticate($username, $password) {
-            if (! $this->_page->getRealm()) {
+            if (!$this->_page->getRealm()) {
                 return false;
             }
             $url = $this->_page->getUrl();
-            if (! $url) {
+            if (!$url) {
                 return false;
             }
             $this->_user_agent->setIdentity(
@@ -850,7 +850,7 @@ 
          *    @access public
          */
         function clickSubmit($label = 'Submit', $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
+            if (!($form = $this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
                 return false;
             }
             $success = $this->_load(
@@ -868,7 +868,7 @@ 
          *    @access public
          */
         function clickSubmitByName($name, $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleByName($name)))) {
+            if (!($form = $this->_page->getFormBySubmit(new SimpleByName($name)))) {
                 return false;
             }
             $success = $this->_load(
@@ -886,7 +886,7 @@ 
          *    @access public
          */
         function clickSubmitById($id, $additional = false) {
-            if (! ($form = $this->_page->getFormBySubmit(new SimpleById($id)))) {
+            if (!($form = $this->_page->getFormBySubmit(new SimpleById($id)))) {
                 return false;
             }
             $success = $this->_load(
@@ -909,7 +909,7 @@ 
          *    @access public
          */
         function clickImage($label, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleByLabel($label)))) {
+            if (!($form = $this->_page->getFormByImage(new SimpleByLabel($label)))) {
                 return false;
             }
             $success = $this->_load(
@@ -932,7 +932,7 @@ 
          *    @access public
          */
         function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleByName($name)))) {
+            if (!($form = $this->_page->getFormByImage(new SimpleByName($name)))) {
                 return false;
             }
             $success = $this->_load(
@@ -954,7 +954,7 @@ 
          *    @access public
          */
         function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-            if (! ($form = $this->_page->getFormByImage(new SimpleById($id)))) {
+            if (!($form = $this->_page->getFormByImage(new SimpleById($id)))) {
                 return false;
             }
             $success = $this->_load(
@@ -971,7 +971,7 @@ 
          *    @access public
          */
         function submitFormById($id) {
-            if (! ($form = $this->_page->getFormById($id))) {
+            if (!($form = $this->_page->getFormById($id))) {
                 return false;
             }
             $success = $this->_load(
@@ -1019,7 +1019,7 @@ 
          *    @access public
          */
         function clickLinkById($id) {
-            if (! ($url = $this->_page->getUrlById($id))) {
+            if (!($url = $this->_page->getUrlById($id))) {
                 return false;
             }
             $this->_load($url, new SimpleGetEncoding());
@@ -1033,7 +1033,7 @@ 
          *    @access public
          */
         function isLinkById($id) {
-            return (boolean)$this->_page->getUrlById($id);
+            return (boolean) $this->_page->getUrlById($id);
         }
 
         /**
@@ -1045,10 +1045,10 @@ 
          */
         function click($label) {
             $raw = $this->clickSubmit($label);
-            if (! $raw) {
+            if (!$raw) {
                 $raw = $this->clickLink($label);
             }
-            if (! $raw) {
+            if (!$raw) {
                 $raw = $this->clickImage($label);
             }
             return $raw;