pradosoft / prado

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;

tests/test_tools/simpletest/collector.php

Doc Comments -2 removed lines

@@ -63,7 +63,6 @@ 
      * {@link SimplePatternCollector::_handle()}.
      *
      * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $filename  A filename as generated by {@link collect()}
      * @see collect()
      * @access protected
      */
@@ -102,7 +101,6 @@ 
      *
      * @see SimpleCollector::_handle()
      * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
      * @access protected
      */
     function _handle($test, $filename) {

Indentation +82 added lines, -82 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * This file contains the following classes: {@link SimpleCollector},
- * {@link SimplePatternCollector}.
- *
- * @author Travis Swicegood <development@domain51.com>
- * @package SimpleTest
- * @subpackage UnitTester
- */
+	 * This file contains the following classes: {@link SimpleCollector},
+	 * {@link SimplePatternCollector}.
+	 *
+	 * @author Travis Swicegood <development@domain51.com>
+	 * @package SimpleTest
+	 * @subpackage UnitTester
+	 */
 
 /**
  * The basic collector for {@link GroupTest}
@@ -17,61 +17,61 @@ 
  */
 class SimpleCollector {
 
-    /**
-     * Strips off any kind of slash at the end so as to normalise the path
-     *
-     * @param string $path    Path to normalise.
-     */
-    function _removeTrailingSlash($path) {
-        return preg_replace('|[\\/]$|', '', $path);
+	/**
+	 * Strips off any kind of slash at the end so as to normalise the path
+	 *
+	 * @param string $path    Path to normalise.
+	 */
+	function _removeTrailingSlash($path) {
+		return preg_replace('|[\\/]$|', '', $path);
 
-       /**
-        * @internal
-        * Try benchmarking the following.  It's more code, but by not using the
-        * regex, it may be faster?  Also, shouldn't be looking for
-        * DIRECTORY_SEPERATOR instead of a manual "/"?
-        */
-        if (substr($path, -1) == DIRECTORY_SEPERATOR) {
-            return substr($path, 0, -1);
-        } else {
-            return $path;
-        }
-    }
+	   /**
+	    * @internal
+	    * Try benchmarking the following.  It's more code, but by not using the
+	    * regex, it may be faster?  Also, shouldn't be looking for
+	    * DIRECTORY_SEPERATOR instead of a manual "/"?
+	    */
+		if (substr($path, -1) == DIRECTORY_SEPERATOR) {
+			return substr($path, 0, -1);
+		} else {
+			return $path;
+		}
+	}
 
-    /**
-     * Scans the directory and adds what it can.
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @see _attemptToAdd()
-     */
-    function collect($test, $path) {
-        $path = $this->_removeTrailingSlash($path);
-        if ($handle = opendir($path)) {
-            while (($entry = readdir($handle)) !== false) {
-                $this->_handle($test, $path . DIRECTORY_SEPARATOR . $entry);
-            }
-            closedir($handle);
-        }
-    }
+	/**
+	 * Scans the directory and adds what it can.
+	 * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+	 * @param string $path    Directory to scan.
+	 * @see _attemptToAdd()
+	 */
+	function collect($test, $path) {
+		$path = $this->_removeTrailingSlash($path);
+		if ($handle = opendir($path)) {
+			while (($entry = readdir($handle)) !== false) {
+				$this->_handle($test, $path . DIRECTORY_SEPARATOR . $entry);
+			}
+			closedir($handle);
+		}
+	}
 
-    /**
-     * This method determines what should be done with a given file and adds
-     * it via {@link GroupTest::addTestFile()} if necessary.
-     *
-     * This method should be overriden to provide custom matching criteria,
-     * such as pattern matching, recursive matching, etc.  For an example, see
-     * {@link SimplePatternCollector::_handle()}.
-     *
-     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $filename  A filename as generated by {@link collect()}
-     * @see collect()
-     * @access protected
-     */
-    function _handle($test, $file) {
-        if (!is_dir($file)) {
-            $test->addTestFile($file);
-        }
-    }
+	/**
+	 * This method determines what should be done with a given file and adds
+	 * it via {@link GroupTest::addTestFile()} if necessary.
+	 *
+	 * This method should be overriden to provide custom matching criteria,
+	 * such as pattern matching, recursive matching, etc.  For an example, see
+	 * {@link SimplePatternCollector::_handle()}.
+	 *
+	 * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
+	 * @param string $filename  A filename as generated by {@link collect()}
+	 * @see collect()
+	 * @access protected
+	 */
+	function _handle($test, $file) {
+		if (!is_dir($file)) {
+			$test->addTestFile($file);
+		}
+	}
 }
 
 /**
@@ -83,31 +83,31 @@ 
  * @see SimpleCollector
  */
 class SimplePatternCollector extends SimpleCollector {
-    protected $_pattern;
+	protected $_pattern;
 
 
-    /**
-     *
-     * @param string $pattern   Perl compatible regex to test name against
-     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
-     *  for full documentation of valid pattern.s
-     */
-    function SimplePatternCollector($pattern = '/php$/i') {
-        $this->_pattern = $pattern;
-    }
+	/**
+	 *
+	 * @param string $pattern   Perl compatible regex to test name against
+	 *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
+	 *  for full documentation of valid pattern.s
+	 */
+	function SimplePatternCollector($pattern = '/php$/i') {
+		$this->_pattern = $pattern;
+	}
 
 
-    /**
-     * Attempts to add files that match a given pattern.
-     *
-     * @see SimpleCollector::_handle()
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @access protected
-     */
-    function _handle($test, $filename) {
-        if (preg_match($this->_pattern, $filename)) {
-            parent::_handle($test, $filename);
-        }
-    }
+	/**
+	 * Attempts to add files that match a given pattern.
+	 *
+	 * @see SimpleCollector::_handle()
+	 * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+	 * @param string $path    Directory to scan.
+	 * @access protected
+	 */
+	function _handle($test, $filename) {
+		if (preg_match($this->_pattern, $filename)) {
+			parent::_handle($test, $filename);
+		}
+	}
 }
\ No newline at end of file

tests/test_tools/simpletest/compatibility.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     	/**
     	 *	  Creates a copy whether in PHP5 or PHP4.
-    	 *	  @param object $object		Thing to copy.
+    	 *	  @param SimpleFormTag $object		Thing to copy.
     	 *	  @return object			A copy.
     	 *	  @access public
     	 *	  @static

Indentation +173 added lines, -173 removed lines

@@ -1,183 +1,183 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@version	$Id: compatibility.php 1532 2006-12-01 12:28:55Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@version	$Id: compatibility.php 1532 2006-12-01 12:28:55Z xue $
+	 */
 
-    /**
-     *  Static methods for compatibility between different
-     *  PHP versions.
-     *  @package	SimpleTest
-     */
-    class SimpleTestCompatibility {
+	/**
+	 *  Static methods for compatibility between different
+	 *  PHP versions.
+	 *  @package	SimpleTest
+	 */
+	class SimpleTestCompatibility {
 
-    	/**
-    	 *	  Creates a copy whether in PHP5 or PHP4.
-    	 *	  @param object $object		Thing to copy.
-    	 *	  @return object			A copy.
-    	 *	  @access public
-    	 *	  @static
-    	 */
-    	static function copy($object) {
-            if (version_compare(phpversion(), '5') >= 0) {
-            	eval('$copy = clone $object;');
-            	return $copy;
-            }
-            return $object;
-    	}
+		/**
+		 *	  Creates a copy whether in PHP5 or PHP4.
+		 *	  @param object $object		Thing to copy.
+		 *	  @return object			A copy.
+		 *	  @access public
+		 *	  @static
+		 */
+		static function copy($object) {
+			if (version_compare(phpversion(), '5') >= 0) {
+				eval('$copy = clone $object;');
+				return $copy;
+			}
+			return $object;
+		}
 
-        /**
-         *    Identity test. Drops back to equality + types for PHP5
-         *    objects as the === operator counts as the
-         *    stronger reference constraint.
-         *    @param mixed $first    Test subject.
-         *    @param mixed $second   Comparison object.
-         *	  @return boolean		 True if identical.
-         *    @access public
-         *    @static
-         */
-        static function isIdentical($first, $second) {
-            if ($first != $second) {
-                return false;
-            }
-            if (version_compare(phpversion(), '5') >= 0) {
-                return SimpleTestCompatibility::_isIdenticalType($first, $second);
-            }
-            return ($first === $second);
-        }
+		/**
+		 *    Identity test. Drops back to equality + types for PHP5
+		 *    objects as the === operator counts as the
+		 *    stronger reference constraint.
+		 *    @param mixed $first    Test subject.
+		 *    @param mixed $second   Comparison object.
+		 *	  @return boolean		 True if identical.
+		 *    @access public
+		 *    @static
+		 */
+		static function isIdentical($first, $second) {
+			if ($first != $second) {
+				return false;
+			}
+			if (version_compare(phpversion(), '5') >= 0) {
+				return SimpleTestCompatibility::_isIdenticalType($first, $second);
+			}
+			return ($first === $second);
+		}
 
-        /**
-         *    Recursive type test.
-         *    @param mixed $first    Test subject.
-         *    @param mixed $second   Comparison object.
-         *	  @return boolean		 True if same type.
-         *    @access private
-         *    @static
-         */
-        static function _isIdenticalType($first, $second) {
-            if (gettype($first) != gettype($second)) {
-                return false;
-            }
-            if (is_object($first) && is_object($second)) {
-                if (get_class($first) != get_class($second)) {
-                    return false;
-                }
-                return SimpleTestCompatibility::_isArrayOfIdenticalTypes(
-                        get_object_vars($first),
-                        get_object_vars($second));
-            }
-            if (is_array($first) && is_array($second)) {
-                return SimpleTestCompatibility::_isArrayOfIdenticalTypes($first, $second);
-            }
-            return true;
-        }
+		/**
+		 *    Recursive type test.
+		 *    @param mixed $first    Test subject.
+		 *    @param mixed $second   Comparison object.
+		 *	  @return boolean		 True if same type.
+		 *    @access private
+		 *    @static
+		 */
+		static function _isIdenticalType($first, $second) {
+			if (gettype($first) != gettype($second)) {
+				return false;
+			}
+			if (is_object($first) && is_object($second)) {
+				if (get_class($first) != get_class($second)) {
+					return false;
+				}
+				return SimpleTestCompatibility::_isArrayOfIdenticalTypes(
+						get_object_vars($first),
+						get_object_vars($second));
+			}
+			if (is_array($first) && is_array($second)) {
+				return SimpleTestCompatibility::_isArrayOfIdenticalTypes($first, $second);
+			}
+			return true;
+		}
 
-        /**
-         *    Recursive type test for each element of an array.
-         *    @param mixed $first    Test subject.
-         *    @param mixed $second   Comparison object.
-         *	  @return boolean		 True if identical.
-         *    @access private
-         *    @static
-         */
-        static function _isArrayOfIdenticalTypes($first, $second) {
-            if (array_keys($first) != array_keys($second)) {
-                return false;
-            }
-            foreach (array_keys($first) as $key) {
-                $is_identical = SimpleTestCompatibility::_isIdenticalType(
-                        $first[$key],
-                        $second[$key]);
-                if (! $is_identical) {
-                    return false;
-                }
-            }
-            return true;
-        }
+		/**
+		 *    Recursive type test for each element of an array.
+		 *    @param mixed $first    Test subject.
+		 *    @param mixed $second   Comparison object.
+		 *	  @return boolean		 True if identical.
+		 *    @access private
+		 *    @static
+		 */
+		static function _isArrayOfIdenticalTypes($first, $second) {
+			if (array_keys($first) != array_keys($second)) {
+				return false;
+			}
+			foreach (array_keys($first) as $key) {
+				$is_identical = SimpleTestCompatibility::_isIdenticalType(
+						$first[$key],
+						$second[$key]);
+				if (! $is_identical) {
+					return false;
+				}
+			}
+			return true;
+		}
 
-        /**
-         *    Test for two variables being aliases.
-         *    @param mixed $first    Test subject.
-         *    @param mixed $second   Comparison object.
-         *	  @return boolean		 True if same.
-         *    @access public
-         *    @static
-         */
-        static function isReference($first, $second) {
-            if (version_compare(phpversion(), '5', '>=')
-	    	    && is_object($first)) {
-	    	    return ($first === $second);
-	        }
-	        if (is_object($first) && is_object($second)) {
-                $id = uniqid("test");
-                $first->$id = true;
-                $is_ref = isset($second->$id);
-                unset($first->$id);
-                return $is_ref;
-	        }
-	        $temp = $first;
-            $first = uniqid("test");
-            $is_ref = ($first === $second);
-            $first = $temp;
-            return $is_ref;
-        }
+		/**
+		 *    Test for two variables being aliases.
+		 *    @param mixed $first    Test subject.
+		 *    @param mixed $second   Comparison object.
+		 *	  @return boolean		 True if same.
+		 *    @access public
+		 *    @static
+		 */
+		static function isReference($first, $second) {
+			if (version_compare(phpversion(), '5', '>=')
+				&& is_object($first)) {
+				return ($first === $second);
+			}
+			if (is_object($first) && is_object($second)) {
+				$id = uniqid("test");
+				$first->$id = true;
+				$is_ref = isset($second->$id);
+				unset($first->$id);
+				return $is_ref;
+			}
+			$temp = $first;
+			$first = uniqid("test");
+			$is_ref = ($first === $second);
+			$first = $temp;
+			return $is_ref;
+		}
 
-        /**
-         *    Test to see if an object is a member of a
-         *    class hiearchy.
-         *    @param object $object    Object to test.
-         *    @param string $class     Root name of hiearchy.
-         *    @return boolean		  True if class in hiearchy.
-         *    @access public
-         *    @static
-         */
-        static function isA($object, $class) {
-            if (version_compare(phpversion(), '5') >= 0) {
-                if (! class_exists($class, false)) {
-                    if (function_exists('interface_exists')) {
-                        if (! interface_exists($class, false))  {
-                            return false;
-                        }
-                    }
-                }
-                eval("\$is_a = \$object instanceof $class;");
-                return $is_a;
-            }
-            if (function_exists('is_a')) {
-                return is_a($object, $class);
-            }
-            return ((strtolower($class) == get_class($object))
-                    or (is_subclass_of($object, $class)));
-        }
+		/**
+		 *    Test to see if an object is a member of a
+		 *    class hiearchy.
+		 *    @param object $object    Object to test.
+		 *    @param string $class     Root name of hiearchy.
+		 *    @return boolean		  True if class in hiearchy.
+		 *    @access public
+		 *    @static
+		 */
+		static function isA($object, $class) {
+			if (version_compare(phpversion(), '5') >= 0) {
+				if (! class_exists($class, false)) {
+					if (function_exists('interface_exists')) {
+						if (! interface_exists($class, false))  {
+							return false;
+						}
+					}
+				}
+				eval("\$is_a = \$object instanceof $class;");
+				return $is_a;
+			}
+			if (function_exists('is_a')) {
+				return is_a($object, $class);
+			}
+			return ((strtolower($class) == get_class($object))
+					or (is_subclass_of($object, $class)));
+		}
 
-        /**
-         *    Sets a socket timeout for each chunk.
-         *    @param resource $handle    Socket handle.
-         *    @param integer $timeout    Limit in seconds.
-         *    @access public
-         *    @static
-         */
-        static function setTimeout($handle, $timeout) {
-            if (function_exists('stream_set_timeout')) {
-                stream_set_timeout($handle, $timeout, 0);
-            } elseif (function_exists('socket_set_timeout')) {
-                socket_set_timeout($handle, $timeout, 0);
-            } elseif (function_exists('set_socket_timeout')) {
-                set_socket_timeout($handle, $timeout, 0);
-            }
-        }
+		/**
+		 *    Sets a socket timeout for each chunk.
+		 *    @param resource $handle    Socket handle.
+		 *    @param integer $timeout    Limit in seconds.
+		 *    @access public
+		 *    @static
+		 */
+		static function setTimeout($handle, $timeout) {
+			if (function_exists('stream_set_timeout')) {
+				stream_set_timeout($handle, $timeout, 0);
+			} elseif (function_exists('socket_set_timeout')) {
+				socket_set_timeout($handle, $timeout, 0);
+			} elseif (function_exists('set_socket_timeout')) {
+				set_socket_timeout($handle, $timeout, 0);
+			}
+		}
 
-        /**
-         *    Gets the current stack trace topmost first.
-         *    @return array        List of stack frames.
-         *    @access public
-         *    @static
-         */
-        static function getStackTrace() {
-            if (function_exists('debug_backtrace')) {
-                return array_reverse(debug_backtrace());
-            }
-            return array();
-        }
-    }
+		/**
+		 *    Gets the current stack trace topmost first.
+		 *    @return array        List of stack frames.
+		 *    @access public
+		 *    @static
+		 */
+		static function getStackTrace() {
+			if (function_exists('debug_backtrace')) {
+				return array_reverse(debug_backtrace());
+			}
+			return array();
+		}
+	}

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
                 $is_identical = SimpleTestCompatibility::_isIdenticalType(
                         $first[$key],
                         $second[$key]);
-                if (! $is_identical) {
+                if (!$is_identical) {
                     return false;
                 }
             }
@@ -134,9 +134,9 @@ 
          */
         static function isA($object, $class) {
             if (version_compare(phpversion(), '5') >= 0) {
-                if (! class_exists($class, false)) {
+                if (!class_exists($class, false)) {
                     if (function_exists('interface_exists')) {
-                        if (! interface_exists($class, false))  {
+                        if (!interface_exists($class, false)) {
                             return false;
                         }
                     }

tests/test_tools/simpletest/cookies.php

Doc Comments -2 removed lines

@@ -239,8 +239,6 @@
         /**
          *    Removes expired and temporary cookies as if
          *    the browser was closed and re-opened.
-         *    @param string/integer $now   Time to test expiry against.
-         *    @access public
          */
         function restartSession($date = false) {
             $surviving_cookies = array();

Indentation +347 added lines, -347 removed lines

@@ -1,379 +1,379 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: cookies.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: cookies.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/url.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/url.php');
+	/**#@-*/
 
-    /**
-     *    Cookie data holder. Cookie rules are full of pretty
-     *    arbitary stuff. I have used...
-     *    http://wp.netscape.com/newsref/std/cookie_spec.html
-     *    http://www.cookiecentral.com/faq/
+	/**
+	 *    Cookie data holder. Cookie rules are full of pretty
+	 *    arbitary stuff. I have used...
+	 *    http://wp.netscape.com/newsref/std/cookie_spec.html
+	 *    http://www.cookiecentral.com/faq/
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCookie {
-        protected $_host;
-        protected $_name;
-        protected $_value;
-        protected $_path;
-        protected $_expiry;
-        protected $_is_secure;
+	 */
+	class SimpleCookie {
+		protected $_host;
+		protected $_name;
+		protected $_value;
+		protected $_path;
+		protected $_expiry;
+		protected $_is_secure;
 
-        /**
-         *    Constructor. Sets the stored values.
-         *    @param string $name            Cookie key.
-         *    @param string $value           Value of cookie.
-         *    @param string $path            Cookie path if not host wide.
-         *    @param string $expiry          Expiry date as string.
-         *    @param boolean $is_secure      Currently ignored.
-         */
-        function SimpleCookie($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
-            $this->_host = false;
-            $this->_name = $name;
-            $this->_value = $value;
-            $this->_path = ($path ? $this->_fixPath($path) : "/");
-            $this->_expiry = false;
-            if (is_string($expiry)) {
-                $this->_expiry = strtotime($expiry);
-            } elseif (is_integer($expiry)) {
-                $this->_expiry = $expiry;
-            }
-            $this->_is_secure = $is_secure;
-        }
+		/**
+		 *    Constructor. Sets the stored values.
+		 *    @param string $name            Cookie key.
+		 *    @param string $value           Value of cookie.
+		 *    @param string $path            Cookie path if not host wide.
+		 *    @param string $expiry          Expiry date as string.
+		 *    @param boolean $is_secure      Currently ignored.
+		 */
+		function SimpleCookie($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
+			$this->_host = false;
+			$this->_name = $name;
+			$this->_value = $value;
+			$this->_path = ($path ? $this->_fixPath($path) : "/");
+			$this->_expiry = false;
+			if (is_string($expiry)) {
+				$this->_expiry = strtotime($expiry);
+			} elseif (is_integer($expiry)) {
+				$this->_expiry = $expiry;
+			}
+			$this->_is_secure = $is_secure;
+		}
 
-        /**
-         *    Sets the host. The cookie rules determine
-         *    that the first two parts are taken for
-         *    certain TLDs and three for others. If the
-         *    new host does not match these rules then the
-         *    call will fail.
-         *    @param string $host       New hostname.
-         *    @return boolean           True if hostname is valid.
-         *    @access public
-         */
-        function setHost($host) {
-            if ($host = $this->_truncateHost($host)) {
-                $this->_host = $host;
-                return true;
-            }
-            return false;
-        }
+		/**
+		 *    Sets the host. The cookie rules determine
+		 *    that the first two parts are taken for
+		 *    certain TLDs and three for others. If the
+		 *    new host does not match these rules then the
+		 *    call will fail.
+		 *    @param string $host       New hostname.
+		 *    @return boolean           True if hostname is valid.
+		 *    @access public
+		 */
+		function setHost($host) {
+			if ($host = $this->_truncateHost($host)) {
+				$this->_host = $host;
+				return true;
+			}
+			return false;
+		}
 
-        /**
-         *    Accessor for the truncated host to which this
-         *    cookie applies.
-         *    @return string       Truncated hostname.
-         *    @access public
-         */
-        function getHost() {
-            return $this->_host;
-        }
+		/**
+		 *    Accessor for the truncated host to which this
+		 *    cookie applies.
+		 *    @return string       Truncated hostname.
+		 *    @access public
+		 */
+		function getHost() {
+			return $this->_host;
+		}
 
-        /**
-         *    Test for a cookie being valid for a host name.
-         *    @param string $host    Host to test against.
-         *    @return boolean        True if the cookie would be valid
-         *                           here.
-         */
-        function isValidHost($host) {
-            return ($this->_truncateHost($host) === $this->getHost());
-        }
+		/**
+		 *    Test for a cookie being valid for a host name.
+		 *    @param string $host    Host to test against.
+		 *    @return boolean        True if the cookie would be valid
+		 *                           here.
+		 */
+		function isValidHost($host) {
+			return ($this->_truncateHost($host) === $this->getHost());
+		}
 
-        /**
-         *    Extracts just the domain part that determines a
-         *    cookie's host validity.
-         *    @param string $host    Host name to truncate.
-         *    @return string        Domain or false on a bad host.
-         *    @access private
-         */
-        function _truncateHost($host) {
-            $tlds = SimpleUrl::getAllTopLevelDomains();
-            if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
-                return $matches[0];
-            } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
-                return $matches[0];
-            }
-            return false;
-        }
+		/**
+		 *    Extracts just the domain part that determines a
+		 *    cookie's host validity.
+		 *    @param string $host    Host name to truncate.
+		 *    @return string        Domain or false on a bad host.
+		 *    @access private
+		 */
+		function _truncateHost($host) {
+			$tlds = SimpleUrl::getAllTopLevelDomains();
+			if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
+				return $matches[0];
+			} elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
+				return $matches[0];
+			}
+			return false;
+		}
 
-        /**
-         *    Accessor for name.
-         *    @return string       Cookie key.
-         *    @access public
-         */
-        function getName() {
-            return $this->_name;
-        }
+		/**
+		 *    Accessor for name.
+		 *    @return string       Cookie key.
+		 *    @access public
+		 */
+		function getName() {
+			return $this->_name;
+		}
 
-        /**
-         *    Accessor for value. A deleted cookie will
-         *    have an empty string for this.
-         *    @return string       Cookie value.
-         *    @access public
-         */
-        function getValue() {
-            return $this->_value;
-        }
+		/**
+		 *    Accessor for value. A deleted cookie will
+		 *    have an empty string for this.
+		 *    @return string       Cookie value.
+		 *    @access public
+		 */
+		function getValue() {
+			return $this->_value;
+		}
 
-        /**
-         *    Accessor for path.
-         *    @return string       Valid cookie path.
-         *    @access public
-         */
-        function getPath() {
-            return $this->_path;
-        }
+		/**
+		 *    Accessor for path.
+		 *    @return string       Valid cookie path.
+		 *    @access public
+		 */
+		function getPath() {
+			return $this->_path;
+		}
 
-        /**
-         *    Tests a path to see if the cookie applies
-         *    there. The test path must be longer or
-         *    equal to the cookie path.
-         *    @param string $path       Path to test against.
-         *    @return boolean           True if cookie valid here.
-         *    @access public
-         */
-        function isValidPath($path) {
-            return (strncmp(
-                    $this->_fixPath($path),
-                    $this->getPath(),
-                    strlen($this->getPath())) == 0);
-        }
+		/**
+		 *    Tests a path to see if the cookie applies
+		 *    there. The test path must be longer or
+		 *    equal to the cookie path.
+		 *    @param string $path       Path to test against.
+		 *    @return boolean           True if cookie valid here.
+		 *    @access public
+		 */
+		function isValidPath($path) {
+			return (strncmp(
+					$this->_fixPath($path),
+					$this->getPath(),
+					strlen($this->getPath())) == 0);
+		}
 
-        /**
-         *    Accessor for expiry.
-         *    @return string       Expiry string.
-         *    @access public
-         */
-        function getExpiry() {
-            if (! $this->_expiry) {
-                return false;
-            }
-            return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
-        }
+		/**
+		 *    Accessor for expiry.
+		 *    @return string       Expiry string.
+		 *    @access public
+		 */
+		function getExpiry() {
+			if (! $this->_expiry) {
+				return false;
+			}
+			return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
+		}
 
-        /**
-         *    Test to see if cookie is expired against
-         *    the cookie format time or timestamp.
-         *    Will give true for a session cookie.
-         *    @param integer/string $now  Time to test against. Result
-         *                                will be false if this time
-         *                                is later than the cookie expiry.
-         *                                Can be either a timestamp integer
-         *                                or a cookie format date.
-         *    @access public
-         */
-        function isExpired($now) {
-            if (! $this->_expiry) {
-                return true;
-            }
-            if (is_string($now)) {
-                $now = strtotime($now);
-            }
-            return ($this->_expiry < $now);
-        }
+		/**
+		 *    Test to see if cookie is expired against
+		 *    the cookie format time or timestamp.
+		 *    Will give true for a session cookie.
+		 *    @param integer/string $now  Time to test against. Result
+		 *                                will be false if this time
+		 *                                is later than the cookie expiry.
+		 *                                Can be either a timestamp integer
+		 *                                or a cookie format date.
+		 *    @access public
+		 */
+		function isExpired($now) {
+			if (! $this->_expiry) {
+				return true;
+			}
+			if (is_string($now)) {
+				$now = strtotime($now);
+			}
+			return ($this->_expiry < $now);
+		}
 
-        /**
-         *    Ages the cookie by the specified number of
-         *    seconds.
-         *    @param integer $interval   In seconds.
-         *    @public
-         */
-        function agePrematurely($interval) {
-            if ($this->_expiry) {
-                $this->_expiry -= $interval;
-            }
-        }
+		/**
+		 *    Ages the cookie by the specified number of
+		 *    seconds.
+		 *    @param integer $interval   In seconds.
+		 *    @public
+		 */
+		function agePrematurely($interval) {
+			if ($this->_expiry) {
+				$this->_expiry -= $interval;
+			}
+		}
 
-        /**
-         *    Accessor for the secure flag.
-         *    @return boolean       True if cookie needs SSL.
-         *    @access public
-         */
-        function isSecure() {
-            return $this->_is_secure;
-        }
+		/**
+		 *    Accessor for the secure flag.
+		 *    @return boolean       True if cookie needs SSL.
+		 *    @access public
+		 */
+		function isSecure() {
+			return $this->_is_secure;
+		}
 
-        /**
-         *    Adds a trailing and leading slash to the path
-         *    if missing.
-         *    @param string $path            Path to fix.
-         *    @access private
-         */
-        function _fixPath($path) {
-            if (substr($path, 0, 1) != '/') {
-                $path = '/' . $path;
-            }
-            if (substr($path, -1, 1) != '/') {
-                $path .= '/';
-            }
-            return $path;
-        }
-    }
+		/**
+		 *    Adds a trailing and leading slash to the path
+		 *    if missing.
+		 *    @param string $path            Path to fix.
+		 *    @access private
+		 */
+		function _fixPath($path) {
+			if (substr($path, 0, 1) != '/') {
+				$path = '/' . $path;
+			}
+			if (substr($path, -1, 1) != '/') {
+				$path .= '/';
+			}
+			return $path;
+		}
+	}
 
-    /**
-     *    Repository for cookies. This stuff is a
-     *    tiny bit browser dependent.
+	/**
+	 *    Repository for cookies. This stuff is a
+	 *    tiny bit browser dependent.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCookieJar {
-        protected $_cookies;
+	 */
+	class SimpleCookieJar {
+		protected $_cookies;
 
-        /**
-         *    Constructor. Jar starts empty.
-         *    @access public
-         */
-        function SimpleCookieJar() {
-            $this->_cookies = array();
-        }
+		/**
+		 *    Constructor. Jar starts empty.
+		 *    @access public
+		 */
+		function SimpleCookieJar() {
+			$this->_cookies = array();
+		}
 
-        /**
-         *    Removes expired and temporary cookies as if
-         *    the browser was closed and re-opened.
-         *    @param string/integer $now   Time to test expiry against.
-         *    @access public
-         */
-        function restartSession($date = false) {
-            $surviving_cookies = array();
-            for ($i = 0; $i < count($this->_cookies); $i++) {
-                if (! $this->_cookies[$i]->getValue()) {
-                    continue;
-                }
-                if (! $this->_cookies[$i]->getExpiry()) {
-                    continue;
-                }
-                if ($date && $this->_cookies[$i]->isExpired($date)) {
-                    continue;
-                }
-                $surviving_cookies[] = $this->_cookies[$i];
-            }
-            $this->_cookies = $surviving_cookies;
-        }
+		/**
+		 *    Removes expired and temporary cookies as if
+		 *    the browser was closed and re-opened.
+		 *    @param string/integer $now   Time to test expiry against.
+		 *    @access public
+		 */
+		function restartSession($date = false) {
+			$surviving_cookies = array();
+			for ($i = 0; $i < count($this->_cookies); $i++) {
+				if (! $this->_cookies[$i]->getValue()) {
+					continue;
+				}
+				if (! $this->_cookies[$i]->getExpiry()) {
+					continue;
+				}
+				if ($date && $this->_cookies[$i]->isExpired($date)) {
+					continue;
+				}
+				$surviving_cookies[] = $this->_cookies[$i];
+			}
+			$this->_cookies = $surviving_cookies;
+		}
 
-        /**
-         *    Ages all cookies in the cookie jar.
-         *    @param integer $interval     The old session is moved
-         *                                 into the past by this number
-         *                                 of seconds. Cookies now over
-         *                                 age will be removed.
-         *    @access public
-         */
-        function agePrematurely($interval) {
-            for ($i = 0; $i < count($this->_cookies); $i++) {
-                $this->_cookies[$i]->agePrematurely($interval);
-            }
-        }
+		/**
+		 *    Ages all cookies in the cookie jar.
+		 *    @param integer $interval     The old session is moved
+		 *                                 into the past by this number
+		 *                                 of seconds. Cookies now over
+		 *                                 age will be removed.
+		 *    @access public
+		 */
+		function agePrematurely($interval) {
+			for ($i = 0; $i < count($this->_cookies); $i++) {
+				$this->_cookies[$i]->agePrematurely($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) {
-            $cookie = new SimpleCookie($name, $value, $path, $expiry);
-            if ($host) {
-                $cookie->setHost($host);
-            }
-            $this->_cookies[$this->_findFirstMatch($cookie)] = $cookie;
-        }
+		/**
+		 *    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) {
+			$cookie = new SimpleCookie($name, $value, $path, $expiry);
+			if ($host) {
+				$cookie->setHost($host);
+			}
+			$this->_cookies[$this->_findFirstMatch($cookie)] = $cookie;
+		}
 
-        /**
-         *    Finds a matching cookie to write over or the
-         *    first empty slot if none.
-         *    @param SimpleCookie $cookie    Cookie to write into jar.
-         *    @return integer                Available slot.
-         *    @access private
-         */
-        function _findFirstMatch($cookie) {
-            for ($i = 0; $i < count($this->_cookies); $i++) {
-                $is_match = $this->_isMatch(
-                        $cookie,
-                        $this->_cookies[$i]->getHost(),
-                        $this->_cookies[$i]->getPath(),
-                        $this->_cookies[$i]->getName());
-                if ($is_match) {
-                    return $i;
-                }
-            }
-            return count($this->_cookies);
-        }
+		/**
+		 *    Finds a matching cookie to write over or the
+		 *    first empty slot if none.
+		 *    @param SimpleCookie $cookie    Cookie to write into jar.
+		 *    @return integer                Available slot.
+		 *    @access private
+		 */
+		function _findFirstMatch($cookie) {
+			for ($i = 0; $i < count($this->_cookies); $i++) {
+				$is_match = $this->_isMatch(
+						$cookie,
+						$this->_cookies[$i]->getHost(),
+						$this->_cookies[$i]->getPath(),
+						$this->_cookies[$i]->getName());
+				if ($is_match) {
+					return $i;
+				}
+			}
+			return count($this->_cookies);
+		}
 
-        /**
-         *    Reads the most specific cookie value from the
-         *    browser cookies. Looks for the longest path that
-         *    matches.
-         *    @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) {
-            $longest_path = '';
-            foreach ($this->_cookies as $cookie) {
-                if ($this->_isMatch($cookie, $host, $path, $name)) {
-                    if (strlen($cookie->getPath()) > strlen($longest_path)) {
-                        $value = $cookie->getValue();
-                        $longest_path = $cookie->getPath();
-                    }
-                }
-            }
-            return (isset($value) ? $value : false);
-        }
+		/**
+		 *    Reads the most specific cookie value from the
+		 *    browser cookies. Looks for the longest path that
+		 *    matches.
+		 *    @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) {
+			$longest_path = '';
+			foreach ($this->_cookies as $cookie) {
+				if ($this->_isMatch($cookie, $host, $path, $name)) {
+					if (strlen($cookie->getPath()) > strlen($longest_path)) {
+						$value = $cookie->getValue();
+						$longest_path = $cookie->getPath();
+					}
+				}
+			}
+			return (isset($value) ? $value : false);
+		}
 
-        /**
-         *    Tests cookie for matching against search
-         *    criteria.
-         *    @param SimpleTest $cookie    Cookie to test.
-         *    @param string $host          Host must match.
-         *    @param string $path          Cookie path must be shorter than
-         *                                 this path.
-         *    @param string $name          Name must match.
-         *    @return boolean              True if matched.
-         *    @access private
-         */
-        function _isMatch($cookie, $host, $path, $name) {
-            if ($cookie->getName() != $name) {
-                return false;
-            }
-            if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
-                return false;
-            }
-            if (! $cookie->isValidPath($path)) {
-                return false;
-            }
-            return true;
-        }
+		/**
+		 *    Tests cookie for matching against search
+		 *    criteria.
+		 *    @param SimpleTest $cookie    Cookie to test.
+		 *    @param string $host          Host must match.
+		 *    @param string $path          Cookie path must be shorter than
+		 *                                 this path.
+		 *    @param string $name          Name must match.
+		 *    @return boolean              True if matched.
+		 *    @access private
+		 */
+		function _isMatch($cookie, $host, $path, $name) {
+			if ($cookie->getName() != $name) {
+				return false;
+			}
+			if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
+				return false;
+			}
+			if (! $cookie->isValidPath($path)) {
+				return false;
+			}
+			return true;
+		}
 
-        /**
-         *    Uses a URL to sift relevant cookies by host and
-         *    path. Results are list of strings of form "name=value".
-         *    @param SimpleUrl $url       Url to select by.
-         *    @return array               Valid name and value pairs.
-         *    @access public
-         */
-        function selectAsPairs($url) {
-            $pairs = array();
-            foreach ($this->_cookies as $cookie) {
-                if ($this->_isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
-                    $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
-                }
-            }
-            return $pairs;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Uses a URL to sift relevant cookies by host and
+		 *    path. Results are list of strings of form "name=value".
+		 *    @param SimpleUrl $url       Url to select by.
+		 *    @return array               Valid name and value pairs.
+		 *    @access public
+		 */
+		function selectAsPairs($url) {
+			$pairs = array();
+			foreach ($this->_cookies as $cookie) {
+				if ($this->_isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
+					$pairs[] = $cookie->getName() . '=' . $cookie->getValue();
+				}
+			}
+			return $pairs;
+		}
+	}
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -154,7 +154,7 @@ 
          *    @access public
          */
         function getExpiry() {
-            if (! $this->_expiry) {
+            if (!$this->_expiry) {
                 return false;
             }
             return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
@@ -172,7 +172,7 @@ 
          *    @access public
          */
         function isExpired($now) {
-            if (! $this->_expiry) {
+            if (!$this->_expiry) {
                 return true;
             }
             if (is_string($now)) {
@@ -245,10 +245,10 @@ 
         function restartSession($date = false) {
             $surviving_cookies = array();
             for ($i = 0; $i < count($this->_cookies); $i++) {
-                if (! $this->_cookies[$i]->getValue()) {
+                if (!$this->_cookies[$i]->getValue()) {
                     continue;
                 }
-                if (! $this->_cookies[$i]->getExpiry()) {
+                if (!$this->_cookies[$i]->getExpiry()) {
                     continue;
                 }
                 if ($date && $this->_cookies[$i]->isExpired($date)) {
@@ -351,10 +351,10 @@ 
             if ($cookie->getName() != $name) {
                 return false;
             }
-            if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
+            if ($host && $cookie->getHost() && !$cookie->isValidHost($host)) {
                 return false;
             }
-            if (! $cookie->isValidPath($path)) {
+            if (!$cookie->isValidPath($path)) {
                 return false;
             }
             return true;

tests/test_tools/simpletest/encoding.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
          *    form encoded packet.
          *    @param string $key          Key to add value to.
          *    @param string $content      Raw data.
-         *    @param hash $filename       Original filename.
+         *    @param string $filename       Original filename.
          *    @access public
          */
         function attach($key, $content, $filename) {

Indentation +502 added lines, -502 removed lines

@@ -1,520 +1,520 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: encoding.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: encoding.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/socket.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/socket.php');
+	/**#@-*/
 
-    /**
-     *    Single post parameter.
+	/**
+	 *    Single post parameter.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleEncodedPair {
-        protected $_key;
-        protected $_value;
-
-        /**
-         *    Stashes the data for rendering later.
-         *    @param string $key       Form element name.
-         *    @param string $value     Data to send.
-         */
-        function SimpleEncodedPair($key, $value) {
-            $this->_key = $key;
-            $this->_value = $value;
-        }
-
-        /**
-         *    The pair as a single string.
-         *    @return string        Encoded pair.
-         *    @access public
-         */
-        function asRequest() {
-            return $this->_key . '=' . urlencode($this->_value);
-        }
-
-        /**
-         *    The MIME part as a string.
-         *    @return string        MIME part encoding.
-         *    @access public
-         */
-        function asMime() {
-            $part = 'Content-Disposition: form-data; ';
-            $part .= "name=\"" . $this->_key . "\"\r\n";
-            $part .= "\r\n" . $this->_value;
-            return $part;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @param string $key    Identifier.
-         *    @return boolean       True if matched.
-         *    @access public
-         */
-        function isKey($key) {
-            return $key == $this->_key;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @return string       Identifier.
-         *    @access public
-         */
-        function getKey() {
-            return $this->_key;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @return string       Content.
-         *    @access public
-         */
-        function getValue() {
-            return $this->_value;
-        }
-    }
-
-    /**
-     *    Single post parameter.
+	 */
+	class SimpleEncodedPair {
+		protected $_key;
+		protected $_value;
+
+		/**
+		 *    Stashes the data for rendering later.
+		 *    @param string $key       Form element name.
+		 *    @param string $value     Data to send.
+		 */
+		function SimpleEncodedPair($key, $value) {
+			$this->_key = $key;
+			$this->_value = $value;
+		}
+
+		/**
+		 *    The pair as a single string.
+		 *    @return string        Encoded pair.
+		 *    @access public
+		 */
+		function asRequest() {
+			return $this->_key . '=' . urlencode($this->_value);
+		}
+
+		/**
+		 *    The MIME part as a string.
+		 *    @return string        MIME part encoding.
+		 *    @access public
+		 */
+		function asMime() {
+			$part = 'Content-Disposition: form-data; ';
+			$part .= "name=\"" . $this->_key . "\"\r\n";
+			$part .= "\r\n" . $this->_value;
+			return $part;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @param string $key    Identifier.
+		 *    @return boolean       True if matched.
+		 *    @access public
+		 */
+		function isKey($key) {
+			return $key == $this->_key;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @return string       Identifier.
+		 *    @access public
+		 */
+		function getKey() {
+			return $this->_key;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @return string       Content.
+		 *    @access public
+		 */
+		function getValue() {
+			return $this->_value;
+		}
+	}
+
+	/**
+	 *    Single post parameter.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleAttachment {
-        protected $_key;
-        protected $_content;
-        protected $_filename;
-
-        /**
-         *    Stashes the data for rendering later.
-         *    @param string $key          Key to add value to.
-         *    @param string $content      Raw data.
-         *    @param hash $filename       Original filename.
-         */
-        function SimpleAttachment($key, $content, $filename) {
-            $this->_key = $key;
-            $this->_content = $content;
-            $this->_filename = $filename;
-        }
-
-        /**
-         *    The pair as a single string.
-         *    @return string        Encoded pair.
-         *    @access public
-         */
-        function asRequest() {
-            return '';
-        }
-
-        /**
-         *    The MIME part as a string.
-         *    @return string        MIME part encoding.
-         *    @access public
-         */
-        function asMime() {
-            $part = 'Content-Disposition: form-data; ';
-            $part .= 'name="' . $this->_key . '"; ';
-            $part .= 'filename="' . $this->_filename . '"';
-            $part .= "\r\nContent-Type: " . $this->_deduceMimeType();
-            $part .= "\r\n\r\n" . $this->_content;
-            return $part;
-        }
-
-        /**
-         *    Attempts to figure out the MIME type from the
-         *    file extension and the content.
-         *    @return string        MIME type.
-         *    @access private
-         */
-        function _deduceMimeType() {
-            if ($this->_isOnlyAscii($this->_content)) {
-                return 'text/plain';
-            }
-            return 'application/octet-stream';
-        }
-
-        /**
-         *    Tests each character is in the range 0-127.
-         *    @param string $ascii    String to test.
-         *    @access private
-         */
-        function _isOnlyAscii($ascii) {
-            for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
-                if (ord($ascii[$i]) > 127) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @param string $key    Identifier.
-         *    @return boolean       True if matched.
-         *    @access public
-         */
-        function isKey($key) {
-            return $key == $this->_key;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @return string       Identifier.
-         *    @access public
-         */
-        function getKey() {
-            return $this->_key;
-        }
-
-        /**
-         *    Is this the value we are looking for?
-         *    @return string       Content.
-         *    @access public
-         */
-        function getValue() {
-            return $this->_filename;
-        }
-    }
-
-    /**
-     *    Bundle of GET/POST parameters. Can include
-     *    repeated parameters.
+	 */
+	class SimpleAttachment {
+		protected $_key;
+		protected $_content;
+		protected $_filename;
+
+		/**
+		 *    Stashes the data for rendering later.
+		 *    @param string $key          Key to add value to.
+		 *    @param string $content      Raw data.
+		 *    @param hash $filename       Original filename.
+		 */
+		function SimpleAttachment($key, $content, $filename) {
+			$this->_key = $key;
+			$this->_content = $content;
+			$this->_filename = $filename;
+		}
+
+		/**
+		 *    The pair as a single string.
+		 *    @return string        Encoded pair.
+		 *    @access public
+		 */
+		function asRequest() {
+			return '';
+		}
+
+		/**
+		 *    The MIME part as a string.
+		 *    @return string        MIME part encoding.
+		 *    @access public
+		 */
+		function asMime() {
+			$part = 'Content-Disposition: form-data; ';
+			$part .= 'name="' . $this->_key . '"; ';
+			$part .= 'filename="' . $this->_filename . '"';
+			$part .= "\r\nContent-Type: " . $this->_deduceMimeType();
+			$part .= "\r\n\r\n" . $this->_content;
+			return $part;
+		}
+
+		/**
+		 *    Attempts to figure out the MIME type from the
+		 *    file extension and the content.
+		 *    @return string        MIME type.
+		 *    @access private
+		 */
+		function _deduceMimeType() {
+			if ($this->_isOnlyAscii($this->_content)) {
+				return 'text/plain';
+			}
+			return 'application/octet-stream';
+		}
+
+		/**
+		 *    Tests each character is in the range 0-127.
+		 *    @param string $ascii    String to test.
+		 *    @access private
+		 */
+		function _isOnlyAscii($ascii) {
+			for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
+				if (ord($ascii[$i]) > 127) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @param string $key    Identifier.
+		 *    @return boolean       True if matched.
+		 *    @access public
+		 */
+		function isKey($key) {
+			return $key == $this->_key;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @return string       Identifier.
+		 *    @access public
+		 */
+		function getKey() {
+			return $this->_key;
+		}
+
+		/**
+		 *    Is this the value we are looking for?
+		 *    @return string       Content.
+		 *    @access public
+		 */
+		function getValue() {
+			return $this->_filename;
+		}
+	}
+
+	/**
+	 *    Bundle of GET/POST parameters. Can include
+	 *    repeated parameters.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleEncoding {
-        protected $_request;
-
-        /**
-         *    Starts empty.
-         *    @param array $query       Hash of parameters.
-         *                              Multiple values are
-         *                              as lists on a single key.
-         *    @access public
-         */
-        function SimpleEncoding($query = false) {
-            if (! $query) {
-                $query = array();
-            }
-            $this->clear();
-            $this->merge($query);
-        }
-
-        /**
-         *    Empties the request of parameters.
-         *    @access public
-         */
-        function clear() {
-            $this->_request = array();
-        }
-
-        /**
-         *    Adds a parameter to the query.
-         *    @param string $key            Key to add value to.
-         *    @param string/array $value    New data.
-         *    @access public
-         */
-        function add($key, $value) {
-            if ($value === false) {
-                return;
-            }
-            if (is_array($value)) {
-                foreach ($value as $item) {
-                    $this->_addPair($key, $item);
-                }
-            } else {
-                $this->_addPair($key, $value);
-            }
-        }
-
-        /**
-         *    Adds a new value into the request.
-         *    @param string $key            Key to add value to.
-         *    @param string/array $value    New data.
-         *    @access private
-         */
-        function _addPair($key, $value) {
-            $this->_request[] = new SimpleEncodedPair($key, $value);
-        }
-
-        /**
-         *    Adds a MIME part to the query. Does nothing for a
-         *    form encoded packet.
-         *    @param string $key          Key to add value to.
-         *    @param string $content      Raw data.
-         *    @param hash $filename       Original filename.
-         *    @access public
-         */
-        function attach($key, $content, $filename) {
-            $this->_request[] = new SimpleAttachment($key, $content, $filename);
-        }
-
-        /**
-         *    Adds a set of parameters to this query.
-         *    @param array/SimpleQueryString $query  Multiple values are
-         *                                           as lists on a single key.
-         *    @access public
-         */
-        function merge($query) {
-            if (is_object($query)) {
-                $this->_request = array_merge($this->_request, $query->getAll());
-            } elseif (is_array($query)) {
-                foreach ($query as $key => $value) {
-                    $this->add($key, $value);
-                }
-            }
-        }
-
-        /**
-         *    Accessor for single value.
-         *    @return string/array    False if missing, string
-         *                            if present and array if
-         *                            multiple entries.
-         *    @access public
-         */
-        function getValue($key) {
-            $values = array();
-            foreach ($this->_request as $pair) {
-                if ($pair->isKey($key)) {
-                    $values[] = $pair->getValue();
-                }
-            }
-            if (count($values) == 0) {
-                return false;
-            } elseif (count($values) == 1) {
-                return $values[0];
-            } else {
-                return $values;
-            }
-        }
-
-        /**
-         *    Accessor for listing of pairs.
-         *    @return array        All pair objects.
-         *    @access public
-         */
-        function getAll() {
-            return $this->_request;
-        }
-
-        /**
-         *    Renders the query string as a URL encoded
-         *    request part.
-         *    @return string        Part of URL.
-         *    @access protected
-         */
-        function _encode() {
-            $statements = array();
-            foreach ($this->_request as $pair) {
-                if ($statement = $pair->asRequest()) {
-                    $statements[] = $statement;
-                }
-            }
-            return implode('&', $statements);
-        }
-    }
-
-    /**
-     *    Bundle of GET parameters. Can include
-     *    repeated parameters.
+	 */
+	class SimpleEncoding {
+		protected $_request;
+
+		/**
+		 *    Starts empty.
+		 *    @param array $query       Hash of parameters.
+		 *                              Multiple values are
+		 *                              as lists on a single key.
+		 *    @access public
+		 */
+		function SimpleEncoding($query = false) {
+			if (! $query) {
+				$query = array();
+			}
+			$this->clear();
+			$this->merge($query);
+		}
+
+		/**
+		 *    Empties the request of parameters.
+		 *    @access public
+		 */
+		function clear() {
+			$this->_request = array();
+		}
+
+		/**
+		 *    Adds a parameter to the query.
+		 *    @param string $key            Key to add value to.
+		 *    @param string/array $value    New data.
+		 *    @access public
+		 */
+		function add($key, $value) {
+			if ($value === false) {
+				return;
+			}
+			if (is_array($value)) {
+				foreach ($value as $item) {
+					$this->_addPair($key, $item);
+				}
+			} else {
+				$this->_addPair($key, $value);
+			}
+		}
+
+		/**
+		 *    Adds a new value into the request.
+		 *    @param string $key            Key to add value to.
+		 *    @param string/array $value    New data.
+		 *    @access private
+		 */
+		function _addPair($key, $value) {
+			$this->_request[] = new SimpleEncodedPair($key, $value);
+		}
+
+		/**
+		 *    Adds a MIME part to the query. Does nothing for a
+		 *    form encoded packet.
+		 *    @param string $key          Key to add value to.
+		 *    @param string $content      Raw data.
+		 *    @param hash $filename       Original filename.
+		 *    @access public
+		 */
+		function attach($key, $content, $filename) {
+			$this->_request[] = new SimpleAttachment($key, $content, $filename);
+		}
+
+		/**
+		 *    Adds a set of parameters to this query.
+		 *    @param array/SimpleQueryString $query  Multiple values are
+		 *                                           as lists on a single key.
+		 *    @access public
+		 */
+		function merge($query) {
+			if (is_object($query)) {
+				$this->_request = array_merge($this->_request, $query->getAll());
+			} elseif (is_array($query)) {
+				foreach ($query as $key => $value) {
+					$this->add($key, $value);
+				}
+			}
+		}
+
+		/**
+		 *    Accessor for single value.
+		 *    @return string/array    False if missing, string
+		 *                            if present and array if
+		 *                            multiple entries.
+		 *    @access public
+		 */
+		function getValue($key) {
+			$values = array();
+			foreach ($this->_request as $pair) {
+				if ($pair->isKey($key)) {
+					$values[] = $pair->getValue();
+				}
+			}
+			if (count($values) == 0) {
+				return false;
+			} elseif (count($values) == 1) {
+				return $values[0];
+			} else {
+				return $values;
+			}
+		}
+
+		/**
+		 *    Accessor for listing of pairs.
+		 *    @return array        All pair objects.
+		 *    @access public
+		 */
+		function getAll() {
+			return $this->_request;
+		}
+
+		/**
+		 *    Renders the query string as a URL encoded
+		 *    request part.
+		 *    @return string        Part of URL.
+		 *    @access protected
+		 */
+		function _encode() {
+			$statements = array();
+			foreach ($this->_request as $pair) {
+				if ($statement = $pair->asRequest()) {
+					$statements[] = $statement;
+				}
+			}
+			return implode('&', $statements);
+		}
+	}
+
+	/**
+	 *    Bundle of GET parameters. Can include
+	 *    repeated parameters.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleGetEncoding extends SimpleEncoding {
-
-        /**
-         *    Starts empty.
-         *    @param array $query       Hash of parameters.
-         *                              Multiple values are
-         *                              as lists on a single key.
-         *    @access public
-         */
-        function SimpleGetEncoding($query = false) {
-            $this->SimpleEncoding($query);
-        }
-
-        /**
-         *    HTTP request method.
-         *    @return string        Always GET.
-         *    @access public
-         */
-        function getMethod() {
-            return 'GET';
-        }
-
-        /**
-         *    Writes no extra headers.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeHeadersTo($socket) {
-        }
-
-        /**
-         *    No data is sent to the socket as the data is encoded into
-         *    the URL.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeTo($socket) {
-        }
-
-        /**
-         *    Renders the query string as a URL encoded
-         *    request part for attaching to a URL.
-         *    @return string        Part of URL.
-         *    @access public
-         */
-        function asUrlRequest() {
-            return $this->_encode();
-        }
-    }
-
-    /**
-     *    Bundle of URL parameters for a HEAD request.
+	 */
+	class SimpleGetEncoding extends SimpleEncoding {
+
+		/**
+		 *    Starts empty.
+		 *    @param array $query       Hash of parameters.
+		 *                              Multiple values are
+		 *                              as lists on a single key.
+		 *    @access public
+		 */
+		function SimpleGetEncoding($query = false) {
+			$this->SimpleEncoding($query);
+		}
+
+		/**
+		 *    HTTP request method.
+		 *    @return string        Always GET.
+		 *    @access public
+		 */
+		function getMethod() {
+			return 'GET';
+		}
+
+		/**
+		 *    Writes no extra headers.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeHeadersTo($socket) {
+		}
+
+		/**
+		 *    No data is sent to the socket as the data is encoded into
+		 *    the URL.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeTo($socket) {
+		}
+
+		/**
+		 *    Renders the query string as a URL encoded
+		 *    request part for attaching to a URL.
+		 *    @return string        Part of URL.
+		 *    @access public
+		 */
+		function asUrlRequest() {
+			return $this->_encode();
+		}
+	}
+
+	/**
+	 *    Bundle of URL parameters for a HEAD request.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHeadEncoding extends SimpleGetEncoding {
-
-        /**
-         *    Starts empty.
-         *    @param array $query       Hash of parameters.
-         *                              Multiple values are
-         *                              as lists on a single key.
-         *    @access public
-         */
-        function SimpleHeadEncoding($query = false) {
-            $this->SimpleGetEncoding($query);
-        }
-
-        /**
-         *    HTTP request method.
-         *    @return string        Always HEAD.
-         *    @access public
-         */
-        function getMethod() {
-            return 'HEAD';
-        }
-    }
-
-    /**
-     *    Bundle of POST parameters. Can include
-     *    repeated parameters.
+	 */
+	class SimpleHeadEncoding extends SimpleGetEncoding {
+
+		/**
+		 *    Starts empty.
+		 *    @param array $query       Hash of parameters.
+		 *                              Multiple values are
+		 *                              as lists on a single key.
+		 *    @access public
+		 */
+		function SimpleHeadEncoding($query = false) {
+			$this->SimpleGetEncoding($query);
+		}
+
+		/**
+		 *    HTTP request method.
+		 *    @return string        Always HEAD.
+		 *    @access public
+		 */
+		function getMethod() {
+			return 'HEAD';
+		}
+	}
+
+	/**
+	 *    Bundle of POST parameters. Can include
+	 *    repeated parameters.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimplePostEncoding extends SimpleEncoding {
-
-        /**
-         *    Starts empty.
-         *    @param array $query       Hash of parameters.
-         *                              Multiple values are
-         *                              as lists on a single key.
-         *    @access public
-         */
-        function SimplePostEncoding($query = false) {
-            $this->SimpleEncoding($query);
-        }
-
-        /**
-         *    HTTP request method.
-         *    @return string        Always POST.
-         *    @access public
-         */
-        function getMethod() {
-            return 'POST';
-        }
-
-        /**
-         *    Dispatches the form headers down the socket.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeHeadersTo($socket) {
-            $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-            $socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
-        }
-
-        /**
-         *    Dispatches the form data down the socket.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeTo($socket) {
-            $socket->write($this->_encode());
-        }
-
-        /**
-         *    Renders the query string as a URL encoded
-         *    request part for attaching to a URL.
-         *    @return string        Part of URL.
-         *    @access public
-         */
-        function asUrlRequest() {
-            return '';
-        }
-    }
-
-    /**
-     *    Bundle of POST parameters in the multipart
-     *    format. Can include file uploads.
+	 */
+	class SimplePostEncoding extends SimpleEncoding {
+
+		/**
+		 *    Starts empty.
+		 *    @param array $query       Hash of parameters.
+		 *                              Multiple values are
+		 *                              as lists on a single key.
+		 *    @access public
+		 */
+		function SimplePostEncoding($query = false) {
+			$this->SimpleEncoding($query);
+		}
+
+		/**
+		 *    HTTP request method.
+		 *    @return string        Always POST.
+		 *    @access public
+		 */
+		function getMethod() {
+			return 'POST';
+		}
+
+		/**
+		 *    Dispatches the form headers down the socket.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeHeadersTo($socket) {
+			$socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
+			$socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
+		}
+
+		/**
+		 *    Dispatches the form data down the socket.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeTo($socket) {
+			$socket->write($this->_encode());
+		}
+
+		/**
+		 *    Renders the query string as a URL encoded
+		 *    request part for attaching to a URL.
+		 *    @return string        Part of URL.
+		 *    @access public
+		 */
+		function asUrlRequest() {
+			return '';
+		}
+	}
+
+	/**
+	 *    Bundle of POST parameters in the multipart
+	 *    format. Can include file uploads.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleMultipartEncoding extends SimplePostEncoding {
-        protected $_boundary;
-
-        /**
-         *    Starts empty.
-         *    @param array $query       Hash of parameters.
-         *                              Multiple values are
-         *                              as lists on a single key.
-         *    @access public
-         */
-        function SimpleMultipartEncoding($query = false, $boundary = false) {
-            $this->SimplePostEncoding($query);
-            $this->_boundary = ($boundary === false ? uniqid('st') : $boundary);
-        }
-
-        /**
-         *    Dispatches the form headers down the socket.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeHeadersTo($socket) {
-            $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-            $socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
-        }
-
-        /**
-         *    Dispatches the form data down the socket.
-         *    @param SimpleSocket $socket        Socket to write to.
-         *    @access public
-         */
-        function writeTo($socket) {
-            $socket->write($this->_encode());
-        }
-
-        /**
-         *    Renders the query string as a URL encoded
-         *    request part.
-         *    @return string        Part of URL.
-         *    @access public
-         */
-        function _encode() {
-            $stream = '';
-            foreach ($this->_request as $pair) {
-                $stream .= "--" . $this->_boundary . "\r\n";
-                $stream .= $pair->asMime() . "\r\n";
-            }
-            $stream .= "--" . $this->_boundary . "--\r\n";
-            return $stream;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleMultipartEncoding extends SimplePostEncoding {
+		protected $_boundary;
+
+		/**
+		 *    Starts empty.
+		 *    @param array $query       Hash of parameters.
+		 *                              Multiple values are
+		 *                              as lists on a single key.
+		 *    @access public
+		 */
+		function SimpleMultipartEncoding($query = false, $boundary = false) {
+			$this->SimplePostEncoding($query);
+			$this->_boundary = ($boundary === false ? uniqid('st') : $boundary);
+		}
+
+		/**
+		 *    Dispatches the form headers down the socket.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeHeadersTo($socket) {
+			$socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
+			$socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
+		}
+
+		/**
+		 *    Dispatches the form data down the socket.
+		 *    @param SimpleSocket $socket        Socket to write to.
+		 *    @access public
+		 */
+		function writeTo($socket) {
+			$socket->write($this->_encode());
+		}
+
+		/**
+		 *    Renders the query string as a URL encoded
+		 *    request part.
+		 *    @return string        Part of URL.
+		 *    @access public
+		 */
+		function _encode() {
+			$stream = '';
+			foreach ($this->_request as $pair) {
+				$stream .= "--" . $this->_boundary . "\r\n";
+				$stream .= $pair->asMime() . "\r\n";
+			}
+			$stream .= "--" . $this->_boundary . "--\r\n";
+			return $stream;
+		}
+	}
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
          *    @access public
          */
         function SimpleEncoding($query = false) {
-            if (! $query) {
+            if (!$query) {
                 $query = array();
             }
             $this->clear();
@@ -438,7 +438,7 @@ 
          *    @access public
          */
         function writeHeadersTo($socket) {
-            $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
+            $socket->write("Content-Length: " . (integer) strlen($this->_encode()) . "\r\n");
             $socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
         }
 
@@ -489,7 +489,7 @@ 
          *    @access public
          */
         function writeHeadersTo($socket) {
-            $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
+            $socket->write("Content-Length: " . (integer) strlen($this->_encode()) . "\r\n");
             $socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
         }
 

tests/test_tools/simpletest/errors.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 
         /**
          *    Tests to see if the queue is empty.
-         *    @return        True if empty.
+         *    @return        boolean if empty.
          */
         function isEmpty() {
             return (count($this->_queue) == 0);
@@ -117,7 +117,7 @@ 
 
         /**
          *    Global access to a single error queue.
-         *    @return        Global error queue object.
+         *    @return        SimpleErrorQueue error queue object.
          *    @access public
          *    @static
          */

Indentation +160 added lines, -160 removed lines

@@ -1,181 +1,181 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: errors.php 1606 2007-01-09 10:42:06Z wei $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: errors.php 1606 2007-01-09 10:42:06Z wei $
+	 */
 
-    /** @ignore - PHP5 compatibility fix. */
-    if (! defined('E_STRICT')) {
-        define('E_STRICT', 2048);
-    }
+	/** @ignore - PHP5 compatibility fix. */
+	if (! defined('E_STRICT')) {
+		define('E_STRICT', 2048);
+	}
 
-    /**#@+
+	/**#@+
      * Includes SimpleTest files.
      */
-    require_once(dirname(__FILE__) . '/invoker.php');
+	require_once(dirname(__FILE__) . '/invoker.php');
 
-    /**
-     *    Extension that traps errors into an error queue.
+	/**
+	 *    Extension that traps errors into an error queue.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
+	 */
+	class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
 
-        /**
-         *    Stores the invoker to wrap.
-         *    @param SimpleInvoker $invoker  Test method runner.
-         */
-        function SimpleErrorTrappingInvoker($invoker) {
-            $this->SimpleInvokerDecorator($invoker);
-        }
+		/**
+		 *    Stores the invoker to wrap.
+		 *    @param SimpleInvoker $invoker  Test method runner.
+		 */
+		function SimpleErrorTrappingInvoker($invoker) {
+			$this->SimpleInvokerDecorator($invoker);
+		}
 
-        /**
-         *    Invokes a test method and dispatches any
-         *    untrapped errors. Called back from
-         *    the visiting runner.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            set_error_handler('simpleTestErrorHandler');
-            parent::invoke($method);
-            $queue = SimpleErrorQueue::instance();
-            while (list($severity, $message, $file, $line, $globals) = $queue->extract()) {
-                $severity = SimpleErrorQueue::getSeverityAsString($severity);
-                $test_case = $this->getTestCase();
-                $test_case->error($severity, $message, $file, $line);
-            }
-            restore_error_handler();
-        }
-    }
+		/**
+		 *    Invokes a test method and dispatches any
+		 *    untrapped errors. Called back from
+		 *    the visiting runner.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			set_error_handler('simpleTestErrorHandler');
+			parent::invoke($method);
+			$queue = SimpleErrorQueue::instance();
+			while (list($severity, $message, $file, $line, $globals) = $queue->extract()) {
+				$severity = SimpleErrorQueue::getSeverityAsString($severity);
+				$test_case = $this->getTestCase();
+				$test_case->error($severity, $message, $file, $line);
+			}
+			restore_error_handler();
+		}
+	}
 
-    /**
-     *    Singleton error queue used to record trapped
-     *    errors.
+	/**
+	 *    Singleton error queue used to record trapped
+	 *    errors.
 	 *	  @package	SimpleTest
 	 *	  @subpackage	UnitTester
-     */
-    class SimpleErrorQueue {
-        protected $_queue;
+	 */
+	class SimpleErrorQueue {
+		protected $_queue;
 
-        /**
-         *    Starts with an empty queue.
-         *    @access public
-         */
-        function SimpleErrorQueue() {
-            $this->clear();
-        }
+		/**
+		 *    Starts with an empty queue.
+		 *    @access public
+		 */
+		function SimpleErrorQueue() {
+			$this->clear();
+		}
 
-        /**
-         *    Adds an error to the front of the queue.
-         *    @param $severity        PHP error code.
-         *    @param $message         Text of error.
-         *    @param $filename        File error occoured in.
-         *    @param $line            Line number of error.
-         *    @param $super_globals   Hash of PHP super global arrays.
-         *    @access public
-         */
-        function add($severity, $message, $filename, $line, $super_globals) {
-            array_push(
-                    $this->_queue,
-                    array($severity, $message, $filename, $line, $super_globals));
-        }
+		/**
+		 *    Adds an error to the front of the queue.
+		 *    @param $severity        PHP error code.
+		 *    @param $message         Text of error.
+		 *    @param $filename        File error occoured in.
+		 *    @param $line            Line number of error.
+		 *    @param $super_globals   Hash of PHP super global arrays.
+		 *    @access public
+		 */
+		function add($severity, $message, $filename, $line, $super_globals) {
+			array_push(
+					$this->_queue,
+					array($severity, $message, $filename, $line, $super_globals));
+		}
 
-        /**
-         *    Pulls the earliest error from the queue.
-         *    @return     False if none, or a list of error
-         *                information. Elements are: severity
-         *                as the PHP error code, the error message,
-         *                the file with the error, the line number
-         *                and a list of PHP super global arrays.
-         *    @access public
-         */
-        function extract() {
-            if (count($this->_queue)) {
-                return array_shift($this->_queue);
-            }
-            return false;
-        }
+		/**
+		 *    Pulls the earliest error from the queue.
+		 *    @return     False if none, or a list of error
+		 *                information. Elements are: severity
+		 *                as the PHP error code, the error message,
+		 *                the file with the error, the line number
+		 *                and a list of PHP super global arrays.
+		 *    @access public
+		 */
+		function extract() {
+			if (count($this->_queue)) {
+				return array_shift($this->_queue);
+			}
+			return false;
+		}
 
-        /**
-         *    Discards the contents of the error queue.
-         *    @access public
-         */
-        function clear() {
-            $this->_queue = array();
-        }
+		/**
+		 *    Discards the contents of the error queue.
+		 *    @access public
+		 */
+		function clear() {
+			$this->_queue = array();
+		}
 
-        /**
-         *    Tests to see if the queue is empty.
-         *    @return        True if empty.
-         */
-        function isEmpty() {
-            return (count($this->_queue) == 0);
-        }
+		/**
+		 *    Tests to see if the queue is empty.
+		 *    @return        True if empty.
+		 */
+		function isEmpty() {
+			return (count($this->_queue) == 0);
+		}
 
-        /**
-         *    Global access to a single error queue.
-         *    @return        Global error queue object.
-         *    @access public
-         *    @static
-         */
-        static function instance() {
-            static $queue = false;
-            if (! $queue) {
-                $queue = new SimpleErrorQueue();
-            }
-            return $queue;
-        }
+		/**
+		 *    Global access to a single error queue.
+		 *    @return        Global error queue object.
+		 *    @access public
+		 *    @static
+		 */
+		static function instance() {
+			static $queue = false;
+			if (! $queue) {
+				$queue = new SimpleErrorQueue();
+			}
+			return $queue;
+		}
 
-        /**
-         *    Converst an error code into it's string
-         *    representation.
-         *    @param $severity  PHP integer error code.
-         *    @return           String version of error code.
-         *    @access public
-         *    @static
-         */
-         static function getSeverityAsString($severity) {
-            static $map = array(
-                    E_STRICT => 'E_STRICT',
-                    E_ERROR => 'E_ERROR',
-                    E_WARNING => 'E_WARNING',
-                    E_PARSE => 'E_PARSE',
-                    E_NOTICE => 'E_NOTICE',
-                    E_CORE_ERROR => 'E_CORE_ERROR',
-                    E_CORE_WARNING => 'E_CORE_WARNING',
-                    E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-                    E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-                    E_USER_ERROR => 'E_USER_ERROR',
-                    E_USER_WARNING => 'E_USER_WARNING',
-                    E_USER_NOTICE => 'E_USER_NOTICE', 4096 => 'E??');
-            return $map[$severity];
-        }
-    }
+		/**
+		 *    Converst an error code into it's string
+		 *    representation.
+		 *    @param $severity  PHP integer error code.
+		 *    @return           String version of error code.
+		 *    @access public
+		 *    @static
+		 */
+		 static function getSeverityAsString($severity) {
+			static $map = array(
+					E_STRICT => 'E_STRICT',
+					E_ERROR => 'E_ERROR',
+					E_WARNING => 'E_WARNING',
+					E_PARSE => 'E_PARSE',
+					E_NOTICE => 'E_NOTICE',
+					E_CORE_ERROR => 'E_CORE_ERROR',
+					E_CORE_WARNING => 'E_CORE_WARNING',
+					E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+					E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+					E_USER_ERROR => 'E_USER_ERROR',
+					E_USER_WARNING => 'E_USER_WARNING',
+					E_USER_NOTICE => 'E_USER_NOTICE', 4096 => 'E??');
+			return $map[$severity];
+		}
+	}
 
-    /**
-     *    Error handler that simply stashes any errors into the global
-     *    error queue. Simulates the existing behaviour with respect to
-     *    logging errors, but this feature may be removed in future.
-     *    @param $severity        PHP error code.
-     *    @param $message         Text of error.
-     *    @param $filename        File error occoured in.
-     *    @param $line            Line number of error.
-     *    @param $super_globals   Hash of PHP super global arrays.
-     *    @static
-     *    @access public
-     */
-    function simpleTestErrorHandler($severity, $message, $filename, $line, $super_globals) {
-        if ($severity = $severity & error_reporting()) {
-            restore_error_handler();
-            if (ini_get('log_errors')) {
-                $label = SimpleErrorQueue::getSeverityAsString($severity);
-                error_log("$label: $message in $filename on line $line");
-            }
-            $queue = SimpleErrorQueue::instance();
-            $queue->add($severity, $message, $filename, $line, $super_globals);
-            set_error_handler('simpleTestErrorHandler');
-        }
-    }
\ No newline at end of file
+	/**
+	 *    Error handler that simply stashes any errors into the global
+	 *    error queue. Simulates the existing behaviour with respect to
+	 *    logging errors, but this feature may be removed in future.
+	 *    @param $severity        PHP error code.
+	 *    @param $message         Text of error.
+	 *    @param $filename        File error occoured in.
+	 *    @param $line            Line number of error.
+	 *    @param $super_globals   Hash of PHP super global arrays.
+	 *    @static
+	 *    @access public
+	 */
+	function simpleTestErrorHandler($severity, $message, $filename, $line, $super_globals) {
+		if ($severity = $severity & error_reporting()) {
+			restore_error_handler();
+			if (ini_get('log_errors')) {
+				$label = SimpleErrorQueue::getSeverityAsString($severity);
+				error_log("$label: $message in $filename on line $line");
+			}
+			$queue = SimpleErrorQueue::instance();
+			$queue->add($severity, $message, $filename, $line, $super_globals);
+			set_error_handler('simpleTestErrorHandler');
+		}
+	}
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
      */
 
     /** @ignore - PHP5 compatibility fix. */
-    if (! defined('E_STRICT')) {
+    if (!defined('E_STRICT')) {
         define('E_STRICT', 2048);
     }
 
@@ -123,7 +123,7 @@ 
          */
         static function instance() {
             static $queue = false;
-            if (! $queue) {
+            if (!$queue) {
                 $queue = new SimpleErrorQueue();
             }
             return $queue;

tests/test_tools/simpletest/expectation.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         /**
          *    Tests the expectation. True if correct.
          *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
+         *    @return boolean|null              True if correct.
          *    @access public
          *    @abstract
          */

Indentation +716 added lines, -716 removed lines

@@ -1,719 +1,719 @@
 <?php
-    /**
-     *    base include file for SimpleTest
-     *    @package    SimpleTest
-     *    @subpackage    UnitTester
-     *    @version    $Id: expectation.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+
+	/**
+	 *    base include file for SimpleTest
+	 *    @package    SimpleTest
+	 *    @subpackage    UnitTester
+	 *    @version    $Id: expectation.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+
      *    include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/dumper.php');
-    require_once(dirname(__FILE__) . '/compatibility.php');
-    /**#@-*/
-
-    /**
-     *    Assertion that can display failure information.
-     *    Also includes various helper methods.
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-     *    @abstract
-     */
-    class SimpleExpectation {
-        protected $_dumper;
-        protected $_message;
-
-        /**
-         *    Creates a dumper for displaying values and sets
-         *    the test message.
-         *    @param string $message    Customised message on failure.
-         */
-        function SimpleExpectation($message = '%s') {
-            $this->_dumper = new SimpleDumper();
-            $this->_message = $message;
-        }
-
-        /**
-         *    Tests the expectation. True if correct.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         *    @abstract
-         */
-        function test($compare) {
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         *    @abstract
-         */
-        function testMessage($compare) {
-        }
-
-        /**
-         *    Overlays the generated message onto the stored user
-         *    message. An additional message can be interjected.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function overlayMessage($compare) {
-            return sprintf($this->_message, $this->testMessage($compare));
-        }
-
-        /**
-         *    Accessor for the dumper.
-         *    @return SimpleDumper    Current value dumper.
-         *    @access protected
-         */
-        function &_getDumper() {
-            return $this->_dumper;
-        }
-
-        /**
-         *    Test to see if a value is an expectation object.
-         *    A useful utility method.
-         *    @param mixed $expectation    Hopefully an Epectation
-         *                                 class.
-         *    @return boolean              True if descended from
-         *                                 this class.
-         *    @access public
-         *    @static
-         */
-        static function isExpectation($expectation) {
-            return is_object($expectation) &&
-                    SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
-        }
-    }
-
-    /**
-     *    Test for equality.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class EqualExpectation extends SimpleExpectation {
-        protected $_value;
-
-        /**
-         *    Sets the value to compare against.
-         *    @param mixed $value        Test value to match.
-         *    @param string $message     Customised message on failure.
-         *    @access public
-         */
-        function EqualExpectation($value, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_value = $value;
-        }
-
-        /**
-         *    Tests the expectation. True if it matches the
-         *    held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (($this->_value == $compare) && ($compare == $this->_value));
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                return "Equal expectation [" . $this->_dumper->describeValue($this->_value) . "]";
-            } else {
-                return "Equal expectation fails " .
-                        $this->_dumper->describeDifference($this->_value, $compare);
-            }
-        }
-
-        /**
-         *    Accessor for comparison value.
-         *    @return mixed       Held value to compare with.
-         *    @access protected
-         */
-        function _getValue() {
-            return $this->_value;
-        }
-    }
-
-    /**
-     *    Test for inequality.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class NotEqualExpectation extends EqualExpectation {
-
-        /**
-         *    Sets the value to compare against.
-         *    @param mixed $value       Test value to match.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function NotEqualExpectation($value, $message = '%s') {
-            $this->EqualExpectation($value, $message);
-        }
-
-        /**
-         *    Tests the expectation. True if it differs from the
-         *    held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if ($this->test($compare)) {
-                return "Not equal expectation passes " .
-                        $dumper->describeDifference($this->_getValue(), $compare);
-            } else {
-                return "Not equal expectation fails [" .
-                        $dumper->describeValue($this->_getValue()) .
-                        "] matches";
-            }
-        }
-    }
-
-    /**
-     *    Test for being within a range.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class WithinMarginExpectation extends SimpleExpectation {
-        protected $_upper;
-        protected $_lower;
-
-        /**
-         *    Sets the value to compare against and the fuzziness of
-         *    the match. Used for comparing floating point values.
-         *    @param mixed $value        Test value to match.
-         *    @param mixed $margin       Fuzziness of match.
-         *    @param string $message     Customised message on failure.
-         *    @access public
-         */
-        function WithinMarginExpectation($value, $margin, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_upper = $value + $margin;
-            $this->_lower = $value - $margin;
-        }
-
-        /**
-         *    Tests the expectation. True if it matches the
-         *    held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (($compare <= $this->_upper) && ($compare >= $this->_lower));
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                return $this->_withinMessage($compare);
-            } else {
-                return $this->_outsideMessage($compare);
-            }
-        }
-
-        /**
-         *    Creates a the message for being within the range.
-         *    @param mixed $compare        Value being tested.
-         *    @access private
-         */
-        function _withinMessage($compare) {
-            return "Within expectation [" . $this->_dumper->describeValue($this->_lower) . "] and [" .
-                    $this->_dumper->describeValue($this->_upper) . "]";
-        }
-
-        /**
-         *    Creates a the message for being within the range.
-         *    @param mixed $compare        Value being tested.
-         *    @access private
-         */
-        function _outsideMessage($compare) {
-            if ($compare > $this->_upper) {
-                return "Outside expectation " .
-                        $this->_dumper->describeDifference($compare, $this->_upper);
-            } else {
-                return "Outside expectation " .
-                        $this->_dumper->describeDifference($compare, $this->_lower);
-            }
-        }
-    }
-
-    /**
-     *    Test for being outside of a range.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class OutsideMarginExpectation extends WithinMarginExpectation {
-
-        /**
-         *    Sets the value to compare against and the fuzziness of
-         *    the match. Used for comparing floating point values.
-         *    @param mixed $value        Test value to not match.
-         *    @param mixed $margin       Fuzziness of match.
-         *    @param string $message     Customised message on failure.
-         *    @access public
-         */
-        function OutsideMarginExpectation($value, $margin, $message = '%s') {
-            $this->WithinMarginExpectation($value, $margin, $message);
-        }
-
-        /**
-         *    Tests the expectation. True if it matches the
-         *    held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if (! $this->test($compare)) {
-                return $this->_withinMessage($compare);
-            } else {
-                return $this->_outsideMessage($compare);
-            }
-        }
-    }
-
-    /**
-     *    Test for identity.
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-     */
-    class IdenticalExpectation extends EqualExpectation {
-
-        /**
-         *    Sets the value to compare against.
-         *    @param mixed $value       Test value to match.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function IdenticalExpectation($value, $message = '%s') {
-            $this->EqualExpectation($value, $message);
-        }
-
-        /**
-         *    Tests the expectation. True if it exactly
-         *    matches the held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return SimpleTestCompatibility::isIdentical($this->_getValue(), $compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if ($this->test($compare)) {
-                return "Identical expectation [" . $dumper->describeValue($this->_getValue()) . "]";
-            } else {
-                return "Identical expectation [" . $dumper->describeValue($this->_getValue()) .
-                        "] fails with [" .
-                        $dumper->describeValue($compare) . "] " .
-                        $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-            }
-        }
-    }
-
-    /**
-     *    Test for non-identity.
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-     */
-    class NotIdenticalExpectation extends IdenticalExpectation {
-
-        /**
-         *    Sets the value to compare against.
-         *    @param mixed $value        Test value to match.
-         *    @param string $message     Customised message on failure.
-         *    @access public
-         */
-        function NotIdenticalExpectation($value, $message = '%s') {
-            $this->IdenticalExpectation($value, $message);
-        }
-
-        /**
-         *    Tests the expectation. True if it differs from the
-         *    held value.
-         *    @param mixed $compare        Comparison value.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if ($this->test($compare)) {
-                return "Not identical expectation passes " .
-                        $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-            } else {
-                return "Not identical expectation [" . $dumper->describeValue($this->_getValue()) . "] matches";
-            }
-        }
-    }
-
-    /**
-     *    Test for a pattern using Perl regex rules.
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-     */
-    class PatternExpectation extends SimpleExpectation {
-        protected $_pattern;
-
-        /**
-         *    Sets the value to compare against.
-         *    @param string $pattern    Pattern to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function PatternExpectation($pattern, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_pattern = $pattern;
-        }
-
-        /**
-         *    Accessor for the pattern.
-         *    @return string       Perl regex as string.
-         *    @access protected
-         */
-        function _getPattern() {
-            return $this->_pattern;
-        }
-
-        /**
-         *    Tests the expectation. True if the Perl regex
-         *    matches the comparison value.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (boolean)preg_match($this->_getPattern(), $compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                return $this->_describePatternMatch($this->_getPattern(), $compare);
-            } else {
-                $dumper = $this->_getDumper();
-                return "Pattern [" . $this->_getPattern() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            }
-        }
-
-        /**
-         *    Describes a pattern match including the string
-         *    found and it's position.
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-         *    @param string $pattern        Regex to match against.
-         *    @param string $subject        Subject to search.
-         *    @access protected
-         */
-        function _describePatternMatch($pattern, $subject) {
-            preg_match($pattern, $subject, $matches);
-            $position = strpos($subject, $matches[0]);
-            $dumper = $this->_getDumper();
-            return "Pattern [$pattern] detected at character [$position] in [" .
-                    $dumper->describeValue($subject) . "] as [" .
-                    $matches[0] . "] in region [" .
-                    $dumper->clipString($subject, 100, $position) . "]";
-        }
-    }
-
-    /**
-     *      @deprecated
-     */
-    class WantedPatternExpectation extends PatternExpectation {
-    }
-
-    /**
-     *    Fail if a pattern is detected within the
-     *    comparison.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class NoPatternExpectation extends PatternExpectation {
-
-        /**
-         *    Sets the reject pattern
-         *    @param string $pattern    Pattern to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function NoPatternExpectation($pattern, $message = '%s') {
-            $this->PatternExpectation($pattern, $message);
-        }
-
-        /**
-         *    Tests the expectation. False if the Perl regex
-         *    matches the comparison value.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param string $compare      Comparison value.
-         *    @return string              Description of success
-         *                                or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                $dumper = $this->_getDumper();
-                return "Pattern [" . $this->_getPattern() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            } else {
-                return $this->_describePatternMatch($this->_getPattern(), $compare);
-            }
-        }
-    }
-
-    /**
-     *    @package SimpleTest
-     *    @subpackage UnitTester
-     *      @deprecated
-     */
-    class UnwantedPatternExpectation extends NoPatternExpectation {
-    }
-
-    /**
-     *    Tests either type or class name if it's an object.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class IsAExpectation extends SimpleExpectation {
-        protected $_type;
-
-        /**
-         *    Sets the type to compare with.
-         *    @param string $type       Type or class name.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function IsAExpectation($type, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_type = $type;
-        }
-
-        /**
-         *    Accessor for type to check against.
-         *    @return string    Type or class name.
-         *    @access protected
-         */
-        function _getType() {
-            return $this->_type;
-        }
-
-        /**
-         *    Tests the expectation. True if the type or
-         *    class matches the string value.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            if (is_object($compare)) {
-                return SimpleTestCompatibility::isA($compare, $this->_type);
-            } else {
-                return (strtolower(gettype($compare)) == $this->_canonicalType($this->_type));
-            }
-        }
-
-        /**
-         *    Coerces type name into a gettype() match.
-         *    @param string $type        User type.
-         *    @return string             Simpler type.
-         *    @access private
-         */
-        function _canonicalType($type) {
-            $type = strtolower($type);
-            $map = array(
-                    'bool' => 'boolean',
-                    'float' => 'double',
-                    'real' => 'double',
-                    'int' => 'integer');
-            if (isset($map[$type])) {
-                $type = $map[$type];
-            }
-            return $type;
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            return "Value [" . $dumper->describeValue($compare) .
-                    "] should be type [" . $this->_type . "]";
-        }
-    }
-
-    /**
-     *    Tests either type or class name if it's an object.
-     *    Will succeed if the type does not match.
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class NotAExpectation extends IsAExpectation {
-        protected $_type;
-
-        /**
-         *    Sets the type to compare with.
-         *    @param string $type       Type or class name.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function NotAExpectation($type, $message = '%s') {
-            $this->IsAExpectation($type, $message);
-        }
-
-        /**
-         *    Tests the expectation. False if the type or
-         *    class matches the string value.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if different.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            return "Value [" . $dumper->describeValue($compare) .
-                    "] should not be type [" . $this->_getType() . "]";
-        }
-    }
-
-    /**
-     *    Tests for existance of a method in an object
-     *      @package SimpleTest
-     *      @subpackage UnitTester
-     */
-    class MethodExistsExpectation extends SimpleExpectation {
-        protected $_method;
-
-        /**
-         *    Sets the value to compare against.
-         *    @param string $method     Method to check.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         *    @return void
-         */
-        function MethodExistsExpectation($method, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_method = $method;
-        }
-
-        /**
-         *    Tests the expectation. True if the method exists in the test object.
-         *    @param string $compare        Comparison method name.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if (! is_object($compare)) {
-                return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
-            }
-            $method = $this->_method;
-            return "Object [" . $dumper->describeValue($compare) .
-                    "] should contain method [$method]";
-        }
-    }
+	require_once(dirname(__FILE__) . '/dumper.php');
+	require_once(dirname(__FILE__) . '/compatibility.php');
+	/**#@-*/
+
+	/**
+	 *    Assertion that can display failure information.
+	 *    Also includes various helper methods.
+	 *    @package SimpleTest
+	 *    @subpackage UnitTester
+	 *    @abstract
+	 */
+	class SimpleExpectation {
+		protected $_dumper;
+		protected $_message;
+
+		/**
+		 *    Creates a dumper for displaying values and sets
+		 *    the test message.
+		 *    @param string $message    Customised message on failure.
+		 */
+		function SimpleExpectation($message = '%s') {
+			$this->_dumper = new SimpleDumper();
+			$this->_message = $message;
+		}
+
+		/**
+		 *    Tests the expectation. True if correct.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 *    @abstract
+		 */
+		function test($compare) {
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 *    @abstract
+		 */
+		function testMessage($compare) {
+		}
+
+		/**
+		 *    Overlays the generated message onto the stored user
+		 *    message. An additional message can be interjected.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function overlayMessage($compare) {
+			return sprintf($this->_message, $this->testMessage($compare));
+		}
+
+		/**
+		 *    Accessor for the dumper.
+		 *    @return SimpleDumper    Current value dumper.
+		 *    @access protected
+		 */
+		function &_getDumper() {
+			return $this->_dumper;
+		}
+
+		/**
+		 *    Test to see if a value is an expectation object.
+		 *    A useful utility method.
+		 *    @param mixed $expectation    Hopefully an Epectation
+		 *                                 class.
+		 *    @return boolean              True if descended from
+		 *                                 this class.
+		 *    @access public
+		 *    @static
+		 */
+		static function isExpectation($expectation) {
+			return is_object($expectation) &&
+					SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
+		}
+	}
+
+	/**
+	 *    Test for equality.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class EqualExpectation extends SimpleExpectation {
+		protected $_value;
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param mixed $value        Test value to match.
+		 *    @param string $message     Customised message on failure.
+		 *    @access public
+		 */
+		function EqualExpectation($value, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_value = $value;
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches the
+		 *    held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (($this->_value == $compare) && ($compare == $this->_value));
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				return "Equal expectation [" . $this->_dumper->describeValue($this->_value) . "]";
+			} else {
+				return "Equal expectation fails " .
+						$this->_dumper->describeDifference($this->_value, $compare);
+			}
+		}
+
+		/**
+		 *    Accessor for comparison value.
+		 *    @return mixed       Held value to compare with.
+		 *    @access protected
+		 */
+		function _getValue() {
+			return $this->_value;
+		}
+	}
+
+	/**
+	 *    Test for inequality.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class NotEqualExpectation extends EqualExpectation {
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param mixed $value       Test value to match.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function NotEqualExpectation($value, $message = '%s') {
+			$this->EqualExpectation($value, $message);
+		}
+
+		/**
+		 *    Tests the expectation. True if it differs from the
+		 *    held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if ($this->test($compare)) {
+				return "Not equal expectation passes " .
+						$dumper->describeDifference($this->_getValue(), $compare);
+			} else {
+				return "Not equal expectation fails [" .
+						$dumper->describeValue($this->_getValue()) .
+						"] matches";
+			}
+		}
+	}
+
+	/**
+	 *    Test for being within a range.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class WithinMarginExpectation extends SimpleExpectation {
+		protected $_upper;
+		protected $_lower;
+
+		/**
+		 *    Sets the value to compare against and the fuzziness of
+		 *    the match. Used for comparing floating point values.
+		 *    @param mixed $value        Test value to match.
+		 *    @param mixed $margin       Fuzziness of match.
+		 *    @param string $message     Customised message on failure.
+		 *    @access public
+		 */
+		function WithinMarginExpectation($value, $margin, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_upper = $value + $margin;
+			$this->_lower = $value - $margin;
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches the
+		 *    held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (($compare <= $this->_upper) && ($compare >= $this->_lower));
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				return $this->_withinMessage($compare);
+			} else {
+				return $this->_outsideMessage($compare);
+			}
+		}
+
+		/**
+		 *    Creates a the message for being within the range.
+		 *    @param mixed $compare        Value being tested.
+		 *    @access private
+		 */
+		function _withinMessage($compare) {
+			return "Within expectation [" . $this->_dumper->describeValue($this->_lower) . "] and [" .
+					$this->_dumper->describeValue($this->_upper) . "]";
+		}
+
+		/**
+		 *    Creates a the message for being within the range.
+		 *    @param mixed $compare        Value being tested.
+		 *    @access private
+		 */
+		function _outsideMessage($compare) {
+			if ($compare > $this->_upper) {
+				return "Outside expectation " .
+						$this->_dumper->describeDifference($compare, $this->_upper);
+			} else {
+				return "Outside expectation " .
+						$this->_dumper->describeDifference($compare, $this->_lower);
+			}
+		}
+	}
+
+	/**
+	 *    Test for being outside of a range.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class OutsideMarginExpectation extends WithinMarginExpectation {
+
+		/**
+		 *    Sets the value to compare against and the fuzziness of
+		 *    the match. Used for comparing floating point values.
+		 *    @param mixed $value        Test value to not match.
+		 *    @param mixed $margin       Fuzziness of match.
+		 *    @param string $message     Customised message on failure.
+		 *    @access public
+		 */
+		function OutsideMarginExpectation($value, $margin, $message = '%s') {
+			$this->WithinMarginExpectation($value, $margin, $message);
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches the
+		 *    held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if (! $this->test($compare)) {
+				return $this->_withinMessage($compare);
+			} else {
+				return $this->_outsideMessage($compare);
+			}
+		}
+	}
+
+	/**
+	 *    Test for identity.
+	 *    @package SimpleTest
+	 *    @subpackage UnitTester
+	 */
+	class IdenticalExpectation extends EqualExpectation {
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param mixed $value       Test value to match.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function IdenticalExpectation($value, $message = '%s') {
+			$this->EqualExpectation($value, $message);
+		}
+
+		/**
+		 *    Tests the expectation. True if it exactly
+		 *    matches the held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return SimpleTestCompatibility::isIdentical($this->_getValue(), $compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if ($this->test($compare)) {
+				return "Identical expectation [" . $dumper->describeValue($this->_getValue()) . "]";
+			} else {
+				return "Identical expectation [" . $dumper->describeValue($this->_getValue()) .
+						"] fails with [" .
+						$dumper->describeValue($compare) . "] " .
+						$dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
+			}
+		}
+	}
+
+	/**
+	 *    Test for non-identity.
+	 *    @package SimpleTest
+	 *    @subpackage UnitTester
+	 */
+	class NotIdenticalExpectation extends IdenticalExpectation {
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param mixed $value        Test value to match.
+		 *    @param string $message     Customised message on failure.
+		 *    @access public
+		 */
+		function NotIdenticalExpectation($value, $message = '%s') {
+			$this->IdenticalExpectation($value, $message);
+		}
+
+		/**
+		 *    Tests the expectation. True if it differs from the
+		 *    held value.
+		 *    @param mixed $compare        Comparison value.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if ($this->test($compare)) {
+				return "Not identical expectation passes " .
+						$dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
+			} else {
+				return "Not identical expectation [" . $dumper->describeValue($this->_getValue()) . "] matches";
+			}
+		}
+	}
+
+	/**
+	 *    Test for a pattern using Perl regex rules.
+	 *    @package SimpleTest
+	 *    @subpackage UnitTester
+	 */
+	class PatternExpectation extends SimpleExpectation {
+		protected $_pattern;
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param string $pattern    Pattern to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function PatternExpectation($pattern, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_pattern = $pattern;
+		}
+
+		/**
+		 *    Accessor for the pattern.
+		 *    @return string       Perl regex as string.
+		 *    @access protected
+		 */
+		function _getPattern() {
+			return $this->_pattern;
+		}
+
+		/**
+		 *    Tests the expectation. True if the Perl regex
+		 *    matches the comparison value.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (boolean)preg_match($this->_getPattern(), $compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				return $this->_describePatternMatch($this->_getPattern(), $compare);
+			} else {
+				$dumper = $this->_getDumper();
+				return "Pattern [" . $this->_getPattern() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			}
+		}
+
+		/**
+		 *    Describes a pattern match including the string
+		 *    found and it's position.
+		 *    @package SimpleTest
+		 *    @subpackage UnitTester
+		 *    @param string $pattern        Regex to match against.
+		 *    @param string $subject        Subject to search.
+		 *    @access protected
+		 */
+		function _describePatternMatch($pattern, $subject) {
+			preg_match($pattern, $subject, $matches);
+			$position = strpos($subject, $matches[0]);
+			$dumper = $this->_getDumper();
+			return "Pattern [$pattern] detected at character [$position] in [" .
+					$dumper->describeValue($subject) . "] as [" .
+					$matches[0] . "] in region [" .
+					$dumper->clipString($subject, 100, $position) . "]";
+		}
+	}
+
+	/**
+	 *      @deprecated
+	 */
+	class WantedPatternExpectation extends PatternExpectation {
+	}
+
+	/**
+	 *    Fail if a pattern is detected within the
+	 *    comparison.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class NoPatternExpectation extends PatternExpectation {
+
+		/**
+		 *    Sets the reject pattern
+		 *    @param string $pattern    Pattern to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function NoPatternExpectation($pattern, $message = '%s') {
+			$this->PatternExpectation($pattern, $message);
+		}
+
+		/**
+		 *    Tests the expectation. False if the Perl regex
+		 *    matches the comparison value.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param string $compare      Comparison value.
+		 *    @return string              Description of success
+		 *                                or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				$dumper = $this->_getDumper();
+				return "Pattern [" . $this->_getPattern() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			} else {
+				return $this->_describePatternMatch($this->_getPattern(), $compare);
+			}
+		}
+	}
+
+	/**
+	 *    @package SimpleTest
+	 *    @subpackage UnitTester
+	 *      @deprecated
+	 */
+	class UnwantedPatternExpectation extends NoPatternExpectation {
+	}
+
+	/**
+	 *    Tests either type or class name if it's an object.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class IsAExpectation extends SimpleExpectation {
+		protected $_type;
+
+		/**
+		 *    Sets the type to compare with.
+		 *    @param string $type       Type or class name.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function IsAExpectation($type, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_type = $type;
+		}
+
+		/**
+		 *    Accessor for type to check against.
+		 *    @return string    Type or class name.
+		 *    @access protected
+		 */
+		function _getType() {
+			return $this->_type;
+		}
+
+		/**
+		 *    Tests the expectation. True if the type or
+		 *    class matches the string value.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			if (is_object($compare)) {
+				return SimpleTestCompatibility::isA($compare, $this->_type);
+			} else {
+				return (strtolower(gettype($compare)) == $this->_canonicalType($this->_type));
+			}
+		}
+
+		/**
+		 *    Coerces type name into a gettype() match.
+		 *    @param string $type        User type.
+		 *    @return string             Simpler type.
+		 *    @access private
+		 */
+		function _canonicalType($type) {
+			$type = strtolower($type);
+			$map = array(
+					'bool' => 'boolean',
+					'float' => 'double',
+					'real' => 'double',
+					'int' => 'integer');
+			if (isset($map[$type])) {
+				$type = $map[$type];
+			}
+			return $type;
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			return "Value [" . $dumper->describeValue($compare) .
+					"] should be type [" . $this->_type . "]";
+		}
+	}
+
+	/**
+	 *    Tests either type or class name if it's an object.
+	 *    Will succeed if the type does not match.
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class NotAExpectation extends IsAExpectation {
+		protected $_type;
+
+		/**
+		 *    Sets the type to compare with.
+		 *    @param string $type       Type or class name.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function NotAExpectation($type, $message = '%s') {
+			$this->IsAExpectation($type, $message);
+		}
+
+		/**
+		 *    Tests the expectation. False if the type or
+		 *    class matches the string value.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if different.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			return "Value [" . $dumper->describeValue($compare) .
+					"] should not be type [" . $this->_getType() . "]";
+		}
+	}
+
+	/**
+	 *    Tests for existance of a method in an object
+	 *      @package SimpleTest
+	 *      @subpackage UnitTester
+	 */
+	class MethodExistsExpectation extends SimpleExpectation {
+		protected $_method;
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param string $method     Method to check.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 *    @return void
+		 */
+		function MethodExistsExpectation($method, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_method = $method;
+		}
+
+		/**
+		 *    Tests the expectation. True if the method exists in the test object.
+		 *    @param string $compare        Comparison method name.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if (! is_object($compare)) {
+				return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
+			}
+			$method = $this->_method;
+			return "Object [" . $dumper->describeValue($compare) .
+					"] should contain method [$method]";
+		}
+	}

Spacing +9 added lines, -9 removed lines

@@ -173,7 +173,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -298,7 +298,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -309,7 +309,7 @@ 
          *    @access public
          */
         function testMessage($compare) {
-            if (! $this->test($compare)) {
+            if (!$this->test($compare)) {
                 return $this->_withinMessage($compare);
             } else {
                 return $this->_outsideMessage($compare);
@@ -390,7 +390,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -447,7 +447,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return (boolean)preg_match($this->_getPattern(), $compare);
+            return (boolean) preg_match($this->_getPattern(), $compare);
         }
 
         /**
@@ -520,7 +520,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -653,7 +653,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -697,7 +697,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
+            return (boolean) (is_object($compare) && method_exists($compare, $this->_method));
         }
 
         /**
@@ -709,7 +709,7 @@ 
          */
         function testMessage($compare) {
             $dumper = $this->_getDumper();
-            if (! is_object($compare)) {
+            if (!is_object($compare)) {
                 return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
             }
             $method = $this->_method;

tests/test_tools/simpletest/form.php

Doc Comments +1 added lines, -1 removed lines

@@ -342,7 +342,7 @@
          *    Simply submits the form without the submit button
          *    value. Used when there is only one button or it
          *    is unimportant.
-         *    @return hash           Submitted values.
+         *    @return SimpleEncoding           Submitted values.
          *    @access public
          */
         function submit() {

Indentation +324 added lines, -324 removed lines

@@ -1,351 +1,351 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: form.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: form.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/tag.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    require_once(dirname(__FILE__) . '/selector.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/tag.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	require_once(dirname(__FILE__) . '/selector.php');
+	/**#@-*/
 
-    /**
-     *    Form tag class to hold widget values.
+	/**
+	 *    Form tag class to hold widget values.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleForm {
-        protected $_method;
-        protected $_action;
-        protected $_encoding;
-        protected $_default_target;
-        protected $_id;
-        protected $_buttons;
-        protected $_images;
-        protected $_widgets;
-        protected $_radios;
-        protected $_checkboxes;
+	 */
+	class SimpleForm {
+		protected $_method;
+		protected $_action;
+		protected $_encoding;
+		protected $_default_target;
+		protected $_id;
+		protected $_buttons;
+		protected $_images;
+		protected $_widgets;
+		protected $_radios;
+		protected $_checkboxes;
 
-        /**
-         *    Starts with no held controls/widgets.
-         *    @param SimpleTag $tag        Form tag to read.
-         *    @param SimpleUrl $url        Location of holding page.
-         */
-        function SimpleForm($tag, $url) {
-            $this->_method = $tag->getAttribute('method');
-            $this->_action = $this->_createAction($tag->getAttribute('action'), $url);
-            $this->_encoding = $this->_setEncodingClass($tag);
-            $this->_default_target = false;
-            $this->_id = $tag->getAttribute('id');
-            $this->_buttons = array();
-            $this->_images = array();
-            $this->_widgets = array();
-            $this->_radios = array();
-            $this->_checkboxes = array();
-        }
+		/**
+		 *    Starts with no held controls/widgets.
+		 *    @param SimpleTag $tag        Form tag to read.
+		 *    @param SimpleUrl $url        Location of holding page.
+		 */
+		function SimpleForm($tag, $url) {
+			$this->_method = $tag->getAttribute('method');
+			$this->_action = $this->_createAction($tag->getAttribute('action'), $url);
+			$this->_encoding = $this->_setEncodingClass($tag);
+			$this->_default_target = false;
+			$this->_id = $tag->getAttribute('id');
+			$this->_buttons = array();
+			$this->_images = array();
+			$this->_widgets = array();
+			$this->_radios = array();
+			$this->_checkboxes = array();
+		}
 
-        /**
-         *    Creates the request packet to be sent by the form.
-         *    @param SimpleTag $tag        Form tag to read.
-         *    @return string               Packet class.
-         *    @access private
-         */
-        function _setEncodingClass($tag) {
-            if (strtolower($tag->getAttribute('method')) == 'post') {
-                if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
-                    return 'SimpleMultipartEncoding';
-                }
-                return 'SimplePostEncoding';
-            }
-            return 'SimpleGetEncoding';
-        }
+		/**
+		 *    Creates the request packet to be sent by the form.
+		 *    @param SimpleTag $tag        Form tag to read.
+		 *    @return string               Packet class.
+		 *    @access private
+		 */
+		function _setEncodingClass($tag) {
+			if (strtolower($tag->getAttribute('method')) == 'post') {
+				if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
+					return 'SimpleMultipartEncoding';
+				}
+				return 'SimplePostEncoding';
+			}
+			return 'SimpleGetEncoding';
+		}
 
-        /**
-         *    Sets the frame target within a frameset.
-         *    @param string $frame        Name of frame.
-         *    @access public
-         */
-        function setDefaultTarget($frame) {
-            $this->_default_target = $frame;
-        }
+		/**
+		 *    Sets the frame target within a frameset.
+		 *    @param string $frame        Name of frame.
+		 *    @access public
+		 */
+		function setDefaultTarget($frame) {
+			$this->_default_target = $frame;
+		}
 
-        /**
-         *    Accessor for method of form submission.
-         *    @return string           Either get or post.
-         *    @access public
-         */
-        function getMethod() {
-            return ($this->_method ? strtolower($this->_method) : 'get');
-        }
+		/**
+		 *    Accessor for method of form submission.
+		 *    @return string           Either get or post.
+		 *    @access public
+		 */
+		function getMethod() {
+			return ($this->_method ? strtolower($this->_method) : 'get');
+		}
 
-        /**
-         *    Combined action attribute with current location
-         *    to get an absolute form target.
-         *    @param string $action    Action attribute from form tag.
-         *    @param SimpleUrl $base   Page location.
-         *    @return SimpleUrl        Absolute form target.
-         */
-        function _createAction($action, $base) {
-            if (($action === '') || ($action === false)) {
-                return $base;
-            }
-            $url = new SimpleUrl($action);
-            return $url->makeAbsolute($base);
-        }
+		/**
+		 *    Combined action attribute with current location
+		 *    to get an absolute form target.
+		 *    @param string $action    Action attribute from form tag.
+		 *    @param SimpleUrl $base   Page location.
+		 *    @return SimpleUrl        Absolute form target.
+		 */
+		function _createAction($action, $base) {
+			if (($action === '') || ($action === false)) {
+				return $base;
+			}
+			$url = new SimpleUrl($action);
+			return $url->makeAbsolute($base);
+		}
 
-        /**
-         *    Absolute URL of the target.
-         *    @return SimpleUrl           URL target.
-         *    @access public
-         */
-        function getAction() {
-            $url = $this->_action;
-            if ($this->_default_target && ! $url->getTarget()) {
-                $url->setTarget($this->_default_target);
-            }
-            return $url;
-        }
+		/**
+		 *    Absolute URL of the target.
+		 *    @return SimpleUrl           URL target.
+		 *    @access public
+		 */
+		function getAction() {
+			$url = $this->_action;
+			if ($this->_default_target && ! $url->getTarget()) {
+				$url->setTarget($this->_default_target);
+			}
+			return $url;
+		}
 
-        /**
-         *    Creates the encoding for the current values in the
-         *    form.
-         *    @return SimpleFormEncoding    Request to submit.
-         *    @access private
-         */
-        function _encode() {
-            $class = $this->_encoding;
-            $encoding = new $class();
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                $this->_widgets[$i]->write($encoding);
-            }
-            return $encoding;
-        }
+		/**
+		 *    Creates the encoding for the current values in the
+		 *    form.
+		 *    @return SimpleFormEncoding    Request to submit.
+		 *    @access private
+		 */
+		function _encode() {
+			$class = $this->_encoding;
+			$encoding = new $class();
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				$this->_widgets[$i]->write($encoding);
+			}
+			return $encoding;
+		}
 
-        /**
-         *    ID field of form for unique identification.
-         *    @return string           Unique tag ID.
-         *    @access public
-         */
-        function getId() {
-            return $this->_id;
-        }
+		/**
+		 *    ID field of form for unique identification.
+		 *    @return string           Unique tag ID.
+		 *    @access public
+		 */
+		function getId() {
+			return $this->_id;
+		}
 
-        /**
-         *    Adds a tag contents to the form.
-         *    @param SimpleWidget $tag        Input tag to add.
-         *    @access public
-         */
-        function addWidget($tag) {
-            if (strtolower($tag->getAttribute('type')) == 'submit') {
-                $this->_buttons[] = $tag;
-            } elseif (strtolower($tag->getAttribute('type')) == 'image') {
-                $this->_images[] = $tag;
-            } elseif ($tag->getName()) {
-                $this->_setWidget($tag);
-            }
-        }
+		/**
+		 *    Adds a tag contents to the form.
+		 *    @param SimpleWidget $tag        Input tag to add.
+		 *    @access public
+		 */
+		function addWidget($tag) {
+			if (strtolower($tag->getAttribute('type')) == 'submit') {
+				$this->_buttons[] = $tag;
+			} elseif (strtolower($tag->getAttribute('type')) == 'image') {
+				$this->_images[] = $tag;
+			} elseif ($tag->getName()) {
+				$this->_setWidget($tag);
+			}
+		}
 
-        /**
-         *    Sets the widget into the form, grouping radio
-         *    buttons if any.
-         *    @param SimpleWidget $tag   Incoming form control.
-         *    @access private
-         */
-        function _setWidget($tag) {
-            if (strtolower($tag->getAttribute('type')) == 'radio') {
-                $this->_addRadioButton($tag);
-            } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
-                $this->_addCheckbox($tag);
-            } else {
-                $this->_widgets[] = $tag;
-            }
-        }
+		/**
+		 *    Sets the widget into the form, grouping radio
+		 *    buttons if any.
+		 *    @param SimpleWidget $tag   Incoming form control.
+		 *    @access private
+		 */
+		function _setWidget($tag) {
+			if (strtolower($tag->getAttribute('type')) == 'radio') {
+				$this->_addRadioButton($tag);
+			} elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
+				$this->_addCheckbox($tag);
+			} else {
+				$this->_widgets[] = $tag;
+			}
+		}
 
-        /**
-         *    Adds a radio button, building a group if necessary.
-         *    @param SimpleRadioButtonTag $tag   Incoming form control.
-         *    @access private
-         */
-        function _addRadioButton($tag) {
-            if (! isset($this->_radios[$tag->getName()])) {
-                $this->_widgets[] = new SimpleRadioGroup();
-                $this->_radios[$tag->getName()] = count($this->_widgets) - 1;
-            }
-            $this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
-        }
+		/**
+		 *    Adds a radio button, building a group if necessary.
+		 *    @param SimpleRadioButtonTag $tag   Incoming form control.
+		 *    @access private
+		 */
+		function _addRadioButton($tag) {
+			if (! isset($this->_radios[$tag->getName()])) {
+				$this->_widgets[] = new SimpleRadioGroup();
+				$this->_radios[$tag->getName()] = count($this->_widgets) - 1;
+			}
+			$this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
+		}
 
-        /**
-         *    Adds a checkbox, making it a group on a repeated name.
-         *    @param SimpleCheckboxTag $tag   Incoming form control.
-         *    @access private
-         */
-        function _addCheckbox($tag) {
-            if (! isset($this->_checkboxes[$tag->getName()])) {
-                $this->_widgets[] = $tag;
-                $this->_checkboxes[$tag->getName()] = count($this->_widgets) - 1;
-            } else {
-                $index = $this->_checkboxes[$tag->getName()];
-                if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
-                    $previous = $this->_widgets[$index];
-                    $this->_widgets[$index] = new SimpleCheckboxGroup();
-                    $this->_widgets[$index]->addWidget($previous);
-                }
-                $this->_widgets[$index]->addWidget($tag);
-            }
-        }
+		/**
+		 *    Adds a checkbox, making it a group on a repeated name.
+		 *    @param SimpleCheckboxTag $tag   Incoming form control.
+		 *    @access private
+		 */
+		function _addCheckbox($tag) {
+			if (! isset($this->_checkboxes[$tag->getName()])) {
+				$this->_widgets[] = $tag;
+				$this->_checkboxes[$tag->getName()] = count($this->_widgets) - 1;
+			} else {
+				$index = $this->_checkboxes[$tag->getName()];
+				if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
+					$previous = $this->_widgets[$index];
+					$this->_widgets[$index] = new SimpleCheckboxGroup();
+					$this->_widgets[$index]->addWidget($previous);
+				}
+				$this->_widgets[$index]->addWidget($tag);
+			}
+		}
 
-        /**
-         *    Extracts current value from form.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @return string/array              Value(s) as string or null
-         *                                      if not set.
-         *    @access public
-         */
-        function getValue($selector) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($selector->isMatch($this->_widgets[$i])) {
-                    return $this->_widgets[$i]->getValue();
-                }
-            }
-            foreach ($this->_buttons as $button) {
-                if ($selector->isMatch($button)) {
-                    return $button->getValue();
-                }
-            }
-            return null;
-        }
+		/**
+		 *    Extracts current value from form.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @return string/array              Value(s) as string or null
+		 *                                      if not set.
+		 *    @access public
+		 */
+		function getValue($selector) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($selector->isMatch($this->_widgets[$i])) {
+					return $this->_widgets[$i]->getValue();
+				}
+			}
+			foreach ($this->_buttons as $button) {
+				if ($selector->isMatch($button)) {
+					return $button->getValue();
+				}
+			}
+			return null;
+		}
 
-        /**
-         *    Sets a widget value within the form.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @param string $value              Value to input into the widget.
-         *    @return boolean                   True if value is legal, false
-         *                                      otherwise. If the field is not
-         *                                      present, nothing will be set.
-         *    @access public
-         */
-        function setField($selector, $value) {
-            $success = false;
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($selector->isMatch($this->_widgets[$i])) {
-                    if ($this->_widgets[$i]->setValue($value)) {
-                        $success = true;
-                    }
-                }
-            }
-            return $success;
-        }
+		/**
+		 *    Sets a widget value within the form.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @param string $value              Value to input into the widget.
+		 *    @return boolean                   True if value is legal, false
+		 *                                      otherwise. If the field is not
+		 *                                      present, nothing will be set.
+		 *    @access public
+		 */
+		function setField($selector, $value) {
+			$success = false;
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($selector->isMatch($this->_widgets[$i])) {
+					if ($this->_widgets[$i]->setValue($value)) {
+						$success = true;
+					}
+				}
+			}
+			return $success;
+		}
 
-        /**
-         *    Used by the page object to set widgets labels to
-         *    external label tags.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @access public
-         */
-        function attachLabelBySelector($selector, $label) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($selector->isMatch($this->_widgets[$i])) {
-                    if (method_exists($this->_widgets[$i], 'setLabel')) {
-                        $this->_widgets[$i]->setLabel($label);
-                        return;
-                    }
-                }
-            }
-        }
+		/**
+		 *    Used by the page object to set widgets labels to
+		 *    external label tags.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @access public
+		 */
+		function attachLabelBySelector($selector, $label) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($selector->isMatch($this->_widgets[$i])) {
+					if (method_exists($this->_widgets[$i], 'setLabel')) {
+						$this->_widgets[$i]->setLabel($label);
+						return;
+					}
+				}
+			}
+		}
 
-        /**
-         *    Test to see if a form has a submit button.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @return boolean                   True if present.
-         *    @access public
-         */
-        function hasSubmit($selector) {
-            foreach ($this->_buttons as $button) {
-                if ($selector->isMatch($button)) {
-                    return true;
-                }
-            }
-            return false;
-        }
+		/**
+		 *    Test to see if a form has a submit button.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @return boolean                   True if present.
+		 *    @access public
+		 */
+		function hasSubmit($selector) {
+			foreach ($this->_buttons as $button) {
+				if ($selector->isMatch($button)) {
+					return true;
+				}
+			}
+			return false;
+		}
 
-        /**
-         *    Test to see if a form has an image control.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @return boolean                   True if present.
-         *    @access public
-         */
-        function hasImage($selector) {
-            foreach ($this->_images as $image) {
-                if ($selector->isMatch($image)) {
-                    return true;
-                }
-            }
-            return false;
-        }
+		/**
+		 *    Test to see if a form has an image control.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @return boolean                   True if present.
+		 *    @access public
+		 */
+		function hasImage($selector) {
+			foreach ($this->_images as $image) {
+				if ($selector->isMatch($image)) {
+					return true;
+				}
+			}
+			return false;
+		}
 
-        /**
-         *    Gets the submit values for a selected button.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @param hash $additional           Additional data for the form.
-         *    @return SimpleEncoding            Submitted values or false
-         *                                      if there is no such button
-         *                                      in the form.
-         *    @access public
-         */
-        function submitButton($selector, $additional = false) {
-            $additional = $additional ? $additional : array();
-            foreach ($this->_buttons as $button) {
-                if ($selector->isMatch($button)) {
-                    $encoding = $this->_encode();
-                    $button->write($encoding);
-                    if ($additional) {
-                        $encoding->merge($additional);
-                    }
-                    return $encoding;
-                }
-            }
-            return false;
-        }
+		/**
+		 *    Gets the submit values for a selected button.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @param hash $additional           Additional data for the form.
+		 *    @return SimpleEncoding            Submitted values or false
+		 *                                      if there is no such button
+		 *                                      in the form.
+		 *    @access public
+		 */
+		function submitButton($selector, $additional = false) {
+			$additional = $additional ? $additional : array();
+			foreach ($this->_buttons as $button) {
+				if ($selector->isMatch($button)) {
+					$encoding = $this->_encode();
+					$button->write($encoding);
+					if ($additional) {
+						$encoding->merge($additional);
+					}
+					return $encoding;
+				}
+			}
+			return false;
+		}
 
-        /**
-         *    Gets the submit values for an image.
-         *    @param SimpleSelector $selector   Criteria to apply.
-         *    @param integer $x                 X-coordinate of click.
-         *    @param integer $y                 Y-coordinate of click.
-         *    @param hash $additional           Additional data for the form.
-         *    @return SimpleEncoding            Submitted values or false
-         *                                      if there is no such button in the
-         *                                      form.
-         *    @access public
-         */
-        function submitImage($selector, $x, $y, $additional = false) {
-            $additional = $additional ? $additional : array();
-            foreach ($this->_images as $image) {
-                if ($selector->isMatch($image)) {
-                    $encoding = $this->_encode();
-                    $image->write($encoding, $x, $y);
-                    if ($additional) {
-                        $encoding->merge($additional);
-                    }
-                    return $encoding;
-                }
-            }
-            return false;
-        }
+		/**
+		 *    Gets the submit values for an image.
+		 *    @param SimpleSelector $selector   Criteria to apply.
+		 *    @param integer $x                 X-coordinate of click.
+		 *    @param integer $y                 Y-coordinate of click.
+		 *    @param hash $additional           Additional data for the form.
+		 *    @return SimpleEncoding            Submitted values or false
+		 *                                      if there is no such button in the
+		 *                                      form.
+		 *    @access public
+		 */
+		function submitImage($selector, $x, $y, $additional = false) {
+			$additional = $additional ? $additional : array();
+			foreach ($this->_images as $image) {
+				if ($selector->isMatch($image)) {
+					$encoding = $this->_encode();
+					$image->write($encoding, $x, $y);
+					if ($additional) {
+						$encoding->merge($additional);
+					}
+					return $encoding;
+				}
+			}
+			return false;
+		}
 
-        /**
-         *    Simply submits the form without the submit button
-         *    value. Used when there is only one button or it
-         *    is unimportant.
-         *    @return hash           Submitted values.
-         *    @access public
-         */
-        function submit() {
-            return $this->_encode();
-        }
-    }
+		/**
+		 *    Simply submits the form without the submit button
+		 *    value. Used when there is only one button or it
+		 *    is unimportant.
+		 *    @return hash           Submitted values.
+		 *    @access public
+		 */
+		function submit() {
+			return $this->_encode();
+		}
+	}

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
          */
         function getAction() {
             $url = $this->_action;
-            if ($this->_default_target && ! $url->getTarget()) {
+            if ($this->_default_target && !$url->getTarget()) {
                 $url->setTarget($this->_default_target);
             }
             return $url;
@@ -172,7 +172,7 @@ 
          *    @access private
          */
         function _addRadioButton($tag) {
-            if (! isset($this->_radios[$tag->getName()])) {
+            if (!isset($this->_radios[$tag->getName()])) {
                 $this->_widgets[] = new SimpleRadioGroup();
                 $this->_radios[$tag->getName()] = count($this->_widgets) - 1;
             }
@@ -185,12 +185,12 @@ 
          *    @access private
          */
         function _addCheckbox($tag) {
-            if (! isset($this->_checkboxes[$tag->getName()])) {
+            if (!isset($this->_checkboxes[$tag->getName()])) {
                 $this->_widgets[] = $tag;
                 $this->_checkboxes[$tag->getName()] = count($this->_widgets) - 1;
             } else {
                 $index = $this->_checkboxes[$tag->getName()];
-                if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
+                if (!SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
                     $previous = $this->_widgets[$index];
                     $this->_widgets[$index] = new SimpleCheckboxGroup();
                     $this->_widgets[$index]->addWidget($previous);